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

Commit 4532f7f9 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 

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



Change-Id: I405a89236d0a94da44035bf2528df3915003e6d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b9c7f11 3797d090

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

        }

    }