OSDN Git Service

Use standard displayPreference
authorJulia Reynolds <juliacr@google.com>
Wed, 23 May 2018 15:09:34 +0000 (11:09 -0400)
committerJulia Reynolds <juliacr@google.com>
Wed, 23 May 2018 16:44:44 +0000 (16:44 +0000)
For notification fields. This is required for them to
display properly within an 'advanced' preference category.

Test: robotests, manual
Change-Id: I1e1ff0e801e136c6a86a0d9164ed21d4160e897a
Fixes: 80132743

src/com/android/settings/notification/NotificationPreferenceController.java

index 1e477c4..0c5dc0e 100644 (file)
@@ -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();