commit 00d9601b666106c3a1b60beb88639c70b8548ddc
author Doris Liu <tianliu@google.com> Tue May 28 10:45:17 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 28 10:45:17 2013 -0700
tree e4a0ca3ba4d5921e3d44f5272cc78285be32e3f3
parent c1aaf4b526507245428ef56a03727a5d0fb68659
parent 9fb962feb94909af05ab6cf872eee7e8928eb9b1

am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1':
  Change the order of exposure compensation

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);