diff options
| author | Jordan Liu <jminjie@google.com> | 2017-12-07 05:55:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-07 05:55:53 +0000 |
| commit | f2023d2a0ce5bb2e3b45e7b8c09c03beff011ba6 (patch) | |
| tree | de16f09a6f72ced57450e2cf4cf278325455d3bc /res | |
| parent | 4157da6ddeda053f8a5d91b20c477a2f20e67c54 (diff) | |
| parent | 62ed084c74a6a6f3a907e2b01d877fd535d03a41 (diff) | |
| download | Stk-f2023d2a0ce5bb2e3b45e7b8c09c03beff011ba6.tar.gz | |
Merge "Display the cancel button on the input screen" am: 5288f6cfb5 am: 9252f028f5
am: 62ed084c74
Change-Id: I5de8497f5034e5fbff80b30f00d7807e7db809b0
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> |