summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-05-28 10:44:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 10:44:58 -0700
commit94472c3dc397cfa9a8fad5ba7628253ec6642ed6 (patch)
tree3f4bad7a02eab718d297476e655e48eec2654709 /src/com/android/camera
parentf8c7bff9f5b88fb83696e192c3ff343fa810c5b9 (diff)
parent3bbe0f9f61e3702b46a43e0537060a7a609104b2 (diff)
downloadandroid_packages_apps_Snap-94472c3dc397cfa9a8fad5ba7628253ec6642ed6.tar.gz
android_packages_apps_Snap-94472c3dc397cfa9a8fad5ba7628253ec6642ed6.tar.bz2
android_packages_apps_Snap-94472c3dc397cfa9a8fad5ba7628253ec6642ed6.zip
am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
* commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1': Change the order of exposure compensation
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/CameraSettings.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index ede4156c7..4e9a5ddfe 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -255,12 +255,12 @@ public class CameraSettings {
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);