summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenyi Wang <wenyiw@google.com>2016-06-14 14:08:29 -0700
committerWenyi Wang <wenyiw@google.com>2016-06-15 10:33:23 -0700
commit2c0790a1c48de962c35b06d13de7731b77e6c273 (patch)
tree95beb66cdfed939544f21bd884d8d6b57819f0df
parentc134dda7e200f9da87fd710fec58f601044a7c8f (diff)
downloadpackages_apps_Contacts-2c0790a1c48de962c35b06d13de7731b77e6c273.tar.gz
packages_apps_Contacts-2c0790a1c48de962c35b06d13de7731b77e6c273.tar.bz2
packages_apps_Contacts-2c0790a1c48de962c35b06d13de7731b77e6c273.zip
Make group name edit dialog appcompat
Bug 29359799 Bug 29121773 Bug 18641067 Change-Id: I5c55fe5f3401a58a23186270e09df364368f50a2
-rw-r--r--res/values/styles.xml9
-rw-r--r--src/com/android/contacts/group/GroupNameEditDialogFragment.java7
2 files changed, 9 insertions, 7 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4edacdf67..995ed0695 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -134,8 +134,8 @@
<item name="colorPrimary">@color/primary_color</item>
<item name="android:colorAccent">@color/primary_color</item>
<item name="colorAccent">@color/primary_color</item>
- <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
- <item name="alertDialogTheme">@style/ContactsAlertDialogTheme</item>
+ <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
+ <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
@@ -382,6 +382,11 @@
<item name="android:colorAccent">@color/primary_color</item>
</style>
+ <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
+ <item name="android:colorAccent">@color/primary_color</item>
+ <item name="colorAccent">@color/primary_color</item>
+ </style>
+
<style name="EditKindIconStyle">
<item name="android:layout_width">24dp</item>
<item name="android:layout_height">24dp</item>
diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
index bc877a23f..8fcd63d6c 100644
--- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java
+++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
@@ -15,7 +15,6 @@
*/
package com.android.contacts.group;
-import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.FragmentManager;
@@ -23,10 +22,10 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
-import android.view.ContextThemeWrapper;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
@@ -91,9 +90,7 @@ public final class GroupNameEditDialogFragment extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
// Build a dialog with two buttons and a view of a single EditText input field
- final ContextThemeWrapper context = new ContextThemeWrapper(getActivity(),
- android.R.style.Theme_Holo_Light_Dialog_MinWidth);
- final AlertDialog.Builder builder = new AlertDialog.Builder(context)
+ final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setTitle(mIsInsert
? R.string.group_name_dialog_insert_title
: R.string.group_name_dialog_update_title)