summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_gallery.pngbin0 -> 19111 bytes
-rw-r--r--src/com/android/gallery3d/ui/MenuExecutor.java2
3 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e6c6e2e7e..b6f86132e 100644
--- 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
index 000000000..96cc1d18b
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_gallery.png
Binary files differ
diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index f432333ce..4285f449e 100644
--- 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