summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErin Dahlgren <edahlgren@google.com>2013-10-21 20:47:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-21 20:47:33 +0000
commit65e2389b3de5992c49732d95902e6e742e44821b (patch)
tree140d340d3c11357af20384da03e7f2a5be194d45
parent68c1c1e02143e3d2c2dbc658645a3a981f58cdd5 (diff)
parentfd7f0a9ffd8e7db21e556b1a60a7602ef5d0fe29 (diff)
downloadandroid_packages_apps_Snap-65e2389b3de5992c49732d95902e6e742e44821b.tar.gz
android_packages_apps_Snap-65e2389b3de5992c49732d95902e6e742e44821b.tar.bz2
android_packages_apps_Snap-65e2389b3de5992c49732d95902e6e742e44821b.zip
Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
-rw-r--r--src/com/android/camera/CameraActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index ab46e0268..b971b284f 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -347,6 +347,7 @@ public class CameraActivity extends Activity
if(!arePreviewControlsVisible()) {
setPreviewControlsVisibility(true);
+ CameraActivity.this.setSystemBarsVisibility(false);
}
}
@@ -1381,7 +1382,10 @@ public class CameraActivity extends Activity
}
hideUndoDeletionBar(false);
mDataAdapter.executeDeletion(CameraActivity.this);
- updateActionBarMenu(mFilmStripView.getCurrentId());
+
+ int currentId = mFilmStripView.getCurrentId();
+ updateActionBarMenu(currentId);
+ mFilmStripListener.onCurrentDataCentered(currentId);
}
public void showUndoDeletionBar() {