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

Commit bda966d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update clock location" into sc-v2-dev

parents 9e02787d 5a251be2

packages/SystemUI/res/values-h800dp/dimens.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,5 +22,5 @@ 
    <dimen name="large_clock_text_size">200dp</dimen>

    <dimen name="large_clock_text_size">200dp</dimen>





    <!-- With the large clock, move up slightly from the center -->

    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_margin">-104dp</dimen>

    <dimen name="keyguard_large_clock_top_margin">-112dp</dimen>

</resources>
 
</resources>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -601,7 +601,7 @@ 
    <!-- When large clock is showing, offset the smartspace by this amount -->

    <!-- When large clock is showing, offset the smartspace by this amount -->

    <dimen name="keyguard_smartspace_top_offset">12dp</dimen>

    <dimen name="keyguard_smartspace_top_offset">12dp</dimen>

    <!-- With the large clock, move up slightly from the center -->

    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_margin">-52dp</dimen>

    <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>





    <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->

    <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->

    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>

    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -275,11 +275,9 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    }

    }





    private void updateClockLayout() {

    private void updateClockLayout() {

        int largeClockTopMargin = 0;

        int largeClockTopMargin = getContext().getResources().getDimensionPixelSize(

        if (mSmartspaceController.isEnabled()) {

            largeClockTopMargin = getContext().getResources().getDimensionPixelSize(

                R.dimen.keyguard_large_clock_top_margin);

                R.dimen.keyguard_large_clock_top_margin);

        }



        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT,

        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT,

                MATCH_PARENT);

                MATCH_PARENT);

        lp.topMargin = largeClockTopMargin;

        lp.topMargin = largeClockTopMargin;