diff options
| author | Jordan Liu <jminjie@google.com> | 2017-12-06 20:47:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-06 20:47:13 +0000 |
| commit | 9252f028f558e2f205832639e4c28b61c736b7ea (patch) | |
| tree | b699addef2ab383bf80d7b6facd719d59e1be1f8 /res | |
| parent | 096b0b3e9d8698b4ad6863415558adbdf707acfd (diff) | |
| parent | 5288f6cfb5dd81ffff14be887f2745901378ac00 (diff) | |
| download | Stk-9252f028f558e2f205832639e4c28b61c736b7ea.tar.gz | |
Merge "Display the cancel button on the input screen"
am: 5288f6cfb5
Change-Id: I662fba9f1b00c4db9009e824950d067d7282508a
Diffstat (limited to 'res')
| -rw-r--r--[-rwxr-xr-x] | res/layout/stk_input.xml | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/res/layout/stk_input.xml b/res/layout/stk_input.xml index 40c8b77..c2a34aa 100755..100644 --- a/res/layout/stk_input.xml +++ b/res/layout/stk_input.xml @@ -92,33 +92,40 @@ android:layout_marginBottom="20dip" android:layout_width="match_parent" android:layout_height="wrap_content" /> - <Button - android:id="@+id/button_ok" - android:layout_gravity="center_horizontal" - android:layout_width="100sp" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:textStyle="bold" - android:text="@string/button_ok" /> + android:gravity="end" + android:orientation="horizontal"> + <Button + android:id="@+id/button_cancel" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:text="@string/button_cancel" /> + <Button + android:id="@+id/button_ok" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:text="@string/button_ok" /> + </LinearLayout> </LinearLayout> <LinearLayout android:id="@+id/yes_no_layout" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_horizontal"> - <Button - android:id="@+id/button_yes" - android:layout_width="100sp" - android:layout_height="wrap_content" - android:textStyle="bold" - android:text="@string/button_yes" /> + android:gravity="end" + android:orientation="horizontal"> <Button android:id="@+id/button_no" - android:layout_marginLeft="10dip" - android:layout_width="100sp" android:layout_height="wrap_content" - android:textStyle="bold" + android:layout_width="wrap_content" android:text="@string/button_no" /> + <Button + android:id="@+id/button_yes" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:text="@string/button_yes" /> </LinearLayout> </LinearLayout> </LinearLayout> |