git.iko.soy/unity8
on xenial help sign in
Revert "Add a new setting to enable/disable the launcher"

Reverts bb50476d40a7d64b0fe94e8e822466eddca44355 This option was added to facilitate interaction options that no longer make sense with our removal of the Dash from Unity8. Now it can block users from doing anything with their device. Ref https://github.com/ubports/ubuntu-touch/issues/1203

commit7ad67980599e30175c64ffaeba1d4afd2cb79a4c authorDalton Durst <dalton@ubports.com> dateThu 22 Aug 2019, 20:28 (7 years ago) parent1829fbf
6 files changed−85
compare with xenial
unifiedsplit
data/com.canonical.Unity8.gschema.xml−5 qml/Shell.qml−1 tests/mocks/GSettings.1.0/fake_gsettings.cpp−33 tests/mocks/GSettings.1.0/fake_gsettings.h−9 tests/qmltests/Launcher/tst_Launcher.qml−19 tests/qmltests/tst_Shell.qml−18
data/com.canonical.Unity8.gschema.xml−5
@@ -43,11 +43,6 @@
4343 <summary>Width of the launcher in grid units.</summary>
4444 <description>Changes the width of the launcher in all usage modes.</description>
4545 </key>
46− <key type="b" name="enable-launcher">
47− <default>true</default>
48− <summary>Enable or disable the launcher</summary>
49− <description>Toggle the availability of the launcher</description>
50− </key>
5146 <key type="b" name="enable-indicator-menu">
5247 <default>true</default>
5348 <summary>Enable or disable the indicator pull down menus</summary>
qml/Shell.qml−1
@@ -575,7 +575,6 @@ StyledItem {
575575 && (!greeter.locked || AccountsService.enableLauncherWhileLocked)
576576 && !greeter.hasLockedApp
577577 && !shell.waitingOnGreeter
578− && settings.enableLauncher
579578 inverted: shell.usageScenario !== "desktop"
580579 superPressed: physicalKeysMapper.superPressed
581580 superTabPressed: physicalKeysMapper.superTabPressed
tests/mocks/GSettings.1.0/fake_gsettings.cpp−33
@@ -27,7 +27,6 @@ GSettingsControllerQml::GSettingsControllerQml()
2727 , m_autohideLauncher(false)
2828 , m_launcherWidth(8)
2929 , m_edgeDragWidth(2)
30− , m_enableLauncher(true)
3130 , m_enableIndicatorMenu(true)
3231 , m_appstoreUri("http://uappexplorer.com")
3332{
@@ -148,19 +147,6 @@ void GSettingsControllerQml::setEdgeDragWidth(uint edgeDragWidth)
148147 }
149148}
150149
151−void GSettingsControllerQml::setEnableLauncher(bool enableLauncher)
152−{
153− if (m_enableLauncher != enableLauncher) {
154− m_enableLauncher = enableLauncher;
155− Q_EMIT enableLauncherChanged(enableLauncher);
156− }
157−}
158−
159−bool GSettingsControllerQml::enableLauncher() const
160−{
161− return m_enableLauncher;
162−}
163−
164150bool GSettingsControllerQml::enableIndicatorMenu() const
165151{
166152 return m_enableIndicatorMenu;
@@ -243,8 +229,6 @@ void GSettingsQml::componentComplete()
243229 this, &GSettingsQml::launcherWidthChanged);
244230 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::edgeDragWidthChanged,
245231 this, &GSettingsQml::edgeDragWidthChanged);
246− connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableLauncherChanged,
247− this, &GSettingsQml::enableLauncherChanged);
248232 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableIndicatorMenuChanged,
249233 this, &GSettingsQml::enableIndicatorMenuChanged);
250234
@@ -256,7 +240,6 @@ void GSettingsQml::componentComplete()
256240 Q_EMIT autohideLauncherChanged();
257241 Q_EMIT launcherWidthChanged();
258242 Q_EMIT edgeDragWidthChanged();
259− Q_EMIT enableLauncherChanged();
260243 Q_EMIT enableIndicatorMenuChanged();
261244}
262245
@@ -364,15 +347,6 @@ QVariant GSettingsQml::edgeDragWidth() const
364347 }
365348}
366349
367−QVariant GSettingsQml::enableLauncher() const
368−{
369− if (m_valid && m_schema->id() == "com.canonical.Unity8") {
370− return GSettingsControllerQml::instance()->enableLauncher();
371− } else {
372− return QVariant();
373− }
374−}
375−
376350QVariant GSettingsQml::enableIndicatorMenu() const
377351{
378352 if (m_valid && m_schema->id() == "com.canonical.Unity8") {
@@ -418,13 +392,6 @@ void GSettingsQml::setEdgeDragWidth(const QVariant &edgeDragWidth)
418392 }
419393}
420394
421−void GSettingsQml::setEnableLauncher(const QVariant &enableLauncher)
422−{
423− if (m_valid && m_schema->id() == "com.canonical.Unity8") {
424− GSettingsControllerQml::instance()->setEnableLauncher(enableLauncher.toBool());
425− }
426−}
427−
428395void GSettingsQml::setEnableIndicatorMenu(const QVariant &enableIndicatorMenu)
429396{
430397 if (m_valid && m_schema->id() == "com.canonical.Unity8") {
tests/mocks/GSettings.1.0/fake_gsettings.h−9
@@ -57,7 +57,6 @@ class GSettingsQml: public QObject, public QQmlParserStatus
5757 Q_PROPERTY(QVariant autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)
5858 Q_PROPERTY(QVariant launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)
5959 Q_PROPERTY(QVariant edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)
60− Q_PROPERTY(QVariant enableLauncher READ enableLauncher WRITE setEnableLauncher NOTIFY enableLauncherChanged)
6160 Q_PROPERTY(QVariant enableIndicatorMenu READ enableIndicatorMenu WRITE setEnableIndicatorMenu NOTIFY enableIndicatorMenuChanged)
6261 Q_PROPERTY(QVariant appstoreUri READ appstoreUri NOTIFY appstoreUriChanged)
6362
@@ -76,7 +75,6 @@ public:
7675 QVariant autohideLauncher() const;
7776 QVariant launcherWidth() const;
7877 QVariant edgeDragWidth() const;
79− QVariant enableLauncher() const;
8078 QVariant enableIndicatorMenu() const;
8179 QVariant appstoreUri() const;
8280
@@ -88,7 +86,6 @@ public:
8886 void setAutohideLauncher(const QVariant &autohideLauncher);
8987 void setLauncherWidth(const QVariant &launcherWidth);
9088 void setEdgeDragWidth(const QVariant &edgeDragWidth);
91− void setEnableLauncher(const QVariant &enableLauncher);
9289 void setEnableIndicatorMenu(const QVariant &enableIndicatorMenu);
9390
9491Q_SIGNALS:
@@ -101,7 +98,6 @@ Q_SIGNALS:
10198 void autohideLauncherChanged();
10299 void launcherWidthChanged();
103100 void edgeDragWidthChanged();
104− void enableLauncherChanged();
105101 void enableIndicatorMenuChanged();
106102 void appstoreUriChanged();
107103
@@ -144,9 +140,6 @@ public:
144140 uint edgeDragWidth() const;
145141 Q_INVOKABLE void setEdgeDragWidth(uint edgeDragWidth);
146142
147− bool enableLauncher() const;
148− Q_INVOKABLE void setEnableLauncher(bool enableLauncher);
149−
150143 bool enableIndicatorMenu() const;
151144 Q_INVOKABLE void setEnableIndicatorMenu(bool enableIndicatorMenu);
152145
@@ -161,7 +154,6 @@ Q_SIGNALS:
161154 void autohideLauncherChanged(bool autohideLauncher);
162155 void launcherWidthChanged(int launcherWidth);
163156 void edgeDragWidthChanged(uint edgeDragWidth);
164− void enableLauncherChanged(bool enableLauncher);
165157 void enableIndicatorMenuChanged(bool enableIndicatorMenu);
166158 void appstoreUriChanged(const QString &appstoreUri);
167159
@@ -176,7 +168,6 @@ private:
176168 bool m_autohideLauncher;
177169 int m_launcherWidth;
178170 uint m_edgeDragWidth;
179− bool m_enableLauncher;
180171 bool m_enableIndicatorMenu;
181172 QString m_appstoreUri;
182173
tests/qmltests/Launcher/tst_Launcher.qml−19
@@ -1477,25 +1477,6 @@ Rectangle {
14771477 tryCompare(tooltipShape, "opacity", .95);
14781478 }
14791479
1480− function test_launcherEnabledSetting() {
1481− launcher.available = true;
1482−
1483− dragLauncherIntoView();
1484− var launcherPanel = findChild(launcher, "launcherPanel");
1485− tryCompare(launcherPanel, "x", 0);
1486− }
1487−
1488− function test_launcherDisabledSetting() {
1489− launcher.available = false;
1490−
1491− //We don't actually care that it's visible, so just use dragLauncher() rather than dragLauncherIntoView()
1492− dragLauncher();
1493− var launcherPanel = findChild(launcher, "launcherPanel");
1494− compare(launcherPanel.x, -launcherPanel.width);
1495−
1496− launcher.available = true;
1497− }
1498−
14991480 function test_hoverOnEdgeBarrierPreventsHiding() {
15001481 revealByEdgePush();
15011482
tests/qmltests/tst_Shell.qml−18
@@ -2760,24 +2760,6 @@ Rectangle {
27602760 tryCompare(cursor, "opacity", 0);
27612761 }
27622762
2763− function test_launcherEnabledSetting_data() {
2764− return [
2765− {tag: "launcher enabled", enabled: true},
2766− {tag: "launcher disabled", enabled: false}
2767− ]
2768− }
2769−
2770− function test_launcherEnabledSetting(data) {
2771− loadShell("phone");
2772−
2773− GSettingsController.setEnableLauncher(data.enabled);
2774−
2775− var launcher = findChild(shell, "launcher");
2776− tryCompare(launcher, "available", data.enabled);
2777−
2778− GSettingsController.setEnableLauncher(true);
2779− }
2780−
27812763 function test_indicatorMenuEnabledSetting_data() {
27822764 return [
27832765 {tag: "indicator menu enabled", enabled: true},