commit 0d666f93780c48405826e4ed3f49586e36abd882
author Lucas Dupin <dupin@google.com> Thu Jun 01 14:04:48 2017 -0700
committer Lucas Dupin <dupin@google.com> Thu Jun 01 14:06:31 2017 -0700
tree 060dbef7bf1480fb1f786b39ad15124fd2752744
parent 7ab48570367eda766546a84710feb65eaab97fcb

Fix text color of alert dialogs

Test: visual
Change-Id: Ifcdc591bff2c95b2960c624ee5a05fc228e83b3a
Fixes: 62194018

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 501aeb5..4c1eba8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -262,6 +262,11 @@
         <item name="dialpadTheme">@style/Dialpad_LightTransparent</item>
     </style>
 
+    <style name="EmergencyDialerAlertDialogTheme"
+           parent="@android:style/Theme.Material.Dialog">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
     <style name="SimImportTheme" parent="@android:style/Theme.Material.Light">
         <item name="android:actionBarStyle">@style/TelephonyActionBarStyle</item>
         <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 2c6e526..9dee207 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -25,10 +25,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.graphics.Color;
 import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.net.Uri;
@@ -55,7 +52,6 @@
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 
 import com.android.phone.common.dialpad.DialpadKeyButton;
 import com.android.phone.common.util.ViewUtil;
@@ -672,7 +668,7 @@
         AlertDialog dialog = null;
         if (id == BAD_EMERGENCY_NUMBER_DIALOG) {
             // construct dialog
-            dialog = new AlertDialog.Builder(this)
+            dialog = new AlertDialog.Builder(this, R.style.EmergencyDialerAlertDialogTheme)
                     .setTitle(getText(R.string.emergency_enable_radio_dialog_title))
                     .setMessage(createErrorMessage(mLastNumber))
                     .setPositiveButton(R.string.ok, null)