diff options
| author | Angus Kong <shkong@google.com> | 2011-11-04 00:15:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-04 00:15:16 -0700 |
| commit | c661613fc809c9623327408d052221f81dac0dfd (patch) | |
| tree | bdce4e3c19e7155840cd0363b5533ded5218653a /res | |
| parent | e815ff206d69711c0ad41ebca71f7387b2a5a3b0 (diff) | |
| parent | 66629c698da1117db6d3fa0f7b2161c4d87e26e8 (diff) | |
| download | LegacyCamera-c661613fc809c9623327408d052221f81dac0dfd.zip LegacyCamera-c661613fc809c9623327408d052221f81dac0dfd.tar.gz LegacyCamera-c661613fc809c9623327408d052221f81dac0dfd.tar.bz2 | |
Merge "Change the style of cancel button in Panorama." into ics-mr1
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-sw600dp/pano_review.xml | 9 | ||||
| -rw-r--r-- | res/layout/pano_review.xml | 8 |
2 files changed, 10 insertions, 7 deletions
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> |