summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorjrizzoli <joey@cyanogenmoditalia.it>2016-02-22 22:05:17 +0100
committerDanny Baumann <dannybaumann@web.de>2016-04-03 04:37:42 -0700
commitba9f88b3d6930bbd686e23672d3b1203dd1a3015 (patch)
tree878aa39852503863e2dec0c9e3b3d4d371f097e0 /src/com
parent6058c3806372a607f371438a5d132934a057ecc8 (diff)
downloadandroid_packages_apps_Snap-ba9f88b3d6930bbd686e23672d3b1203dd1a3015.tar.gz
android_packages_apps_Snap-ba9f88b3d6930bbd686e23672d3b1203dd1a3015.tar.bz2
android_packages_apps_Snap-ba9f88b3d6930bbd686e23672d3b1203dd1a3015.zip
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 <joey@cyanogenmoditalia.it>
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/ui/CameraControls.java8
1 files changed, 4 insertions, 4 deletions
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(),