Merge "Permission rationale label outline color update" into udc-dev

6 files changed, 37 insertions, 1 deletions

diff --git a/PermissionController/res/drawable/grant_dialog_permission_rationale_background.xml b/PermissionController/res/drawable/grant_dialog_permission_rationale_background.xml
index 2c2f588cd..6393742aa 100644
--- a/PermissionController/res/drawable/grant_dialog_permission_rationale_background.xml
+++ b/PermissionController/res/drawable/grant_dialog_permission_rationale_background.xml
@@ -18,5 +18,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <corners android:radius="16dp"/>
-    <stroke android:width="1dp" android:color="?android:attr/textColorSecondaryInverse" />
+    <stroke android:width="1dp" android:color="@color/permission_rationale_overview_background" />
 </shape>
\ No newline at end of file
diff --git a/PermissionController/res/values-night-v31/colors.xml b/PermissionController/res/values-night-v31/colors.xml
index a61576137..2dcc99a58 100644
--- a/PermissionController/res/values-night-v31/colors.xml
+++ b/PermissionController/res/values-night-v31/colors.xml
@@ -17,4 +17,7 @@
 <resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <color name="warning_surface">#333124</color>
     <color name="warning_onsurface">#FDD663</color>
+
+    <!-- overviewBackground is not visible from mainline, so UX provided this alternative -->
+    <color name="permission_rationale_overview_background">@android:color/system_neutral1_600</color>
 </resources>
\ No newline at end of file
diff --git a/PermissionController/res/values-night/colors.xml b/PermissionController/res/values-night/colors.xml
new file mode 100644
index 000000000..82d96ba05
--- /dev/null
+++ b/PermissionController/res/values-night/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 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.
+  -->
+
+<resources>
+    <!-- overviewBackground is not visible from mainline, so UX provided this alternative.
+    system_neutral1_600 is v31+ so use this placeholder provided by ux -->
+    <color name="permission_rationale_overview_background">#5F6368</color>
+</resources>
diff --git a/PermissionController/res/values-v31/colors.xml b/PermissionController/res/values-v31/colors.xml
index 1e4d8c1c8..c8f194ef7 100644
--- a/PermissionController/res/values-v31/colors.xml
+++ b/PermissionController/res/values-v31/colors.xml
@@ -17,4 +17,7 @@
 <resources>
     <color name="warning_surface">#F0E3A8</color>
     <color name="warning_onsurface">#895900</color>
+
+    <!-- overviewBackground is not visible from mainline, so UX provided this alternative -->
+    <color name="permission_rationale_overview_background">@android:color/system_neutral2_200</color>
 </resources>
\ No newline at end of file
diff --git a/PermissionController/res/values/colors.xml b/PermissionController/res/values/colors.xml
index 5646ddf83..e54edb506 100644
--- a/PermissionController/res/values/colors.xml
+++ b/PermissionController/res/values/colors.xml
@@ -28,4 +28,8 @@
     <color name="car_card_ripple_background">#27ffffff</color>
     <color name="car_accent">#ff60a8f0</color>
     <color name="car_divider_color">#1fffffff</color>
+
+    <!-- overviewBackground is not visible from mainline, so UX provided this alternative.
+    system_neutral2_200 is v31+ so use this placeholder provided by ux -->
+    <color name="permission_rationale_overview_background">#DADCE0</color>
 </resources>
diff --git a/PermissionController/res/values/overlayable.xml b/PermissionController/res/values/overlayable.xml
index 8efbf176a..bf145883c 100644
--- a/PermissionController/res/values/overlayable.xml
+++ b/PermissionController/res/values/overlayable.xml
@@ -69,6 +69,8 @@
             <item type="style" name="PermissionGrantPermissionRationaleMessage" />
             <item type="style" name="PermissionGrantPermissionRationaleMoreInfoIcon" />
 
+            <item type="color" name="permission_rationale_overview_background" />
+
             <!-- END PERMISSION GRANT DIALOG -->
 
             <!-- START PERMISSION RATIONALE DIALOG -->
@@ -91,6 +93,8 @@
             <item type="style" name="PermissionRationaleButtonContainer" />
             <item type="style" name="PermissionRationaleBackButton" />
 
+            <item type="color" name="permission_rationale_accent_primary_variant" />
+
             <!-- END PERMISSION RATIONALE DIALOG -->
 
             <!-- START PERMISSION REVIEW SCREEN -->