b/2531257 More work on cleaning up owner account for dupes

Moved the owner account to a second line when calendar names are
duplicated. This gives more space for long calendar names and long
owner accounts. Owner accounts will also now be gray when shown.

Change-Id: I9deec627159bb6a6a6eb3c569c255e6ede342ff0

1 files changed, 6 insertions, 5 deletions

diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index d7a8d6a5..8f4b4ccb 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -930,11 +930,12 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
             String calendarName = mCalendarsCursor.getString(CALENDARS_INDEX_DISPLAY_NAME);
             String ownerAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
             if (mIsDuplicateName && !calendarName.equalsIgnoreCase(ownerAccount)) {
-                calendarName = new StringBuilder(calendarName)
-                        .append(Utils.OPEN_EMAIL_MARKER)
-                        .append(ownerAccount)
-                        .append(Utils.CLOSE_EMAIL_MARKER)
-                        .toString();
+                Resources res = getResources();
+                TextView ownerText = (TextView) findViewById(R.id.owner);
+                ownerText.setText(ownerAccount);
+                ownerText.setTextColor(res.getColor(R.color.calendar_owner_text_color));
+            } else {
+                setVisibilityCommon(R.id.owner, View.GONE);
             }
             setTextCommon(R.id.calendar, calendarName);
         } else {