commit a7707160ba8d9693ffdb813e0eb2cd3f15084a7f
author Baligh Uddin <baligh@google.com> Wed May 29 20:49:26 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 20:49:26 2013 +0000
tree 01d444ab6f5dea94590c06f3016b39b0dfa794f1
parent 00d9601b666106c3a1b60beb88639c70b8548ddc
parent 19faa02667c7bb66374b18233e0c3943808e242a

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

src/com/android/camera/CameraSettings.java

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index ede4156..4e9a5dd 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -255,12 +255,12 @@
         TypedArray iconIds = mContext.getResources().obtainTypedArray(
                 R.array.pref_camera_exposure_icons);
         for (int i = minValue; i <= maxValue; ++i) {
-            entryValues[maxValue - i] = Integer.toString(Math.round(i / step));
+            entryValues[i - minValue] = Integer.toString(Math.round(i / step));
             StringBuilder builder = new StringBuilder();
             if (i > 0) builder.append('+');
-            entries[maxValue - i] = builder.append(i).toString();
-            labels[maxValue - i] = explabel + " " + builder.toString();
-            icons[maxValue - i] = iconIds.getResourceId(3 + i, 0);
+            entries[i - minValue] = builder.append(i).toString();
+            labels[i - minValue] = explabel + " " + builder.toString();
+            icons[i - minValue] = iconIds.getResourceId(3 + i, 0);
         }
         exposure.setUseSingleIcon(true);
         exposure.setEntries(entries);

src/com/android/gallery3d/app/SlideshowPage.java

diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java
index d269e90..174058d 100644
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -112,8 +112,7 @@
     @Override
     public void onCreate(Bundle data, Bundle restoreState) {
         super.onCreate(data, restoreState);
-        mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR
-                | FLAG_ALLOW_LOCK_WHILE_SCREEN_ON);
+        mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR);
         if (data.getBoolean(KEY_DREAM)) {
             // Dream screensaver only keeps screen on for plugged devices.
             mFlags |= FLAG_SCREEN_ON_WHEN_PLUGGED | FLAG_SHOW_WHEN_LOCKED;