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

Merge "Change the restart button to use material colors" into sc-v2-dev am: 6e88bd05a8 am: 23a5024960

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

Change-Id: Ia7bea4d2e6655c2ae5c95a82014190ce90f8ab6b
This commit is contained in:
Tom Natan
2021-11-20 20:40:18 +00:00
committed by Automerger Merge Worker
parent 01fa40ba0c 23a5024960
commit 46f4555269
8 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/WindowManager/Shell/res/color/size_compat_background_ripple.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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:color="@android:color/system_neutral1_500" android:lStar="35" />
</selector>

2
libs/WindowManager/Shell/res/drawable/size_compat_hint_bubble.xml
View File

@@ -16,6 +16,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/size_compat_hint_bubble"/>
<solid android:color="@color/size_compat_background"/>
<corners android:radius="@dimen/size_compat_hint_corner_radius"/>
</shape>

2
libs/WindowManager/Shell/res/drawable/size_compat_hint_point.xml
View File

@@ -20,6 +20,6 @@
android:viewportWidth="10"
android:viewportHeight="8">
<path
android:fillColor="@color/size_compat_hint_bubble"
android:fillColor="@color/size_compat_background"
android:pathData="M10,0 l-4.1875,6.6875 a1,1 0 0,1 -1.625,0 l-4.1875,-6.6875z"/>
</vector>

6
libs/WindowManager/Shell/res/drawable/size_compat_restart_button.xml
View File

@@ -20,16 +20,16 @@
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="#53534D"
android:fillColor="@color/size_compat_background"
android:pathData="M0,24 a24,24 0 1,0 48,0 a24,24 0 1,0 -48,0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="#E4E3DA"
android:fillColor="@color/size_compat_text"
android:pathData="M6,13c0,-1.65 0.67,-3.15 1.76,-4.24L6.34,7.34C4.9,8.79 4,10.79 4,13c0,4.08 3.05,7.44 7,7.93v-2.02C8.17,18.43 6,15.97 6,13z"/>
<path
android:fillColor="#E4E3DA"
android:fillColor="@color/size_compat_text"
android:pathData="M20,13c0,-4.42 -3.58,-8 -8,-8c-0.06,0 -0.12,0.01 -0.18,0.01v0l1.09,-1.09L11.5,2.5L8,6l3.5,3.5l1.41,-1.41l-1.08,-1.08C11.89,7.01 11.95,7 12,7c3.31,0 6,2.69 6,6c0,2.97 -2.17,5.43 -5,5.91v2.02C16.95,20.44 20,17.08 20,13z"/>
</group>
</vector>

20
libs/WindowManager/Shell/res/drawable/size_compat_restart_button_ripple.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/size_compat_background_ripple">
<item android:drawable="@drawable/size_compat_restart_button"/>
</ripple>

2
libs/WindowManager/Shell/res/layout/size_compat_mode_hint.xml
View File

@@ -40,7 +40,7 @@
android:padding="16dp"
android:text="@string/restart_button_description"
android:textAlignment="viewStart"
android:textColor="#E4E3DA"
android:textColor="@color/size_compat_text"
android:textSize="14sp"/>
<ImageView

2
libs/WindowManager/Shell/res/layout/size_compat_ui.xml
View File

@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/size_compat_restart_button"
android:src="@drawable/size_compat_restart_button_ripple"
android:background="@android:color/transparent"
android:contentDescription="@string/restart_button_description"/>

5
libs/WindowManager/Shell/res/values/colors.xml
View File

@@ -29,7 +29,10 @@
<color name="bubbles_light">#FFFFFF</color>
<color name="bubbles_dark">@color/GM2_grey_800</color>
<color name="bubbles_icon_tint">@color/GM2_grey_700</color>
<color name="size_compat_hint_bubble">#30312B</color>
<!-- Size Compat Restart Button -->
<color name="size_compat_background">@android:color/system_neutral1_800</color>
<color name="size_compat_text">@android:color/system_neutral1_50</color>
<!-- GM2 colors -->
<color name="GM2_grey_200">#E8EAED</color>