diff options
| author | estade <estade@chromium.org> | 2015-04-24 13:41:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-24 20:41:17 +0000 |
| commit | d9456757bec482f2b27cf75ef7fa2109af0500a6 (patch) | |
| tree | d6984fdff586d3687291f46746f4004f79a04e56 | |
| parent | 4e30029e92cc7afdbe1419d3799f122344b750f8 (diff) | |
| download | chromium_src-d9456757bec482f2b27cf75ef7fa2109af0500a6.zip chromium_src-d9456757bec482f2b27cf75ef7fa2109af0500a6.tar.gz chromium_src-d9456757bec482f2b27cf75ef7fa2109af0500a6.tar.bz2 | |
Remove special theming for CardUnmaskPrompt since it's now automatic
for all alert dialogs.
BUG=463576
Review URL: https://codereview.chromium.org/1096263005
Cr-Commit-Position: refs/heads/master@{#326869}
3 files changed, 1 insertions, 20 deletions
diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml index 10ee0e9..ef22bc5 100644 --- a/chrome/android/java/res/values-v17/styles.xml +++ b/chrome/android/java/res/values-v17/styles.xml @@ -4,24 +4,6 @@ found in the LICENSE file. --> <resources> - <!-- A theme for alert dialogs. The colors are copied from MainTheme, and the window - dimensions are copied from *.MinWidth theme variants. Sadly there is no - AppCompat.Light.Dialog.Alert or even AppCompat.Light.Dialog.MinWidth. --> - <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog"> - <item name="android:textColorHighlight">@color/text_highlight_color</item> - <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item> - <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item> - - <!-- Overriding AppCompat values --> - <item name="colorAccent">@color/light_active_color</item> - <item name="colorControlActivated">@color/light_active_color</item> - <item name="colorControlNormal">@color/light_normal_color</item> - <item name="colorPrimary">@color/light_active_color</item> - - <!-- Default TintedImageButton tint --> - <item name="tint">@color/dark_mode_tint</item> - </style> - <!-- Preferences --> <style name="PreferencesTheme" parent="ThemeWithActionBar"> <item name="android:textColorLink">@color/pref_accent_color</item> diff --git a/chrome/android/java/res/values/colors.xml b/chrome/android/java/res/values/colors.xml index 8b70caf..50d1f77 100644 --- a/chrome/android/java/res/values/colors.xml +++ b/chrome/android/java/res/values/colors.xml @@ -12,7 +12,6 @@ <color name="input_underline_color">#e5e5e5</color> <color name="input_underline_error_color">#d32f2f</color> <color name="explanation_text_color">#909090</color> - <color name="text_highlight_color">#C6DAFC</color> <!-- Infobar colors --> <color name="infobar_background">#fff</color> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java index a2e269c..a83feea 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java @@ -116,7 +116,7 @@ public class CardUnmaskPrompt mVerificationView = (TextView) v.findViewById(R.id.verification_message); ((ImageView) v.findViewById(R.id.cvc_hint_image)).setImageResource(drawableId); - mDialog = new AlertDialog.Builder(context, R.style.AlertDialogTheme) + mDialog = new AlertDialog.Builder(context) .setTitle(title) .setView(v) .setNegativeButton(R.string.cancel, null) |