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

Commit 12b12835 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Smartspace padding for AOD/LS" into sc-dev am: 2e281d02 am: bac3c716 

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

Change-Id: I2109dcf6953ba0fdb5c63295eefa2b461f183e3d
parents b8f6a77f bac3c716

packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/notification_shelf_height"

        android:layout_below="@id/keyguard_status_area"

        android:paddingStart="@dimen/below_clock_padding_start_extra"

        android:paddingStart="@dimen/below_clock_padding_start_icons"

        android:visibility="invisible"

    />

</com.android.keyguard.KeyguardClockSwitch>

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

+2 −1
Original line number Diff line number Diff line
@@ -94,5 +94,6 @@ 
    <!-- additional offset for clock switch area items -->

    <dimen name="clock_padding_start">28dp</dimen>

    <dimen name="below_clock_padding_start">32dp</dimen>

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

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

    <dimen name="below_clock_padding_start_icons">28dp</dimen>

</resources>

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

+4 −2
Original line number Diff line number Diff line
@@ -183,9 +183,11 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            lp.addRule(RelativeLayout.BELOW, R.id.lockscreen_clock_view);



            mView.addView(mSmartspaceView, ksaIndex, lp);

            int padding = getContext().getResources()

            int startPadding = getContext().getResources()

                    .getDimensionPixelSize(R.dimen.below_clock_padding_start);

            mSmartspaceView.setPadding(padding, 0, padding, 0);

            int endPadding = getContext().getResources()

                    .getDimensionPixelSize(R.dimen.below_clock_padding_end);

            mSmartspaceView.setPaddingRelative(startPadding, 0, endPadding, 0);



            // ... but above the large clock

            lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);