Changed calendar picker in edit event to always display email

Previously we only displayed an e-mail address if a duplicate was found.
Now we'll always display the e-mail address for consistency since it uses a
two line setup.

Change-Id: Id6a6453070a366bae846cf1ce8539fc2c315c19e

diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index 56e7208..0de5fdc 100644 (file)
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -253,9 +253,6 @@ public class EditEvent extends Activity implements View.OnClickListener,
     private ArrayList<Integer> mReminderValues;
     private ArrayList<String> mReminderLabels;
 
-    // This is to keep track of whether or not multiple calendars have the same display name
-    private static HashMap<String,Boolean> mIsDuplicateName = new HashMap<String,Boolean>();
-
     private Time mStartTime;
     private Time mEndTime;
     private int mModification = MODIFY_UNINITIALIZED;
@@ -420,13 +417,8 @@ public class EditEvent extends Activity implements View.OnClickListener,
 
                 TextView accountName = (TextView) view.findViewById(R.id.account_name);
                 if(accountName != null) {
-                    if (mIsDuplicateName.containsKey(displayName)
-                            && mIsDuplicateName.get(displayName)) {
-                        accountName.setText(cursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT));
-                        accountName.setVisibility(TextView.VISIBLE);
-                    } else {
-                        accountName.setVisibility(TextView.GONE);
-                    }
+                    accountName.setText(cursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT));
+                    accountName.setVisibility(TextView.VISIBLE);
                 }
             }
         }
@@ -541,9 +533,6 @@ public class EditEvent extends Activity implements View.OnClickListener,
                     return;
                 }
 
-                Utils.checkForDuplicateNames(mIsDuplicateName, cursor,
-                        CALENDARS_INDEX_DISPLAY_NAME);
-
                 int defaultCalendarPosition = findDefaultCalendarPosition(mCalendarsCursor);
 
                 // populate the calendars spinner