From ba9f88b3d6930bbd686e23672d3b1203dd1a3015 Mon Sep 17 00:00:00 2001
From: jrizzoli <joey@cyanogenmoditalia.it>
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 <joey@cyanogenmoditalia.it>
---
 res/layout-port/camera_controls.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'res/layout-port')

diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 5b92db021..77ff076b9 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -25,10 +25,6 @@
         android:layout_gravity="bottom"
         android:clickable="true" />
 
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/filter_mode_switcher"
-        style="@style/ToggleButton" />
-
     <com.android.camera.ui.ModuleSwitcher
         android:id="@+id/camera_switcher"
         style="@style/SwitcherButton"
@@ -59,12 +55,18 @@
         android:contentDescription="@string/switch_photo_filmstrip"
         android:scaleType="fitCenter" />
 
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/menu"
+        style="@style/ToggleButton"
+        android:contentDescription="@string/accessibility_menu_button"
+        android:src="@drawable/ic_settings" />
+
     <com.android.camera.ui.RotateImageView
         android:id="@+id/front_back_switcher"
         style="@style/ToggleButton" />
 
     <com.android.camera.ui.RotateImageView
-        android:id="@+id/hdr_switcher"
+        android:id="@+id/filter_mode_switcher"
         style="@style/ToggleButton" />
 
     <com.android.camera.ui.RotateImageView
@@ -72,10 +74,8 @@
         style="@style/ToggleButton" />
 
     <com.android.camera.ui.RotateImageView
-        android:id="@+id/menu"
-        style="@style/ToggleButton"
-        android:contentDescription="@string/accessibility_menu_button"
-        android:src="@drawable/ic_settings" />
+        android:id="@+id/hdr_switcher"
+        style="@style/ToggleButton" />
 
     <LinearLayout
         android:id="@+id/remaining_photos"
-- 
cgit v1.2.3