Merge "Add bootclasspath_fragment." am: 27b3662fc3 am: 70bb5cb9cc
Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1705377
Change-Id: Ia36b1c15e76ff449d1208c12d907102f46a713c5
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 771da7c..5f1e662 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 d153b46..6a3cced 100644
--- a/src/com/android/providers/media/PermissionActivity.java
+++ b/src/com/android/providers/media/PermissionActivity.java
@@ -189,8 +189,7 @@
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 0c1fc65..1a94ef1 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.webkit.MimeTypeMap;
import androidx.annotation.NonNull;
+import androidx.test.filters.FlakyTest;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
@@ -78,6 +79,7 @@
* {@link MediaColumns#IS_FAVORITE} should be retained.
*/
@RunWith(AndroidJUnit4.class)
+@FlakyTest(bugId = 176977253)
public class LegacyProviderMigrationTest {
private static final String TAG = "LegacyTest";