commit 277eb97059f102ec30e5a5bf6b9cb3f83218fd91
author RoboErik <epastern@google.com> Thu Feb 24 16:05:04 2011 -0800
committer RoboErik <epastern@google.com> Thu Feb 24 16:05:04 2011 -0800
tree 3a4f37f53f4da984536993f7951ea4352b40204b
parent f6b58a9b0585176a1435eb6b910895f85b5b68db

b/3395742 Clean up restore on rotation

Ensures we stay in the same view when rotating and cleans up
a field we were saving that isn't used anymore.

Change-Id: I3761ef9a71eec287308b56beedeb01e6366d81a7

src/com/android/calendar/AllInOneActivity.java

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 29bc251..3d79ba2 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -72,8 +72,8 @@
     private static final boolean DEBUG = false;
     private static final String EVENT_INFO_FRAGMENT_TAG = "EventInfoFragment";
     private static final String BUNDLE_KEY_RESTORE_TIME = "key_restore_time";
-    private static final String BUNDLE_KEY_RESTORE_EDIT = "key_restore_edit";
     private static final String BUNDLE_KEY_EVENT_ID = "key_event_id";
+    private static final String BUNDLE_KEY_RESTORE_VIEW = "key_restore_view";
     private static final int HANDLER_KEY = 0;
     private static final long CONTROLS_ANIMATE_DURATION = 400;
     private static int CONTROLS_ANIMATE_WIDTH = 283;
@@ -156,12 +156,10 @@
         // Get time from intent or icicle
         long timeMillis = -1;
         int viewType = -1;
-        boolean restoreEdit = false;
         final Intent intent = getIntent();
         if (icicle != null) {
             timeMillis = icicle.getLong(BUNDLE_KEY_RESTORE_TIME);
-            restoreEdit = icicle.getBoolean(BUNDLE_KEY_RESTORE_EDIT, false);
-            viewType = ViewType.EDIT;
+            viewType = icicle.getInt(BUNDLE_KEY_RESTORE_VIEW, -1);
         } else {
             String action = intent.getAction();
             if (Intent.ACTION_VIEW.equals(action)) {
@@ -174,7 +172,7 @@
             }
         }
 
-        if (!restoreEdit) {
+        if (viewType == -1) {
             viewType = Utils.getViewTypeFromIntentAndSharedPref(this);
         }
         mTimeZone = Utils.getTimeZone(this, mHomeTimeUpdater);
@@ -339,7 +337,7 @@
 
         outState.putLong(BUNDLE_KEY_RESTORE_TIME, mController.getTime());
         if (mCurrentView == ViewType.EDIT) {
-            outState.putBoolean(BUNDLE_KEY_RESTORE_EDIT, true);
+            outState.putInt(BUNDLE_KEY_RESTORE_VIEW, mCurrentView);
             outState.putLong(BUNDLE_KEY_EVENT_ID, mController.getEventId());
         }
     }