From 070553715d59999705e470794fae85d916e6d600 Mon Sep 17 00:00:00 2001
From: wqi <wqi@codeaurora.org>
Date: Wed, 13 Apr 2016 09:57:51 +0800
Subject: Gallery2: Modify actionbar in photo editor interface.

Add a exit button and move save button to right in photo editor
interface according to UX specification document.

Change-Id: I2cdbb0b4967822b78f65af6eea2b8571a6e653b9
CRs-Fixed: 988043
---
 res/layout/filtershow_actionbar.xml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index ec9ed2914..7e6d62504 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -14,20 +14,29 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/toolbar_height" >
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/toolbar_height"
+    android:orientation="horizontal">
+
+    <ImageButton
+        android:id="@+id/filtershow_exit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:scaleType="fitCenter"
+        android:src="@drawable/cancel"
+        android:layout_gravity="left|center_vertical"
+        android:paddingStart="16dp" />
 
     <TextView
         android:id="@+id/filtershow_done"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:drawablePadding="24dp"
-        android:drawableStart="@drawable/done"
-        android:gravity="center_vertical"
-        android:paddingBottom="15dp"
+        android:layout_height="wrap_content"
+        android:paddingRight="13dp"
+        android:textSize="17sp"
         android:text="@string/save"
-        android:textColor="#ffffff"
-        android:textSize="18sp" />
+        android:layout_gravity="center_vertical|right"
+        android:textColor="#ffffff" />
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3