summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-04-24 18:58:58 +0800
committerWu-cheng Li <wuchengli@google.com>2012-04-26 10:59:47 +0800
commit6486509ebf29af2c4526342265a620bd371cb96a (patch)
tree801f28c6ff4e90990397ce45c49d644d2078c17e /src
parentb3afd5505b0e0491fe50e2342df6e6aabb86bf30 (diff)
downloadandroid_packages_apps_Snap-6486509ebf29af2c4526342265a620bd371cb96a.tar.gz
android_packages_apps_Snap-6486509ebf29af2c4526342265a620bd371cb96a.tar.bz2
android_packages_apps_Snap-6486509ebf29af2c4526342265a620bd371cb96a.zip
Hide action bar when camera screen nail is displayed.
bug:6363385 Change-Id: Ic37afa779339cfe5f66f0a40cbf4870ff1a6a0ee
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index bdc406019..fadcbf1ce 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -86,6 +86,7 @@ public class PhotoPage extends ActivityState
private DetailsHelper mDetailsHelper;
private boolean mShowDetails;
private Path mPendingSharePath;
+ private Path mScreenNailItemPath;
// mMediaSet could be null if there is no KEY_MEDIA_SET_PATH supplied.
// E.g., viewing a photo in gmail attachment
@@ -177,14 +178,14 @@ public class PhotoPage extends ActivityState
// Get the ScreenNail from ScreenNailHolder and register it.
int id = SnailSource.registerScreenNail(mScreenNail);
Path screenNailSetPath = SnailSource.getSetPath(id);
- Path screenNailItemPath = SnailSource.getItemPath(id);
+ mScreenNailItemPath = SnailSource.getItemPath(id);
// Combine the original MediaSet with the one for CameraScreenNail.
mSetPathString = "/combo/item/{" + screenNailSetPath +
"," + mSetPathString + "}";
// Start from the screen nail.
- itemPath = screenNailItemPath;
+ itemPath = mScreenNailItemPath;
}
mMediaSet = mActivity.getDataManager().getMediaSet(mSetPathString);
@@ -286,6 +287,8 @@ public class PhotoPage extends ActivityState
mCurrentPhoto = photo;
if (mCurrentPhoto == null) return;
updateMenuOperations();
+ // Hide the action bar when going back to camera preview.
+ if (photo.getPath() == mScreenNailItemPath) hideBars();
updateTitle();
if (mShowDetails) {
mDetailsHelper.reloadDetails(mModel.getCurrentIndex());