Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18575226 authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Fixe the problem of invalid switch preference." into tm-dev am: 3797d090 am: 665d6818 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956549



Change-Id: I4144c134e742288b6bb7e59e94a3c1f0d4edbadb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8971bb34 665d6818

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);

        }

    }