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

Commit 5dd6232f authored by Robert Snoeberger's avatar Robert Snoeberger Committed by android-build-merger
Browse files

Merge "Consider lock icon when determining minimum top padding." into qt-dev 

am: 03236b2e

Change-Id: Ifd4c18d95dcc2ba05c934de986405e6a21656389
parents adc4d747 03236b2e

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -591,6 +591,8 @@ 
    <dimen name="keyguard_clock_notifications_margin">30dp</dimen>

    <!-- Minimum margin between clock and status bar -->

    <dimen name="keyguard_clock_top_margin">36dp</dimen>

    <!-- The margin between top of clock and bottom of lock icon. -->

    <dimen name="keyguard_clock_lock_margin">16dp</dimen>



    <item name="scrim_behind_alpha" format="float" type="dimen">0.62</item>

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java

+7 −2
Original line number Diff line number Diff line
@@ -117,8 +117,13 @@ public class KeyguardClockPositionAlgorithm { 
    public void loadDimens(Resources res) {

        mClockNotificationsMargin = res.getDimensionPixelSize(

                R.dimen.keyguard_clock_notifications_margin);

        mContainerTopPadding = res.getDimensionPixelSize(

                R.dimen.keyguard_clock_top_margin);

        // Consider the lock icon when determining the minimum top padding between the status bar

        // and top of the clock.

        mContainerTopPadding = Math.max(res.getDimensionPixelSize(

                R.dimen.keyguard_clock_top_margin),

                res.getDimensionPixelSize(R.dimen.keyguard_lock_height)

                        + res.getDimensionPixelSize(R.dimen.keyguard_lock_padding)

                        + res.getDimensionPixelSize(R.dimen.keyguard_clock_lock_margin));

        mBurnInPreventionOffsetX = res.getDimensionPixelSize(

                R.dimen.burn_in_prevention_offset_x);

        mBurnInPreventionOffsetY = res.getDimensionPixelSize(