Snap for 7316203 from 23c104ef3cc0dcb383b0cb9b1ec46953c3bd2561 to rvc-platform-releaseandroid-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10

Change-Id: Ib3ee0f684b4c7da8d8806605d03b0232b2c6abb0

4 files changed, 9 insertions, 3 deletions

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 24f2c3aa2..d078c28c6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,7 +19,7 @@
     <string name="uid_label" msgid="8421971615411294156">"מדיה"</string>
     <string name="storage_description" msgid="4081716890357580107">"אחסון מקומי"</string>
     <string name="app_label" msgid="9035307001052716210">"אחסון מדיה"</string>
-    <string name="artist_label" msgid="8105600993099120273">"אמן"</string>
+    <string name="artist_label" msgid="8105600993099120273">"אומן"</string>
     <string name="unknown" msgid="2059049215682829375">"לא ידוע"</string>
     <string name="root_images" msgid="5861633549189045666">"תמונות"</string>
     <string name="root_videos" msgid="8792703517064649453">"סרטונים"</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 771da7c0a..5f1e662f6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -40,8 +40,13 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
+    <style name="PermissionAlertDialogTitle"
+           parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
 </resources>
diff --git a/src/com/android/providers/media/PermissionActivity.java b/src/com/android/providers/media/PermissionActivity.java
index d153b46d4..6a3ccedbb 100644
--- a/src/com/android/providers/media/PermissionActivity.java
+++ b/src/com/android/providers/media/PermissionActivity.java
@@ -189,8 +189,7 @@ public class PermissionActivity extends Activity {
         TextView dialogMessage = (TextView) dialog.findViewById(
                 android.R.id.message);
         if (dialogMessage != null) {
-            dialogMessage.setTextAppearance(
-                    android.R.style.TextAppearance_DeviceDefault_DialogWindowTitle);
+            dialogMessage.setTextAppearance(R.style.PermissionAlertDialogTitle);
         } else {
             Log.w(TAG, "Couldn't find message element");
         }
diff --git a/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java b/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
index 0c1fc6582..1a94ef1f6 100644
--- a/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
+++ b/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
@@ -49,6 +49,7 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 import androidx.annotation.NonNull;
+import androidx.test.filters.FlakyTest;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -78,6 +79,7 @@ import java.util.concurrent.TimeUnit;
  * {@link MediaColumns#IS_FAVORITE} should be retained.
  */
 @RunWith(AndroidJUnit4.class)
+@FlakyTest(bugId = 176977253)
 public class LegacyProviderMigrationTest {
     private static final String TAG = "LegacyTest";