Merge "Merge "Fixe the problem of invalid switch preference." into tm-dev am:... (a9ed29f9) · Commits · e / os / android_frameworks_base

packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -122,9 +122,10 @@ public class MainSwitchPreference extends TwoStatePreference implements OnMainSw
		* 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);
		}
		}
		@@ -133,9 +134,8 @@ public class MainSwitchPreference extends TwoStatePreference implements OnMainSw
		* Remove a listener for switch changes
		*/
		public void removeOnSwitchChangeListener(OnMainSwitchChangeListener listener) {
		if (mMainSwitchBar == null) {
		mSwitchChangeListeners.remove(listener);
		} else {
		if (mMainSwitchBar != null) {
		mMainSwitchBar.removeOnSwitchChangeListener(listener);
		}
		}