diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-22 06:51:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 06:51:27 +0000 |
| commit | 840ff4ae5bf3222a75e111e92c7b6b9b584054bb (patch) | |
| tree | 71e092494a24b2c3a66471ead6c48a44c83e322f /core/res | |
| parent | db2ed8fdd1ddd3b43b710829d94b9fc8290e90b4 (diff) | |
| parent | 6c60c0fa85d9e7ea425c98a64dfc119cba392b3f (diff) | |
| download | frameworks_base-840ff4ae5bf3222a75e111e92c7b6b9b584054bb.zip frameworks_base-840ff4ae5bf3222a75e111e92c7b6b9b584054bb.tar.gz frameworks_base-840ff4ae5bf3222a75e111e92c7b6b9b584054bb.tar.bz2 | |
Merge "End-align alert dialog buttons to avoid layout bug on tablet"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/alert_dialog_quantum.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/styles_quantum.xml | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/core/res/res/layout/alert_dialog_quantum.xml b/core/res/res/layout/alert_dialog_quantum.xml index 80e34cb..e109425 100644 --- a/core/res/res/layout/alert_dialog_quantum.xml +++ b/core/res/res/layout/alert_dialog_quantum.xml @@ -89,10 +89,11 @@ android:layout_height="wrap_content" android:minHeight="@dimen/alert_dialog_button_bar_height" android:orientation="vertical" + android:gravity="end" android:padding="16dip"> <LinearLayout style="?android:attr/buttonBarStyle" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layoutDirection="locale"> <Button android:id="@+id/button3" @@ -102,11 +103,6 @@ android:layout_marginRight="8dip" android:maxLines="2" android:minHeight="@dimen/alert_dialog_button_bar_height" /> - <View - android:layout_width="0dp" - android:layout_height="@dimen/alert_dialog_button_bar_height" - android:layout_weight="1" - android:visibility="invisible" /> <Button android:id="@+id/button2" style="?android:attr/buttonBarButtonStyle" android:layout_width="wrap_content" diff --git a/core/res/res/values/styles_quantum.xml b/core/res/res/values/styles_quantum.xml index e714e12..e528278 100644 --- a/core/res/res/values/styles_quantum.xml +++ b/core/res/res/values/styles_quantum.xml @@ -364,7 +364,6 @@ please see styles_device_defaults.xml. <item name="textColor">?attr/textColorPrimary</item> <item name="minHeight">48dip</item> <item name="minWidth">96dip</item> - <item name="elevation">2dip</item> <item name="stateListAnimator">@anim/button_state_list_anim_quantum</item> </style> |