commit d91320306dc1054e063e705e08416be0d5b98edb
author Daniel Lehmann <lehmannd@google.com> Sat Apr 14 15:28:03 2012 -0700
committer Daniel Lehmann <lehmannd@google.com> Sat Apr 14 15:28:03 2012 -0700
tree dbe33924604b5459837a21a75dbd9cdf9fcca003
parent e9a78643a9ded6239446e314968b9e9a195420c7

Use the Context of the Builder instead of the Activity's

Also I don't like fluent interfaces

Bug:6007797
Change-Id: Ia5888025ad6c89f7cd20f57f058567432c820f7a

src/com/android/contacts/editor/GroupMembershipView.java

diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index ab52e0b..742c716 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -27,7 +27,6 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;

src/com/android/contacts/interactions/GroupNameDialogFragment.java

diff --git a/src/com/android/contacts/interactions/GroupNameDialogFragment.java b/src/com/android/contacts/interactions/GroupNameDialogFragment.java
index 3c65562..0be236e 100644
--- a/src/com/android/contacts/interactions/GroupNameDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupNameDialogFragment.java
@@ -44,31 +44,32 @@
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        View view = LayoutInflater.from(getActivity()).inflate(R.layout.group_name_dialog, null);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final LayoutInflater layoutInflater = LayoutInflater.from(builder.getContext());
+        final View view = layoutInflater.inflate(R.layout.group_name_dialog, null);
         mEdit = (EditText) view.findViewById(R.id.group_label);
         initializeGroupLabelEditText(mEdit);
 
         mEdit.addTextChangedListener(this);
 
-        AlertDialog dialog = new AlertDialog.Builder(getActivity())
-                .setIconAttribute(android.R.attr.alertDialogIcon)
-                .setTitle(getTitleResourceId())
-                .setView(view)
-                .setPositiveButton(android.R.string.ok,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                            onCompleted(mEdit.getText().toString().trim());
-                        }
+        builder.setTitle(getTitleResourceId());
+        builder.setView(view);
+        builder.setPositiveButton(android.R.string.ok,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int whichButton) {
+                        onCompleted(mEdit.getText().toString().trim());
                     }
-                )
-                .setNegativeButton(android.R.string.cancel, null)
-                .create();
+                }
+            );
+        builder.setNegativeButton(android.R.string.cancel, null);
+        final AlertDialog dialog = builder.create();
 
         dialog.setOnShowListener(this);
         return dialog;
     }
 
+    @Override
     public void onShow(DialogInterface dialog) {
         updateOkButtonState((AlertDialog) dialog);
     }