Replace references to private APIs

This does not touch car

Test: Build and compare before/after screenshots of affected components
Bug: 130871088
Bug: 124489023
Change-Id: Ic0526f31941dc22f08a0e6d11a03e03c030d2cc8

5 files changed, 16 insertions, 6 deletions

diff --git a/res/values/colors.xml b/res/values/colors.xml
index cf9562fc..a5e85e16 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,4 +18,5 @@
 <resources>
     <color name="bigIconColor">#C8CCCE</color>
     <color name="google_grey_800">#3C4043</color>
+    <color name="system_notification_accent_color">#ff607D8B</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ecdf6dc6..bac131a6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -45,6 +45,11 @@
     <dimen name="wear_permission_review_pref_padding">8dp</dimen>
     <dimen name="wear_permission_review_icon_size">24dp</dimen>
 
+    <!-- Dialog button bar width -->
+    <dimen name="alert_dialog_button_bar_width">64dp</dimen>
+    <!-- Dialog button bar height -->
+    <dimen name="alert_dialog_button_bar_height">48dp</dimen>
+
     <!-- Incident report confirmation -->
     <dimen name="incident_image_width">150dp</dimen>
     <dimen name="incident_image_height">200dp</dimen>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index 4021e618..3ccbacbe 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -186,6 +186,10 @@
             <item type="style" name="AccessibilityServiceDialogItemSummary" />
             <!-- END ACCESSIBILITY SERVICE DIALOG ITEM -->
 
+            <!-- START LOCATION ACCESS CHECK PIN DROP -->
+            <item type="color" name="system_notification_accent_color" />
+            <!-- END LOCATION ACCESS CHECK PIN DROP -->
+
             <!-- START SETTINGSLIB BARCHARTPREFERENCE -->
             <item type="style" name="SettingsBarChart" />
             <item type="style" name="SettingsBarChartTitle" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bc91f0dd..9da063d7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -36,7 +36,6 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">?android:attr/windowBackground</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:divider">@*android:drawable/list_divider_material</item>
         <item name="android:showDividers">middle</item>
     </style>
 
@@ -84,7 +83,6 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:divider">@*android:drawable/list_divider_material</item>
         <item name="android:showDividers">middle</item>
     </style>
 
@@ -95,7 +93,7 @@
     </style>
 
     <style name="PermissionGrantButton"
-           parent="@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog">
+           parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">56dp</item>
         <item name="android:paddingLeft">8dp</item>
@@ -175,7 +173,9 @@
     </style>
 
     <style name="PermissionReviewButton"
-           parent="@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog">
+           parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored">
+        <item name="android:minWidth">@dimen/alert_dialog_button_bar_width</item>
+        <item name="android:minHeight">@dimen/alert_dialog_button_bar_height</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3eb00b4e..4dd6e326 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -23,7 +23,7 @@
         <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item>
     </style>
     <style name="TextAppearance.CategoryTitle"
-           parent="@*android:style/TextAppearance.DeviceDefault.Body2">
+           parent="@android:style/TextAppearance.DeviceDefault.Medium">
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">11sp</item>
         <!-- 0.8 Spacing, 0.8/11 = 0.072727273 -->
@@ -49,7 +49,6 @@
         <!-- The following attributes change the behavior of the dialog, hence they should not be
              themed -->
         <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowCloseOnTouchOutside">@*android:bool/config_closeDialogWhenTouchOutside</item>
     </style>
 
     <style name="Header.Settings"
@@ -72,6 +71,7 @@
 
     <style name="Theme.PermissionGrantDialog"
            parent="@android:style/Theme.DeviceDefault.Light.Dialog">
+        <item name="android:divider">@drawable/list_divider</item>
     </style>
 
     <style name="PermissionDialog"