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

Commit 8fa9dd81 authored by Robert Snoeberger's avatar Robert Snoeberger Committed by android-build-merger
Browse files

Merge "Disable custom clock faces in SystemUI" into qt-dev 

am: 6613ea8d

Change-Id: I4418cad82e478cc835da76dc5524bcbe23bdf592
parents 33cc3500 6613ea8d

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+7 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import javax.inject.Named; 
public class KeyguardClockSwitch extends RelativeLayout {



    private static final String TAG = "KeyguardClockSwitch";

    private static final boolean CUSTOM_CLOCKS_ENABLED = false;



    /**

     * Animation fraction when text is transitioned to/from bold.
@@ -198,7 +199,9 @@ public class KeyguardClockSwitch extends RelativeLayout { 
    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        if (CUSTOM_CLOCKS_ENABLED) {

            mClockManager.addOnClockChangedListener(mClockChangedListener);

        }

        mStatusBarStateController.addCallback(mStateListener);

        mSysuiColorExtractor.addOnColorsChangedListener(mColorsListener);

        updateColors();
@@ -207,7 +210,9 @@ public class KeyguardClockSwitch extends RelativeLayout { 
    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        if (CUSTOM_CLOCKS_ENABLED) {

            mClockManager.removeOnClockChangedListener(mClockChangedListener);

        }

        mStatusBarStateController.removeCallback(mStateListener);

        mSysuiColorExtractor.removeOnColorsChangedListener(mColorsListener);

        setClockPlugin(null);