Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Lockscreen quick affordance buttons are bigger now." into tm-qpr-dev am: facfc015b5

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

Change-Id: I2271a9009a8389eedee10aa8ccc50a3e5095aa4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ale Nijamkin
2023-01-20 19:17:32 +00:00
committed by Automerger Merge Worker
parent 2850dd6bb5 facfc015b5
commit a5697ecef3
3 changed files with 42 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
View File

@@ -16,58 +16,13 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<selector <shape
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<item android:state_selected="true"> <solid android:color="?androidprv:attr/colorSurface"/>
<layer-list> <size
<item android:width="@dimen/keyguard_affordance_fixed_width"
android:left="3dp" android:height="@dimen/keyguard_affordance_fixed_height"/>
android:top="3dp" <corners android:radius="@dimen/keyguard_affordance_fixed_radius" />
android:right="3dp" </shape>
android:bottom="3dp">
<!-- We make the shapes a rounded rectangle instead of an oval so that it can animate -->
<!-- properly into an app/dialog. -->
<shape android:shape="rectangle">
<solid android:color="?androidprv:attr/colorSurface"/>
<size
android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_fixed_height"/>
<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
</shape>
</item>
<item>
<shape android:shape="rectangle">
<stroke
android:color="@color/control_primary_text"
android:width="2dp"/>
<size
android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_fixed_height"/>
<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
</shape>
</item>
</layer-list>
</item>
<item>
<layer-list>
<item
android:left="3dp"
android:top="3dp"
android:right="3dp"
android:bottom="3dp">
<shape android:shape="rectangle">
<solid android:color="?androidprv:attr/colorSurface"/>
<size
android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_fixed_height"/>
<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
</shape>
</item>
</layer-list>
</item>
</selector>

31
packages/SystemUI/res/drawable/keyguard_bottom_affordance_selected_border.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 2023, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="oval">
<stroke
android:color="@color/control_primary_text"
android:width="2dp"/>
<size
android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_fixed_height"/>
</shape>
</item>
</selector>

2
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -67,6 +67,7 @@
android:scaleType="center" android:scaleType="center"
android:tint="?android:attr/textColorPrimary" android:tint="?android:attr/textColorPrimary"
android:background="@drawable/keyguard_bottom_affordance_bg" android:background="@drawable/keyguard_bottom_affordance_bg"
android:foreground="@drawable/keyguard_bottom_affordance_selected_border"
android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset" android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset"
android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"
android:visibility="gone" /> android:visibility="gone" />
@@ -79,6 +80,7 @@
android:scaleType="center" android:scaleType="center"
android:tint="?android:attr/textColorPrimary" android:tint="?android:attr/textColorPrimary"
android:background="@drawable/keyguard_bottom_affordance_bg" android:background="@drawable/keyguard_bottom_affordance_bg"
android:foreground="@drawable/keyguard_bottom_affordance_selected_border"
android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset" android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset"
android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"
android:visibility="gone" /> android:visibility="gone" />