diff options
author | Michael Kolb <kolby@google.com> | 2013-03-12 10:24:42 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2013-04-01 16:35:44 -0700 |
commit | 3bc96b2d1106fc5ebec6fda6aad3bca4d62e81c0 (patch) | |
tree | 43c8eae3c556b647bbac3d207e9b63491d1775f4 /src/com/android/camera/VideoMenu.java | |
parent | e5a79a5bd8ca3e25c14e4fe5df7c1ee1b544dc7e (diff) | |
download | android_packages_apps_Snap-3bc96b2d1106fc5ebec6fda6aad3bca4d62e81c0.tar.gz android_packages_apps_Snap-3bc96b2d1106fc5ebec6fda6aad3bca4d62e81c0.tar.bz2 android_packages_apps_Snap-3bc96b2d1106fc5ebec6fda6aad3bca4d62e81c0.zip |
Pie design update
Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index aa3a80716..0f987aa87 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -34,7 +34,6 @@ public class VideoMenu extends PieController TimeIntervalPopup.Listener { private static String TAG = "CAM_VideoMenu"; - private static float FLOAT_PI_DIVIDED_BY_TWO = (float) Math.PI / 2; private VideoUI mUI; private String[] mOtherKeys; @@ -54,12 +53,13 @@ public class VideoMenu extends PieController super.initialize(group); mPopup = null; mPopupStatus = POPUP_NONE; - float sweep = FLOAT_PI_DIVIDED_BY_TWO / 2; + float sweep = (float)(SWEEP * Math.PI); - addItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, FLOAT_PI_DIVIDED_BY_TWO - sweep, sweep); - addItem(CameraSettings.KEY_WHITE_BALANCE, 3 * FLOAT_PI_DIVIDED_BY_TWO + sweep, sweep); + addItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CENTER - sweep, sweep); + addItem(CameraSettings.KEY_WHITE_BALANCE, CENTER + sweep, sweep); + // camera switcher PieItem item = makeItem(R.drawable.ic_switch_video_facing_holo_light); - item.setFixedSlice(FLOAT_PI_DIVIDED_BY_TWO + sweep, sweep); + item.setFixedSlice(CENTER - 2 * sweep, sweep); item.setOnClickListener(new OnClickListener() { @Override @@ -76,15 +76,15 @@ public class VideoMenu extends PieController } }); mRenderer.addItem(item); + // settings popup mOtherKeys = new String[] { CameraSettings.KEY_VIDEO_EFFECT, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, CameraSettings.KEY_VIDEO_QUALITY, CameraSettings.KEY_RECORD_LOCATION }; - item = makeItem(R.drawable.ic_settings_holo_light); - item.setFixedSlice(FLOAT_PI_DIVIDED_BY_TWO * 3, sweep); + item.setFixedSlice(CENTER, sweep); item.setOnClickListener(new OnClickListener() { @Override public void onClick(PieItem item) { |