From 63d327442cf178dafab9d93a2e3ef02ff25ccc20 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 19 Aug 2020 17:00:20 -0700 Subject: [PATCH] Disabling notification dots for Launcher3Go Bug: 164457095 Change-Id: If751719a698785957d37b4656a0132d2b56b64f9 --- go/AndroidManifest.xml | 6 ++++++ go/src/com/android/launcher3/model/WidgetsModel.java | 1 + src/com/android/launcher3/settings/SettingsActivity.java | 5 +++++ .../com/android/launcher3/model/WidgetsModel.java | 1 + 4 files changed, 13 insertions(+) diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml index f84a82eaa2..f36439db53 100644 --- a/go/AndroidManifest.xml +++ b/go/AndroidManifest.xml @@ -46,6 +46,12 @@ tools:node="replace" > + diff --git a/go/src/com/android/launcher3/model/WidgetsModel.java b/go/src/com/android/launcher3/model/WidgetsModel.java index 3b3dc0196c..89b3831564 100644 --- a/go/src/com/android/launcher3/model/WidgetsModel.java +++ b/go/src/com/android/launcher3/model/WidgetsModel.java @@ -41,6 +41,7 @@ public class WidgetsModel { // True is the widget support is disabled. public static final boolean GO_DISABLE_WIDGETS = true; + public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true; private static final ArrayList EMPTY_WIDGET_LIST = new ArrayList<>(); diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java index ec3a467224..922425fca1 100644 --- a/src/com/android/launcher3/settings/SettingsActivity.java +++ b/src/com/android/launcher3/settings/SettingsActivity.java @@ -44,6 +44,7 @@ import com.android.launcher3.LauncherFiles; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper; import com.android.launcher3.util.SecureSettingsObserver; @@ -171,6 +172,10 @@ public class SettingsActivity extends FragmentActivity protected boolean initPreference(Preference preference) { switch (preference.getKey()) { case NOTIFICATION_DOTS_PREFERENCE_KEY: + if (WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS) { + return false; + } + // Listen to system notification dot settings while this UI is active. mNotificationDotsObserver = newNotificationSettingsObserver( getActivity(), (NotificationDotsPreference) preference); diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java index 9d877881ec..a64df62c3b 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java @@ -51,6 +51,7 @@ public class WidgetsModel { // True is the widget support is disabled. public static final boolean GO_DISABLE_WIDGETS = false; + public static final boolean GO_DISABLE_NOTIFICATION_DOTS = false; private static final String TAG = "WidgetsModel"; private static final boolean DEBUG = false;