From 66629c698da1117db6d3fa0f7b2161c4d87e26e8 Mon Sep 17 00:00:00 2001
From: Angus Kong <shkong@google.com>
Date: Wed, 2 Nov 2011 11:01:12 +0800
Subject: Change the style of cancel button in Panorama.

To comply with UI spec:
1. Change the text size to 12sp.
2. Change the pressed-state background.
3. Adjust the height to match the parent.

bug:5521011
Change-Id: I4b99a1593aec67eb41c38ae97d54f3c9c4fce740
---
 res/layout-sw600dp/pano_review.xml | 9 +++++----
 res/layout/pano_review.xml         | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'res')

diff --git a/res/layout-sw600dp/pano_review.xml b/res/layout-sw600dp/pano_review.xml
index c16df1a..cf1fb54 100644
--- a/res/layout-sw600dp/pano_review.xml
+++ b/res/layout-sw600dp/pano_review.xml
@@ -28,18 +28,19 @@
 
         <com.android.camera.ui.RotateLayout
                 android:id="@+id/pano_review_cancel_button_layout"
-                android:layout_gravity="center_vertical"
+                android:layout_gravity="right|center_vertical"
                 android:layout_marginRight="20dp"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
             <TextView android:id="@+id/pano_review_cancel_button"
                     android:text="@string/review_cancel"
-                    android:gravity="right"
+                    android:background="@drawable/bg_pressed"
+                    android:gravity="center"
                     android:clickable="true"
                     android:onClick="onCancelButtonClicked"
-                    android:textAppearance="?android:textAppearanceMedium"
+                    android:textSize="12sp"
                     android:minWidth="@dimen/pano_review_button_width"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_width="wrap_content" />
         </com.android.camera.ui.RotateLayout>
     </LinearLayout>
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index 2900a5a..fa4f83b 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -65,16 +65,18 @@
 
         <com.android.camera.ui.RotateLayout
                 android:id="@+id/pano_review_cancel_button_layout"
-                android:layout_gravity="center_horizontal"
+                android:layout_gravity="bottom|center_horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
             <TextView android:id="@+id/pano_review_cancel_button"
                     android:text="@string/review_cancel"
+                    android:background="@drawable/bg_pressed"
+                    android:gravity="center"
                     android:clickable="true"
                     android:onClick="onCancelButtonClicked"
-                    android:textAppearance="?android:textAppearanceMedium"
+                    android:textSize="12sp"
                     android:minWidth="@dimen/pano_review_button_width"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_width="wrap_content" />
         </com.android.camera.ui.RotateLayout>
     </LinearLayout>
-- 
cgit v1.1