PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix legacy app notification pages"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-15 22:36:12 +00:00
committed by Android (Google) Code Review
parent 1aa75aa71a 7d914f509a
commit 2195fd721a
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -51,6 +51,8 @@ public class AppNotificationSettings extends NotificationSettingsBase {
private static String KEY_ADVANCED_CATEGORY = "app_advanced"; private static String KEY_ADVANCED_CATEGORY = "app_advanced";
private static String KEY_BADGE = "badge"; private static String KEY_BADGE = "badge";
private static String KEY_APP_LINK = "app_link"; private static String KEY_APP_LINK = "app_link";
private static String KEY_BUBBLE = "bubble";
private static String[] LEGACY_NON_ADVANCED_KEYS = {KEY_BADGE, KEY_APP_LINK, KEY_BUBBLE};
private List<NotificationChannelGroup> mChannelGroupList; private List<NotificationChannelGroup> mChannelGroupList;
@@ -65,21 +67,16 @@ public class AppNotificationSettings extends NotificationSettingsBase {
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
if (mShowLegacyChannelConfig && screen != null) { if (mShowLegacyChannelConfig && screen != null) {
// if showing legacy settings, pull advanced settings out of the advanced category // if showing legacy settings, pull advanced settings out of the advanced category
Preference badge = findPreference(KEY_BADGE);
Preference appLink = findPreference(KEY_APP_LINK);
PreferenceGroup advanced = (PreferenceGroup) findPreference(KEY_ADVANCED_CATEGORY); PreferenceGroup advanced = (PreferenceGroup) findPreference(KEY_ADVANCED_CATEGORY);
removePreference(KEY_ADVANCED_CATEGORY); removePreference(KEY_ADVANCED_CATEGORY);
if (badge != null) {
if (advanced != null) { if (advanced != null) {
advanced.removePreference(badge); for (String key : LEGACY_NON_ADVANCED_KEYS) {
Preference pref = advanced.findPreference(key);
advanced.removePreference(pref);
if (pref != null) {
screen.addPreference(pref);
} }
screen.addPreference(badge);
} }
if (appLink != null) {
if (advanced != null) {
advanced.removePreference(appLink);
}
screen.addPreference(appLink);
} }
} }
} }