summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-02 10:38:19 -0700
committerBruno Martins <bgcngm@gmail.com>2018-11-20 12:31:36 +0000
commitd99d60267e1290f353edb774684a32fd92db4cd2 (patch)
tree6945fbb7cb52a0465547caf1cbe116a2678cf488 /src/com
parent3bac6f46e53a643e51b0c9352fcdff335d4043a9 (diff)
downloadandroid_packages_apps_Snap-d99d60267e1290f353edb774684a32fd92db4cd2.tar.gz
android_packages_apps_Snap-d99d60267e1290f353edb774684a32fd92db4cd2.tar.bz2
android_packages_apps_Snap-d99d60267e1290f353edb774684a32fd92db4cd2.zip
snap: Adjust top bar icon order
Change-Id: I1fe55daca970a8e9a725718aa6a02618450ccbf6
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/ui/CameraControls.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index b8e4f35ec..6bb7fb95b 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -375,18 +375,18 @@ public class CameraControls extends RotatableLayout {
int rotation = getUnifiedRotation();
toIndex(mSwitcher, w, h, rotation, 4, 6, SWITCHER_INDEX);
toIndex(mVideoShutter, w, h, rotation, 3, 6, VIDEO_SHUTTER_INDEX);
- toIndex(mMenu, w, h, rotation, 4, 0, MENU_INDEX);
- toIndex(mMute, w, h, rotation, 3, 0, MUTE_INDEX);
+ toIndex(mSceneModeSwitcher, w, h, rotation, 4, 0, SCENE_MODE_INDEX);
+ toIndex(mMute, w, h, rotation, 4, 0, MUTE_INDEX);
+ toIndex(mFilterModeSwitcher, w, h, rotation, 3, 0, FILTER_MODE_INDEX);
toIndex(mExitPanorama, w, h, rotation, 0, 0, EXIT_PANORAMA_INDEX);
- toIndex(mFrontBackSwitcher, w, h, rotation, 2, 0, FRONT_BACK_INDEX);
+ toIndex(mFrontBackSwitcher, w, h, rotation, 1, 0, FRONT_BACK_INDEX);
toIndex(mPreview, w, h, rotation, 0, 6, PREVIEW_INDEX);
if(TsMakeupManager.HAS_TS_MAKEUP) {
- toIndex(mTsMakeupSwitcher, w, h, rotation, 3, 0, TS_MAKEUP_INDEX);
+ toIndex(mTsMakeupSwitcher, w, h, rotation, 2, 0, TS_MAKEUP_INDEX);
} else {
- toIndex(mHdrSwitcher, w, h, rotation, 3, 0, HDR_INDEX);
+ toIndex(mHdrSwitcher, w, h, rotation, 2, 0, HDR_INDEX);
}
- toIndex(mFilterModeSwitcher, w, h, rotation, 1, 0, FILTER_MODE_INDEX);
- toIndex(mSceneModeSwitcher, w, h, rotation, 0, 0, SCENE_MODE_INDEX);
+ toIndex(mMenu, w, h, rotation, 0, 0, MENU_INDEX);
layoutToast(mRefocusToast, w, h, rotation);
}