Merge "Update privacy indicators bg color" into sc-dev

This commit is contained in:
Fabian Kozynski
2021-05-06 18:16:26 +00:00
committed by Android (Google) Code Review
7 changed files with 6 additions and 9 deletions

View File

@@ -16,6 +16,6 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/privacy_circle" /> <solid android:color="@color/privacy_chip_background" />
<corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" /> <corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />
</shape> </shape>

View File

@@ -24,7 +24,7 @@
android:height="@dimen/ongoing_appops_dialog_circle_size" android:height="@dimen/ongoing_appops_dialog_circle_size"
android:width="@dimen/ongoing_appops_dialog_circle_size" android:width="@dimen/ongoing_appops_dialog_circle_size"
/> />
<solid android:color="@color/privacy_circle" /> <solid android:color="@color/privacy_chip_background" />
</shape> </shape>
</item> </item>
<item android:id="@id/icon" <item android:id="@id/icon"

View File

@@ -24,7 +24,7 @@
android:height="@dimen/ongoing_appops_dialog_circle_size" android:height="@dimen/ongoing_appops_dialog_circle_size"
android:width="@dimen/ongoing_appops_dialog_circle_size" android:width="@dimen/ongoing_appops_dialog_circle_size"
/> />
<solid android:color="@color/privacy_circle" /> <solid android:color="@color/privacy_chip_background" />
</shape> </shape>
</item> </item>
<item android:id="@id/icon" <item android:id="@id/icon"

View File

@@ -24,7 +24,7 @@
android:height="@dimen/ongoing_appops_dialog_circle_size" android:height="@dimen/ongoing_appops_dialog_circle_size"
android:width="@dimen/ongoing_appops_dialog_circle_size" android:width="@dimen/ongoing_appops_dialog_circle_size"
/> />
<solid android:color="@color/privacy_circle" /> <solid android:color="@color/privacy_chip_background" />
</shape> </shape>
</item> </item>
<item android:id="@id/icon" <item android:id="@id/icon"

View File

@@ -18,7 +18,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval">
<solid <solid
android:color="@color/privacy_circle"/> android:color="@color/privacy_chip_background"/>
<size <size
android:width="6dp" android:width="6dp"
android:height="6dp" android:height="6dp"

View File

@@ -95,9 +95,6 @@
<!-- Color of background circle of user avatars in quick settings user switcher --> <!-- Color of background circle of user avatars in quick settings user switcher -->
<color name="qs_user_switcher_avatar_background">#3C4043</color> <color name="qs_user_switcher_avatar_background">#3C4043</color>
<!-- Colors for privacy dialog. These should be changed to the new palette -->
<color name="privacy_circle">#81C995</color> <!-- g300 -->
<!-- Accessibility floating menu --> <!-- Accessibility floating menu -->
<color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% --> <color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->
</resources> </resources>

View File

@@ -279,7 +279,7 @@
<color name="screenrecord_status_color">#E94235</color> <color name="screenrecord_status_color">#E94235</color>
<color name="privacy_circle">#5BB974</color> <!-- g400 --> <color name="privacy_chip_background">#3ddc84</color>
<!-- Accessibility floating menu --> <!-- Accessibility floating menu -->
<color name="accessibility_floating_menu_background">#CCFFFFFF</color> <!-- 80% --> <color name="accessibility_floating_menu_background">#CCFFFFFF</color> <!-- 80% -->