diff options
5 files changed, 13 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 4d19161944fd..d723bda80455 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1424,6 +1424,11 @@ <!-- Is the lock-screen disabled for new users by default --> <bool name="config_disableLockscreenByDefault">false</bool> + <!-- Provides default value for double line clock in lock screen setting: + 0 - Don't show double line clock + 1 - Show double line clock in lock screen (default) --> + <integer name="config_doublelineClockDefault">1</integer> + <!-- If true, enables verification of the lockscreen credential in the factory reset protection flow. This should be true if gatekeeper / weaver credentials can still be checked after a factory reset. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 99559e519897..d20d387d3927 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2355,6 +2355,9 @@ <java-symbol type="dimen" name="popup_enter_animation_from_y_delta" /> <java-symbol type="dimen" name="popup_exit_animation_to_y_delta" /> + <!-- For double line clock in lock screen --> + <java-symbol type="integer" name="config_doublelineClockDefault"/> + <!-- ImfTest --> <java-symbol type="layout" name="auto_complete_list" /> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 358581dc84fe..94bbebb066f1 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -545,7 +545,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS private void updateDoubleLineClock() { mCanShowDoubleLineClock = mSecureSettings.getIntForUser( - Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, 1, + Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, mView.getResources() + .getInteger(com.android.internal.R.integer.config_doublelineClockDefault), UserHandle.USER_CURRENT) != 0; if (!mCanShowDoubleLineClock) { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerBaseTest.java index 1be87463250f..c9f3309ef250 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerBaseTest.java @@ -149,6 +149,8 @@ public class KeyguardClockSwitchControllerBaseTest extends SysuiTestCase { .thenReturn(100); when(mResources.getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin)) .thenReturn(-200); + when(mResources.getInteger(com.android.internal.R.integer.config_doublelineClockDefault)) + .thenReturn(1); when(mResources.getInteger(R.integer.keyguard_date_weather_view_invisibility)) .thenReturn(INVISIBLE); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java index e64ef04cd3af..d84c2c0415eb 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java @@ -165,6 +165,7 @@ public class KeyguardClockSwitchControllerTest extends KeyguardClockSwitchContro // When a settings change has occurred to the small clock, make sure the view is adjusted reset(mView); + when(mView.getResources()).thenReturn(mResources); observer.onChange(true); mExecutor.runAllReady(); verify(mView).switchToClock(KeyguardClockSwitch.SMALL, /* animate */ true); |