Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6613ea8da3

Change-Id: I4418cad82e478cc835da76dc5524bcbe23bdf592
This commit is contained in:
Robert Snoeberger
2019-06-27 13:50:37 -07:00
committed by android-build-merger
parent 33cc350063 6613ea8da3
commit 8fa9dd8173
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
View File

@@ -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();
mClockManager.addOnClockChangedListener(mClockChangedListener);
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();
mClockManager.removeOnClockChangedListener(mClockChangedListener);
if (CUSTOM_CLOCKS_ENABLED) {
mClockManager.removeOnClockChangedListener(mClockChangedListener);
}
mStatusBarStateController.removeCallback(mStateListener);
mSysuiColorExtractor.removeOnColorsChangedListener(mColorsListener);
setClockPlugin(null);