diff options
| -rw-r--r-- | core/res/res/layout-xlarge/activity_list.xml | 38 | ||||
| -rw-r--r-- | core/res/res/layout/activity_list_item_2.xml | 6 |
2 files changed, 22 insertions, 22 deletions
diff --git a/core/res/res/layout-xlarge/activity_list.xml b/core/res/res/layout-xlarge/activity_list.xml index 9d6b8f5a28b4..ad485c181eb6 100644 --- a/core/res/res/layout-xlarge/activity_list.xml +++ b/core/res/res/layout-xlarge/activity_list.xml @@ -32,15 +32,14 @@ <LinearLayout android:id="@+id/topPanel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="48dip" android:orientation="vertical"> <LinearLayout android:id="@+id/title_template" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:gravity="center_vertical" - android:layout_marginTop="8dip" - android:layout_marginBottom="8dip" + android:gravity="center_vertical|left" + android:minHeight="60dip" + android:layout_marginLeft="32dip" android:layout_marginRight="32dip"> <ImageView android:id="@+id/icon" android:layout_width="wrap_content" @@ -49,7 +48,7 @@ android:src="@null" android:visibility="gone" /> <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle" - style="?android:attr/textAppearanceLarge" + style="?android:attr/textAppearanceMedium" android:singleLine="true" android:ellipsize="end" android:layout_width="match_parent" @@ -57,15 +56,19 @@ </LinearLayout> <ImageView android:id="@+id/titleDivider" android:layout_width="match_parent" - android:layout_height="1dip" + android:layout_height="4dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" android:scaleType="fitXY" android:gravity="fill_horizontal" - android:src="@android:drawable/divider_horizontal_dark" /> + android:src="@android:drawable/divider_strong_holo" /> <!-- If the client uses a customTitle, it will be added here. --> </LinearLayout> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" + android:layout_marginLeft="32dip" + android:layout_marginRight="32dip" android:layout_height="0dip" android:layout_weight="1"> @@ -86,23 +89,19 @@ /> </FrameLayout> - <ImageView - android:layout_width="match_parent" - android:layout_height="1dip" - android:scaleType="fitXY" - android:gravity="fill_horizontal" - android:src="@android:drawable/divider_horizontal_dark" /> - <LinearLayout android:id="@+id/buttonPanel" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="54dip" - android:orientation="vertical" > + android:orientation="vertical" + android:divider="?android:attr/dividerHorizontal" + android:showDividers="beginning" + android:dividerPadding="16dip"> <LinearLayout + style="?android:attr/buttonBarStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingTop="4dip" android:paddingLeft="2dip" android:paddingRight="2dip" android:measureWithLargestChild="true"> @@ -111,20 +110,21 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:orientation="horizontal" - /> + android:visibility="gone" /> <Button android:id="@+id/button1" android:layout_width="0dip" - android:layout_gravity="center" + android:layout_gravity="left" android:layout_weight="1" android:maxLines="2" android:text="@string/cancel" + style="?android:attr/buttonBarButtonStyle" android:layout_height="wrap_content" /> <LinearLayout android:id="@+id/rightSpacer" android:layout_width="0dip" android:layout_weight="0.25" android:layout_height="wrap_content" android:orientation="horizontal" - /> + android:visibility="gone" /> </LinearLayout> </LinearLayout> </com.android.internal.widget.WeightedLinearLayout> diff --git a/core/res/res/layout/activity_list_item_2.xml b/core/res/res/layout/activity_list_item_2.xml index e937d7bc1d21..3b84c733e450 100644 --- a/core/res/res/layout/activity_list_item_2.xml +++ b/core/res/res/layout/activity_list_item_2.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" android:drawablePadding="14dip" - android:paddingLeft="15dip" - android:paddingRight="15dip" /> + android:paddingLeft="16dip" + android:paddingRight="16dip" /> |