summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-26 18:10:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-26 18:10:17 +0000
commitabd5efe72de6b571aada1b69633a4d02aced5616 (patch)
treecb1ca4358f5f6822970830c927f100bcfa2a211c /src/com/android/camera
parentba57946072e4f9f4c78259ae288c6d0667180e56 (diff)
parentc835849b179c481b92a308157d518bb3ad73f069 (diff)
downloadandroid_packages_apps_Snap-abd5efe72de6b571aada1b69633a4d02aced5616.tar.gz
android_packages_apps_Snap-abd5efe72de6b571aada1b69633a4d02aced5616.tar.bz2
android_packages_apps_Snap-abd5efe72de6b571aada1b69633a4d02aced5616.zip
Merge "Center Video menu" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/VideoMenu.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index ca2549e2d..fee7665fa 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -62,18 +62,18 @@ public class VideoMenu extends PieController
PieItem item = null;
// flash
if (group.findPreference(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE) != null) {
- item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 5);
+ item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 4);
mRenderer.addItem(item);
}
// white balance
if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) {
- item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5);
+ item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 4);
mRenderer.addItem(item);
}
// camera switcher
if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
item = makeItem(R.drawable.ic_switch_back);
- item.setPosition(POS_SWITCH, 5);
+ item.setPosition(POS_SWITCH, 4);
IconListPreference lpref = (IconListPreference) group.findPreference(
CameraSettings.KEY_CAMERA_ID);
item.setLabel(lpref.getLabel());
@@ -111,7 +111,7 @@ public class VideoMenu extends PieController
CameraSettings.KEY_RECORD_LOCATION
};
item = makeItem(R.drawable.ic_settings_holo_light);
- item.setPosition(POS_SET, 5);
+ item.setPosition(POS_SET, 4);
item.setLabel(mActivity.getResources().getString(R.string.camera_menu_settings_label));
item.setOnClickListener(new OnClickListener() {
@Override