summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-08-14 14:31:03 -0700
committerTony Wickham <twickham@google.com>2017-08-14 15:09:24 -0700
commitc138515c4e230620d639b5ef5d98d7a12d8d82d2 (patch)
treef020a86a8c1bea65473c6f4ab8f33154797f1b00
parent492617f4c48155c2efc4f07464c8f86625590367 (diff)
downloadandroid_packages_apps_Trebuchet-c138515c4e230620d639b5ef5d98d7a12d8d82d2.zip
android_packages_apps_Trebuchet-c138515c4e230620d639b5ef5d98d7a12d8d82d2.tar.gz
android_packages_apps_Trebuchet-c138515c4e230620d639b5ef5d98d7a12d8d82d2.tar.bz2
Remove notification dots setting for Launcher3Go
Also remove BADGE_ICONS flag as it is no longer used or necessary. Bug: 64561196 Change-Id: Icf9656537459a7dbad3a07830eedbdeec8d8f1ce
-rw-r--r--go/res/values-v26/bools.xml21
-rw-r--r--src/com/android/launcher3/SettingsActivity.java2
-rw-r--r--src/com/android/launcher3/config/BaseFlags.java2
-rw-r--r--src/com/android/launcher3/notification/NotificationListener.java4
4 files changed, 23 insertions, 6 deletions
diff --git a/go/res/values-v26/bools.xml b/go/res/values-v26/bools.xml
new file mode 100644
index 0000000..cc4a7ba
--- /dev/null
+++ b/go/res/values-v26/bools.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <bool name="notification_badging_enabled">false</bool>
+</resources> \ No newline at end of file
diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java
index 9046372..5bdc1f5 100644
--- a/src/com/android/launcher3/SettingsActivity.java
+++ b/src/com/android/launcher3/SettingsActivity.java
@@ -98,6 +98,8 @@ public class SettingsActivity extends Activity {
getPreferenceScreen().removePreference(
findPreference(SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY));
getPreferenceScreen().removePreference(iconBadgingPref);
+ } else if (!getResources().getBoolean(R.bool.notification_badging_enabled)) {
+ getPreferenceScreen().removePreference(iconBadgingPref);
} else {
// Listen to system notification badge settings while this UI is active.
mIconBadgingObserver = new IconBadgingObserver(
diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java
index 7964dd1..a2d8435 100644
--- a/src/com/android/launcher3/config/BaseFlags.java
+++ b/src/com/android/launcher3/config/BaseFlags.java
@@ -57,8 +57,6 @@ abstract class BaseFlags {
public static final boolean PULLDOWN_SEARCH = false;
// When enabled the status bar may show dark icons based on the top of the wallpaper.
public static final boolean LIGHT_STATUS_BAR = false;
- // When enabled icons are badged with the number of notifications associated with that app.
- public static final boolean BADGE_ICONS = true;
// When enabled, icons not supporting {@link AdaptiveIconDrawable} will be wrapped in {@link FixedScaleDrawable}.
public static final boolean LEGACY_ICON_TREATMENT = true;
// When enabled, adaptive icons would have shadows baked when being stored to icon cache.
diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index 6a70989..9126626 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -32,7 +32,6 @@ import android.util.Log;
import android.util.Pair;
import com.android.launcher3.LauncherModel;
-import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.util.PackageUserKey;
import com.android.launcher3.util.SettingsObserver;
@@ -164,9 +163,6 @@ public class NotificationListener extends NotificationListenerService {
}
public static void setNotificationsChangedListener(NotificationsChangedListener listener) {
- if (!FeatureFlags.BADGE_ICONS) {
- return;
- }
sNotificationsChangedListener = listener;
NotificationListener notificationListener = getInstanceIfConnected();