commit 738fa7dc5b21f4694cbfb105df19e7b268d521dd
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Tue Dec 15 14:19:19 2009 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Tue Dec 15 14:19:19 2009 -0800
tree 605068c9236dd1135647eeeacb521cf43e348e50
parent 4afd3f902f781bdbe5e9c132ae835311063d3238
parent 34a0e1b00b9baeff19e94f1ee35dd890063489d2

Merge branch 'eclair' into eclair-release

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index acfccb1..45545db 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -187,6 +187,7 @@
 
     private boolean mWorkspaceLoading = true;
 
+    private boolean mPaused = true;
     private boolean mRestoring;
     private boolean mWaitingForResult;
 
@@ -245,6 +246,9 @@
         // For handling default keys
         mDefaultKeySsb = new SpannableStringBuilder();
         Selection.setSelection(mDefaultKeySsb, 0);
+
+        IntentFilter filter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        registerReceiver(mCloseSystemDialogsReceiver, filter);
     }
 
     private void checkForLocaleChange() {
@@ -401,8 +405,7 @@
     protected void onResume() {
         super.onResume();
 
-        IntentFilter filter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
-        registerReceiver(mCloseSystemDialogsReceiver, filter);
+        mPaused = false;
 
         if (mRestoring) {
             mWorkspaceLoading = true;
@@ -432,7 +435,6 @@
         dismissPreview(mPreviousView);
         dismissPreview(mNextView);
         mDragController.cancelDrag();
-        unregisterReceiver(mCloseSystemDialogsReceiver);
     }
 
     @Override
@@ -935,6 +937,8 @@
         
         dismissPreview(mPreviousView);
         dismissPreview(mNextView);
+
+        unregisterReceiver(mCloseSystemDialogsReceiver);
     }
 
     @Override
@@ -1849,7 +1853,11 @@
      *          - from center screen
      *          - from other screens
      *   - Home from all apps
+     *          - from center screen
+     *          - from other screens
      *   - Back from all apps
+     *          - from center screen
+     *          - from other screens
      *   - Launch app from workspace and quit
      *          - with back
      *          - with home
@@ -1870,7 +1878,7 @@
      *   - On all apps, power off
      *   - Launch an app and turn off the screen while in that app
      *          - Go back with home key
-     *          - Go back with back key
+     *          - Go back with back key  TODO: make this not go to workspace
      *          - From all apps
      *          - From workspace
      */
@@ -2028,13 +2036,9 @@
             String reason = intent.getStringExtra("reason");
             if (!"homekey".equals(reason)) {
                 boolean animate = true;
-                /*
-                if ("globalactions".equals(reason)) {
-                    // For some reason (probably the fading), this animation is
-                    // choppy, so don't show it.
+                if (mPaused || "lock".equals(reason)) {
                     animate = false;
                 }
-                */
                 closeAllApps(animate);
             }
         }