Merge "Fixe the problem of invalid switch preference." into tm-dev (0e861f09) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/widget/SettingsMainSwitchPreference.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -199,9 +199,10 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
		* Set the OnBeforeCheckedChangeListener.
		*/
		public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
		if (mMainSwitchBar == null) {
		if (!mBeforeCheckedChangeListeners.contains(listener)) {
		mBeforeCheckedChangeListeners.add(listener);
		} else {
		}
		if (mMainSwitchBar != null) {
		mMainSwitchBar.setOnBeforeCheckedChangeListener(listener);
		}
		}
		@@ -210,9 +211,10 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
		* Adds a listener for switch changes
		*/
		public void addOnSwitchChangeListener(OnMainSwitchChangeListener listener) {
		if (mMainSwitchBar == null) {
		if (!mSwitchChangeListeners.contains(listener)) {
		mSwitchChangeListeners.add(listener);
		} else {
		}
		if (mMainSwitchBar != null) {
		mMainSwitchBar.addOnSwitchChangeListener(listener);
		}
		}
		@@ -221,9 +223,8 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements
		* Remove a listener for switch changes
		*/
		public void removeOnSwitchChangeListener(OnMainSwitchChangeListener listener) {
		if (mMainSwitchBar == null) {
		mSwitchChangeListeners.remove(listener);
		} else {
		if (mMainSwitchBar != null) {
		mMainSwitchBar.removeOnSwitchChangeListener(listener);
		}
		}