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

Commit fae3cac5 authored by Darrell Shi's avatar Darrell Shi Committed by Automerger Merge Worker
Browse files

Merge "Update home controls button on keyguard" into tm-qpr-dev am: 9f632242... 

Merge "Update home controls button on keyguard" into tm-qpr-dev am: 9f632242 am: 293cf801 am: 8d0be90e

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



Change-Id: I84deca741374b801ced49dfcd1ad482d7c347e9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af51797b 8d0be90e

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+4 −2
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ 
        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"

        android:layout_gravity="bottom|start"

        android:scaleType="center"

        android:scaleType="fitCenter"

        android:padding="@dimen/keyguard_affordance_fixed_padding"

        android:tint="?android:attr/textColorPrimary"

        android:background="@drawable/keyguard_bottom_affordance_bg"

        android:foreground="@drawable/keyguard_bottom_affordance_selected_border"
@@ -77,7 +78,8 @@ 
        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"

        android:layout_gravity="bottom|end"

        android:scaleType="center"

        android:scaleType="fitCenter"

        android:padding="@dimen/keyguard_affordance_fixed_padding"

        android:tint="?android:attr/textColorPrimary"

        android:background="@drawable/keyguard_bottom_affordance_bg"

        android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -793,6 +793,7 @@ 
    <dimen name="keyguard_affordance_fixed_height">48dp</dimen>

    <dimen name="keyguard_affordance_fixed_width">48dp</dimen>

    <dimen name="keyguard_affordance_fixed_radius">24dp</dimen>

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



    <!-- Amount the button should shake when it's not long-pressed for long enough. -->

    <dimen name="keyguard_affordance_shake_amplitude">8dp</dimen>