Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24b89b4b authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Add support to configure double line clock in lockscreen [1/2]" into... 

Merge "Add support to configure double line clock in lockscreen [1/2]" into udc-qpr-dev-plus-aosp am: f6ed5785

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24874922



Change-Id: I1750f09ae0b079a40e9dd72d328ffe00d9d8dd27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab2a1c80 f6ed5785

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -1440,6 +1440,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. -->

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,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" />

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

+2 −1
Original line number Diff line number Diff line
@@ -558,7 +558,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) {

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerBaseTest.java

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ public class KeyguardClockSwitchControllerBaseTest extends SysuiTestCase { 
                .thenReturn(100);

        when(mResources.getDimensionPixelSize(com.android.systemui.customization.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);

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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);