summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-02 10:38:19 -0700
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:08:50 +0100
commit693bf7dcefaf5e18e22d20b44fc5fbf0b2c0bc44 (patch)
treec6b9df8f36552a807cb35d8c8b47cff321cb029d
parent25846ffb7617bb1f1af522f0162c6359f51d63a8 (diff)
downloadandroid_packages_apps_Snap-693bf7dcefaf5e18e22d20b44fc5fbf0b2c0bc44.tar.gz
android_packages_apps_Snap-693bf7dcefaf5e18e22d20b44fc5fbf0b2c0bc44.tar.bz2
android_packages_apps_Snap-693bf7dcefaf5e18e22d20b44fc5fbf0b2c0bc44.zip
snap: Adjust top bar icon order
Change-Id: I1fe55daca970a8e9a725718aa6a02618450ccbf6
-rwxr-xr-xsrc/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 00496a337..17961dfa9 100755
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -400,18 +400,18 @@ public class CameraControls extends RotatableLayout {
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);
}