From 4a2acd2e202c1e301c746f000c182442477259bf Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Wed, 19 May 2021 16:57:21 +0800
Subject: [PATCH] Fix UnsupportedOperationException in Display Settings

Remove android:textColorHint from Theme.Settings to fix the regression.

This is a quick fix, each EditText should set its hintTextColor
attribute before there is a fix to apply the attribute globally in
Settings APP.

Bug: 188405076
Test: manually launch 'Font size' and 'Display size'.
Change-Id: If3313be47e0c3e8ce9d41a6e87cdf2e7067ce54b
---
 AndroidManifest.xml   | 3 ++-
 res/values/styles.xml | 1 +
 res/values/themes.xml | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 61c0c4ea2db..a2bd129d1ee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -677,7 +677,8 @@
         <activity android:name=".localepicker.LocalePickerWithRegionActivity"
                   android:excludeFromRecents="true"
                   android:configChanges="orientation|keyboardHidden|screenSize"
-                  android:exported="false">
+                  android:exported="false"
+                  android:theme="@style/Theme.LocalePickerWithRegionActivity">
         </activity>
 
         <activity
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d9a55e6211b..e8670f971f5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -145,6 +145,7 @@
         <item name="android:layout_marginStart">4dip</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>
+        <item name="android:textColorHint">?android:attr/textColorSecondary</item>
         <item name="android:minHeight">@dimen/min_tap_target_size</item>
     </style>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 555a0454a66..9681b030bcc 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -32,7 +32,6 @@
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:datePickerDialogTheme">@style/PickerDialogTheme.Settings</item>
         <item name="android:progressBarStyleHorizontal">@style/HorizontalProgressBarStyle</item>
-        <item name="android:textColorHint">?android:attr/textColorSecondary</item>
 
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -93,6 +92,10 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
+    <style name="Theme.LocalePickerWithRegionActivity" parent="Theme.Settings">
+        <item name="android:textColorHint">?android:attr/textColorSecondary</item>
+    </style>
+
     <style name="ThemeOverlay.SwitchBar.Settings.Base" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
         <item name="android:elevation">1dp</item>
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>