commit 515367fb97a00d8a1afc875cbd7c41822f9a703d
author Inseob Kim <inseob@google.com> Tue Sep 04 20:07:37 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 04 20:07:37 2018 -0700
tree ec28e924c316e99a18f1036a6e78c2c698268ffe
parent 78ad129e12485df119c0294f19bd5f8828b9b992
parent 401c1f93403b6c349a6b11c815ce0d4388823010

Merge "Fix improper transition from gallery to camera" am: bd400d88d9 am: 325f17593d
am: 401c1f9340

Change-Id: I781dd1bdea71e222b5b61c2869aef1624aeb1e93

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 110ce16..352fa38 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1335,7 +1335,7 @@
 
     private void removeItemAt(int index) {
         mDataAdapter.removeAt(index);
-        if (mDataAdapter.getTotalNumber() > 1) {
+        if (mDataAdapter.getTotalNumber() > 0) {
             showUndoDeletionBar();
         } else {
             // If camera preview is the only view left in filmstrip,