b/5340502 Update "Calendars to display" for phone

- Added dividers between rows
- Vertically centered everything
- Added Application back affordance

Change-Id: I37dff0f6453f11494dda71ff85f0321c5e14a744

4 files changed, 42 insertions, 8 deletions

diff --git a/src/com/android/calendar/CalendarSettingsActivity.java b/src/com/android/calendar/CalendarSettingsActivity.java
index 93266861..0d2f3baa 100644
--- a/src/com/android/calendar/CalendarSettingsActivity.java
+++ b/src/com/android/calendar/CalendarSettingsActivity.java
@@ -21,7 +21,6 @@ import android.accounts.AccountManager;
 import android.app.ActionBar;
 import android.content.ContentResolver;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceActivity;
@@ -75,12 +74,7 @@ public class CalendarSettingsActivity extends PreferenceActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                Intent launchIntent = new Intent(this, AllInOneActivity.class);
-                launchIntent.setAction(Intent.ACTION_VIEW);
-                launchIntent.setData(Uri.parse("content://com.android.calendar/time"));
-                launchIntent.setFlags(
-                        Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(launchIntent);
+                Utils.returnToCalendarHome(this);
                 return true;
             case R.id.action_add_account:
                 Intent nextIntent = new Intent(Settings.ACTION_ADD_ACCOUNT);
diff --git a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
index e2517c25..9ec8f9c8 100644
--- a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
+++ b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
@@ -19,12 +19,15 @@ package com.android.calendar.selectcalendars;
 import com.android.calendar.R;
 import com.android.calendar.Utils;
 
+import android.app.ActionBar;
 import android.app.ExpandableListActivity;
 import android.content.ContentResolver;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.os.Bundle;
 import android.provider.CalendarContract.Calendars;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ExpandableListView;
 
@@ -138,6 +141,23 @@ public class SelectSyncedCalendarsMultiAccountActivity extends ExpandableListAct
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getActionBar()
+                .setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                Utils.returnToCalendarHome(this);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     // startCalendarMetafeedSync() checks the server for an updated list of
     // Calendars (in the background).
     //
diff --git a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java b/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java
index 8f347f67..d7ddf48e 100644
--- a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java
+++ b/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java
@@ -16,13 +16,17 @@
 
 package com.android.calendar.selectcalendars;
 
+import android.app.ActionBar;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 
 import com.android.calendar.AbstractCalendarActivity;
 import com.android.calendar.R;
+import com.android.calendar.Utils;
 
 public class SelectVisibleCalendarsActivity extends AbstractCalendarActivity {
     private SelectVisibleCalendarsFragment mFragment;
@@ -54,4 +58,21 @@ public class SelectVisibleCalendarsActivity extends AbstractCalendarActivity {
         intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getActionBar()
+                .setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                Utils.returnToCalendarHome(this);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java b/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java
index b7f9dd06..65a9c36b 100644
--- a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java
+++ b/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java
@@ -108,7 +108,6 @@ public class SelectVisibleCalendarsFragment extends Fragment
         super.onCreateView(inflater, container, savedInstanceState);
         mView = inflater.inflate(R.layout.select_calendars_fragment, null);
         mList = (ListView)mView.findViewById(R.id.list);
-        mList.setDivider(null);
 
         // Hide the Calendars to Sync button on tablets for now.
         // Long terms stick it in the list of calendars