Merge "Disable custom clock faces in SystemUI" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
6613ea8da3
@@ -49,6 +49,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.
|
||||
@@ -192,7 +193,9 @@ public class KeyguardClockSwitch extends RelativeLayout {
|
||||
@Override
|
||||
protected void onAttachedToWindow() {
|
||||
super.onAttachedToWindow();
|
||||
mClockManager.addOnClockChangedListener(mClockChangedListener);
|
||||
if (CUSTOM_CLOCKS_ENABLED) {
|
||||
mClockManager.addOnClockChangedListener(mClockChangedListener);
|
||||
}
|
||||
mStatusBarStateController.addCallback(mStateListener);
|
||||
mSysuiColorExtractor.addOnColorsChangedListener(mColorsListener);
|
||||
updateColors();
|
||||
@@ -201,7 +204,9 @@ public class KeyguardClockSwitch extends RelativeLayout {
|
||||
@Override
|
||||
protected void onDetachedFromWindow() {
|
||||
super.onDetachedFromWindow();
|
||||
mClockManager.removeOnClockChangedListener(mClockChangedListener);
|
||||
if (CUSTOM_CLOCKS_ENABLED) {
|
||||
mClockManager.removeOnClockChangedListener(mClockChangedListener);
|
||||
}
|
||||
mStatusBarStateController.removeCallback(mStateListener);
|
||||
mSysuiColorExtractor.removeOnColorsChangedListener(mColorsListener);
|
||||
setClockPlugin(null);
|
||||
|
||||
Reference in New Issue
Block a user