summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabian Kozynski <kozynski@google.com> 2021-04-30 13:09:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-04-30 13:09:37 +0000
commit23f05811467df45611e77e158b5e85be8911dc88 (patch)
treeaefdca1aa76fb582557003fac5088430733a9c5a
parentb52ccdca2be437861a1698e3cc7a08bf4582b63f (diff)
parentc070501daf4affe967ff7c1a8f98a0b09e15e1bf (diff)
Merge "Bring privacy chip size up to spec" into sc-dev
-rw-r--r--packages/SystemUI/res/layout/ongoing_privacy_chip.xml8
-rw-r--r--packages/SystemUI/res/values/colors.xml3
-rw-r--r--packages/SystemUI/res/values/dimens.xml2
3 files changed, 7 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout/ongoing_privacy_chip.xml b/packages/SystemUI/res/layout/ongoing_privacy_chip.xml
index bad582669079..676e49298cef 100644
--- a/packages/SystemUI/res/layout/ongoing_privacy_chip.xml
+++ b/packages/SystemUI/res/layout/ongoing_privacy_chip.xml
@@ -22,14 +22,16 @@
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical|end"
- android:focusable="true"
- android:minWidth="48dp" >
+ android:focusable="true" >
<LinearLayout
android:id="@+id/icons_container"
android:layout_height="@dimen/ongoing_appops_chip_height"
android:layout_width="wrap_content"
- android:gravity="center_vertical"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:gravity="center"
android:layout_gravity="center"
+ android:minWidth="56dp"
/>
</com.android.systemui.privacy.OngoingPrivacyChip> \ No newline at end of file
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index bf13c2178d45..ee25a1059d63 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -280,8 +280,7 @@
<color name="screenrecord_status_color">#E94235</color>
- <!-- TODO(b/178093014) Colors for privacy dialog. These should be changed to the new palette -->
- <color name="privacy_circle">#1E8E3E</color> <!-- g600 -->
+ <color name="privacy_circle">#5BB974</color> <!-- g400 -->
<!-- Accessibility floating menu -->
<color name="accessibility_floating_menu_background">#CCFFFFFF</color> <!-- 80% -->
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 6c66d0748f76..5371b413f389 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1237,7 +1237,7 @@
<!-- Icon size of Ongoing App Ops chip -->
<dimen name="ongoing_appops_chip_icon_size">16dp</dimen>
<!-- Radius of Ongoing App Ops chip corners -->
- <dimen name="ongoing_appops_chip_bg_corner_radius">16dp</dimen>
+ <dimen name="ongoing_appops_chip_bg_corner_radius">28dp</dimen>
<dimen name="ongoing_appops_dialog_side_margins">@dimen/notification_shade_content_margin_horizontal</dimen>