summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/CameraSettings.java8
-rw-r--r--src/com/android/camera/VideoUI.java1
-rw-r--r--src/com/android/gallery3d/app/SlideshowPage.java3
3 files changed, 6 insertions, 6 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);
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index dc23ec814..9fc05769f 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -345,6 +345,7 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener,
// PieListener
@Override
public void onPieOpened(int centerX, int centerY) {
+ dismissPopup(false, true);
mActivity.cancelActivityTouchHandling();
mActivity.setSwipingEnabled(false);
}
diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java
index d269e90ea..174058dc8 100644
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -112,8 +112,7 @@ public class SlideshowPage extends ActivityState {
@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;