Merge "Update home controls button on keyguard" into tm-qpr-dev am: 9f632242e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22238110 Change-Id: I0047599415c0aee11d53bc3c8e901bd67a349825 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -800,6 +800,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>
|
||||
|
||||
Reference in New Issue
Block a user