From ba9f88b3d6930bbd686e23672d3b1203dd1a3015 Mon Sep 17 00:00:00 2001 From: jrizzoli Date: Mon, 22 Feb 2016 22:05:17 +0100 Subject: snap: rearrange top view icons * menu icon should go to the left since it opens a menu that slides in from the left * arrange other icons to not give odd empty spaces when switching modes or hdr is not supported Change-Id: Ia5099f2eac47e0aad4ab1419e6d490347976162d Signed-off-by: jrizzoli --- src/com/android/camera/ui/CameraControls.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/com') diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 0c6469709..4a61a7e5b 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -201,8 +201,8 @@ public class CameraControls extends RotatableLayout { mHistogramView = (HistogramView) findViewById(R.id.histogram); mTopViews = new View[] { - mSceneModeSwitcher, mFilterModeSwitcher, mHdrSwitcher, - mFrontBackSwitcher, mMenu, mAutoHdrNotice, mHistogramView + mMenu, mFrontBackSwitcher, mFilterModeSwitcher, + mSceneModeSwitcher, mHdrSwitcher, mAutoHdrNotice, mHistogramView }; mBottomViews = new View[] { mPreview, mShutter, mSwitcher @@ -252,8 +252,8 @@ public class CameraControls extends RotatableLayout { int w = r - l; int h = b - t; - asRow(true, w, h, rotation, mSceneModeSwitcher, mFilterModeSwitcher, - mFrontBackSwitcher, mHdrSwitcher, mMenu); + asRow(true, w, h, rotation, mMenu,mFrontBackSwitcher, + mFilterModeSwitcher, mSceneModeSwitcher, mHdrSwitcher); center(mAutoHdrNotice, l, t + mSize, r, t + mSize + mAutoHdrNotice.getMeasuredHeight(), -- cgit v1.2.3