summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Stefani <luca.stefani.ge1@gmail.com>2019-09-06 21:37:37 +0200
committerBruno Martins <bgcngm@gmail.com>2019-11-22 17:17:32 +0100
commite4a6d332770d055de78b6cf831187c523962d8ea (patch)
tree12cd642013c9a48582ddd8f1597cff8f214b19f9
parent1a2b508355478b19d1f4ca07eb0037bc12766217 (diff)
downloadandroid_frameworks_base-e4a6d332770d055de78b6cf831187c523962d8ea.tar.gz
android_frameworks_base-e4a6d332770d055de78b6cf831187c523962d8ea.tar.bz2
android_frameworks_base-e4a6d332770d055de78b6cf831187c523962d8ea.zip
Revert "Disable custom clock faces in SystemUI"
This reverts commit 61f04734b8c8da418161cf28d1484017de118884. Change-Id: Ifd9aae4909e048673c3c16229c72fadcbdc2e3b9
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
index fee2c9b2505..388acba21cc 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
@@ -49,7 +49,6 @@ 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.
@@ -193,9 +192,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
- if (CUSTOM_CLOCKS_ENABLED) {
- mClockManager.addOnClockChangedListener(mClockChangedListener);
- }
+ mClockManager.addOnClockChangedListener(mClockChangedListener);
mStatusBarStateController.addCallback(mStateListener);
mSysuiColorExtractor.addOnColorsChangedListener(mColorsListener);
updateColors();
@@ -204,9 +201,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
- if (CUSTOM_CLOCKS_ENABLED) {
- mClockManager.removeOnClockChangedListener(mClockChangedListener);
- }
+ mClockManager.removeOnClockChangedListener(mClockChangedListener);
mStatusBarStateController.removeCallback(mStateListener);
mSysuiColorExtractor.removeOnColorsChangedListener(mColorsListener);
setClockPlugin(null);