am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches

* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
  Fix flashing in geometry panel

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0ef4fba..4447ec4 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -305,7 +305,7 @@
                 android:taskAffinity="com.android.camera.SecureCameraActivity"
                 android:excludeFromRecents="true"
                 android:label="@string/camera_label"
-                android:theme="@style/Theme.Camera"
+                android:theme="@style/Theme.CameraSecure"
                 android:icon="@mipmap/ic_launcher_camera"
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:clearTaskOnLaunch="true"

diff --git a/res/mipmap-xxhdpi/ic_launcher_gallery.png b/res/mipmap-xxhdpi/ic_launcher_gallery.png
new file mode 100644 (file)
index 0000000..96cc1d1
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_gallery.png differ

diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index f432333..4285f44 100644 (file)
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -422,7 +422,7 @@ public class MenuExecutor {
                     if (!execute(manager, jc, mOperation, id)) {
                         result = EXECUTION_RESULT_FAIL;
                     }
-                    onProgressUpdate(index++, mListener);
+                    onProgressUpdate(++index, mListener);
                 }
             } catch (Throwable th) {
                 Log.e(TAG, "failed to execute operation " + mOperation