From: nicolasroard Date: Thu, 29 Nov 2012 05:02:19 +0000 (-0800) Subject: am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches X-Git-Tag: android-x86-7.1-r1~64^2~10^2~96^2~1^2~14 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85135c1b580c922866965c5fb069ba69f2e76b28;hp=6e9123a658d4ed0dcb80dd376c676f043e2f4baa;p=android-x86%2Fpackages-apps-Gallery2.git 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 0ef4fba34..4447ec4ee 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 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 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