commit 61f04734b8c8da418161cf28d1484017de118884
author Robert Snoeberger <snoeberger@google.com> Thu Jun 27 10:31:09 2019 -0400
committer Robert Snoeberger <snoeberger@google.com> Thu Jun 27 10:35:32 2019 -0400
tree 3e3c289040f9befaa566c2e9e884100365445093
parent ceb2bc6e799c24b619c23f9e7c05e73b3684f024

Disable custom clock faces in SystemUI

This will prevent custom clocks from persisting on dogfooders devices.

Bug: 136090066
Test: `adb shell settings put secure lock_screen_custom_clock_face
"com.android.keyguard.clock.BubbleClockController"` doesn't switch to
Bubble clock.

Change-Id: If9fc43295380d0bc37ca3df4c7187bd4faaf4bde

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

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
index 7ec1bda..b1cba53 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
@@ -49,6 +49,7 @@
 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 @@
     @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 @@
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        mClockManager.removeOnClockChangedListener(mClockChangedListener);
+        if (CUSTOM_CLOCKS_ENABLED) {
+            mClockManager.removeOnClockChangedListener(mClockChangedListener);
+        }
         mStatusBarStateController.removeCallback(mStateListener);
         mSysuiColorExtractor.removeOnColorsChangedListener(mColorsListener);
         setClockPlugin(null);