Merge "Use standard displayPreference" into pi-dev (b7bfb04f) · Commits · e / os / android_packages_apps_Settings

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

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -83,28 +83,6 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
	return true;		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		// finds the preference recursively and removes it from its parent
	private void findAndRemovePreference(PreferenceGroup prefGroup, String key) {		private void findAndRemovePreference(PreferenceGroup prefGroup, String key) {
	final int preferenceCount = prefGroup.getPreferenceCount();		final int preferenceCount = prefGroup.getPreferenceCount();