diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-20 07:45:27 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-20 07:45:27 +0000 |
| commit | 1b60530b9272671b6bddda223aea9dfd95f5d469 (patch) | |
| tree | b755c5b64eb096681181d4ddb36c313988309141 /src/com/android/launcher3/SettingsActivity.java | |
| parent | f78db7fa5c485433b362b68a497a80cd728faf19 (diff) | |
| parent | fb46415e803a7f20a7d48bf42106f3f40cd769dd (diff) | |
| download | android_packages_apps_Trebuchet-1b60530b9272671b6bddda223aea9dfd95f5d469.tar.gz android_packages_apps_Trebuchet-1b60530b9272671b6bddda223aea9dfd95f5d469.tar.bz2 android_packages_apps_Trebuchet-1b60530b9272671b6bddda223aea9dfd95f5d469.zip | |
release-request-42a2a3ad-8c90-4c84-a0ad-5d067beb8e30-for-git_oc-mr1-release-4349323 snap-temp-L16100000104414353
Change-Id: I98e6266bf9b4b187c6ad6f24d06b1f02e8beef97
Diffstat (limited to 'src/com/android/launcher3/SettingsActivity.java')
| -rw-r--r-- | src/com/android/launcher3/SettingsActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java index 90463725f..d40ac8f97 100644 --- a/src/com/android/launcher3/SettingsActivity.java +++ b/src/com/android/launcher3/SettingsActivity.java @@ -94,10 +94,12 @@ public class SettingsActivity extends Activity { ButtonPreference iconBadgingPref = (ButtonPreference) findPreference(ICON_BADGING_PREFERENCE_KEY); - if (!Utilities.isAtLeastO()) { + if (!Utilities.ATLEAST_OREO) { 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( |