diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-08-27 11:48:35 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-28 13:40:40 -0700 |
commit | 45d791d5271e7283550140cfaca5b4bdfa0c0d14 (patch) | |
tree | 307384e85df87b95b05b5901d06f7e72e3bc04cd /src | |
parent | 279852dfcec2abacee1c5d8b6f53f94830fd4e86 (diff) | |
download | android_packages_apps_Snap-45d791d5271e7283550140cfaca5b4bdfa0c0d14.tar.gz android_packages_apps_Snap-45d791d5271e7283550140cfaca5b4bdfa0c0d14.tar.bz2 android_packages_apps_Snap-45d791d5271e7283550140cfaca5b4bdfa0c0d14.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 6 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/ManageCachePage.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 6 |
3 files changed, 8 insertions, 5 deletions
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() |