From b9676e9076198da00254ce1f1374bd20404ffe51 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Wed, 23 May 2018 11:09:34 -0400 Subject: [PATCH] Use standard displayPreference For notification fields. This is required for them to display properly within an 'advanced' preference category. Test: robotests, manual Change-Id: I1e1ff0e801e136c6a86a0d9164ed21d4160e897a Fixes: 80132743 --- .../NotificationPreferenceController.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java index 1e477c41fd2..0c5dc0e268f 100644 --- a/src/com/android/settings/notification/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/NotificationPreferenceController.java @@ -83,28 +83,6 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc return true; } - /** - * Displays or removes preference in this controller. - */ - @Override - public void displayPreference(PreferenceScreen screen) { - if (isAvailable()) { - final Preference preference = screen.findPreference(getPreferenceKey()); - if (mPreference != null && preference == null) { - screen.addPreference(mPreference); - } - if (preference != null) { - mPreference = preference; - } - if (mPreference != null && this instanceof Preference.OnPreferenceChangeListener) { - mPreference.setOnPreferenceChangeListener( - (Preference.OnPreferenceChangeListener) this); - } - } else { - findAndRemovePreference(screen, getPreferenceKey()); - } - } - // finds the preference recursively and removes it from its parent private void findAndRemovePreference(PreferenceGroup prefGroup, String key) { final int preferenceCount = prefGroup.getPreferenceCount();