From 45d791d5271e7283550140cfaca5b4bdfa0c0d14 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Mon, 27 Aug 2012 11:48:35 -0700
Subject: Reskin: Launch photos in lights-out mode

Bug: 7050303
- Launch photos in lights out mode when opening from album
- One last missing call to super.onCreate added in
  ManageCachePage

Change-Id: I7ad0e64f30748b724d184791e0e0a6a030850049
---
 src/com/android/gallery3d/app/AlbumPage.java       | 6 +++++-
 src/com/android/gallery3d/app/ManageCachePage.java | 1 +
 src/com/android/gallery3d/app/PhotoPage.java       | 6 ++----
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 195c8e71a..f1063925e 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -267,10 +267,14 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             mSelectionManager.toggle(item.getPath());
             mSlotView.invalidate();
         } else {
-            // Show pressed-up animation for the single-tap.
+            // Launch photos in lights out mode
+            mActivity.getGLRoot().setLightsOutMode(true);
+
+            // Render transition in pressed state
             mAlbumView.setPressedIndex(slotIndex);
             prepareFadeOutTexture();
             mAlbumView.setPressedIndex(-1);
+
             pickPhoto(slotIndex);
         }
     }
diff --git a/src/com/android/gallery3d/app/ManageCachePage.java b/src/com/android/gallery3d/app/ManageCachePage.java
index 847adf6e6..8f95112f3 100644
--- a/src/com/android/gallery3d/app/ManageCachePage.java
+++ b/src/com/android/gallery3d/app/ManageCachePage.java
@@ -193,6 +193,7 @@ public class ManageCachePage extends ActivityState implements
 
     @Override
     public void onCreate(Bundle data, Bundle restoreState) {
+        super.onCreate(data, restoreState);
         mCacheStorageInfo = new CacheStorageUsageInfo(mActivity);
         initializeViews();
         initializeData(data);
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 4b4817943..b50f0b762 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -217,6 +217,8 @@ public class PhotoPage extends ActivityState implements
     public void onCreate(Bundle data, Bundle restoreState) {
         super.onCreate(data, restoreState);
         mActionBar = mActivity.getGalleryActionBar();
+        mFlags |= FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR;
+        mShowBars = false;
         mSelectionManager = new SelectionManager(mActivity, false);
         mMenuExecutor = new MenuExecutor(mActivity, mSelectionManager);
 
@@ -263,10 +265,6 @@ public class PhotoPage extends ActivityState implements
 
                 // Start from the screen nail.
                 itemPath = screenNailItemPath;
-
-                // Action bar should not be displayed when camera starts.
-                mFlags |= FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR;
-                mShowBars = false;
             }
 
             MediaSet originalSet = mActivity.getDataManager()
-- 
cgit v1.2.3