b/2531257 Will only display owner account if different than cal name

Previously would display 'name <account>' if two calendars had the same
name. Now we won't display <account> if it's the same as the name. This affects
EventInfoActivity and SelectCalendarsActivity.

Change-Id: Ie810430e11d4b15f1a3518f9328daf727134976b

diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index af83a84..d7a8d6a 100644 (file)
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -928,10 +928,11 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
         // Calendar
         if (mCalendarsCursor != null) {
             String calendarName = mCalendarsCursor.getString(CALENDARS_INDEX_DISPLAY_NAME);
-            if (mIsDuplicateName) {
+            String ownerAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
+            if (mIsDuplicateName && !calendarName.equalsIgnoreCase(ownerAccount)) {
                 calendarName = new StringBuilder(calendarName)
                         .append(Utils.OPEN_EMAIL_MARKER)
-                        .append(mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT))
+                        .append(ownerAccount)
                         .append(Utils.CLOSE_EMAIL_MARKER)
                         .toString();
             }

diff --git a/src/com/android/calendar/SelectCalendarsAdapter.java b/src/com/android/calendar/SelectCalendarsAdapter.java
index 001515c..3762362 100644 (file)
--- a/src/com/android/calendar/SelectCalendarsAdapter.java
+++ b/src/com/android/calendar/SelectCalendarsAdapter.java
@@ -347,10 +347,12 @@ public class SelectCalendarsAdapter extends CursorTreeAdapter implements View.On
         view.findViewById(R.id.color)
             .setBackgroundDrawable(Utils.getColorChip(cursor.getInt(COLOR_COLUMN)));
         String name = cursor.getString(NAME_COLUMN);
-        if (mIsDuplicateName.containsKey(name) && mIsDuplicateName.get(name)) {
+        String owner = cursor.getString(OWNER_COLUMN);
+        if (mIsDuplicateName.containsKey(name) && mIsDuplicateName.get(name) &&
+                !name.equalsIgnoreCase(owner)) {
             name = new StringBuilder(name)
                     .append(Utils.OPEN_EMAIL_MARKER)
-                    .append(cursor.getString(OWNER_COLUMN))
+                    .append(owner)
                     .append(Utils.CLOSE_EMAIL_MARKER)
                     .toString();
         }