summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-05-28 17:43:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-28 17:43:38 +0000
commit3bbe0f9f61e3702b46a43e0537060a7a609104b2 (patch)
tree106234901407ce378154f94284a71b33a00bfca4 /src/com
parent2cca828ec5186105723ae85e618bfca0bb59cdb8 (diff)
parent31ce18458f63a2876e2d53c0b8692ef3dd6fca4f (diff)
downloadandroid_packages_apps_Snap-3bbe0f9f61e3702b46a43e0537060a7a609104b2.tar.gz
android_packages_apps_Snap-3bbe0f9f61e3702b46a43e0537060a7a609104b2.tar.bz2
android_packages_apps_Snap-3bbe0f9f61e3702b46a43e0537060a7a609104b2.zip
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
-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);