Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Material styling in remaining dialogs and layouts

Browse Source 
Also updates existing row and dialog layouts to use preferred list item
or dialog padding as appropriate, fixes incorrect activity themes, and
updates ChooseAccountActivity variants for Material.

BUG: 18314215
BUG: 18292562
Change-Id: I2fde4ba6db80d839104abdaa334a46ad1861600f
This commit is contained in:
Alan Viverette
2014-11-10 16:14:27 -08:00
parent e6ef98cf05
commit f89b58ca83
30 changed files with 170 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -475,6 +475,7 @@ package android {
field public static final int dialogLayout = 16843255; // 0x10101f7
field public static final int dialogMessage = 16843251; // 0x10101f3
field public static final int dialogPreferenceStyle = 16842897; // 0x1010091
field public static final int dialogPreferredPadding = 16844037; // 0x1010505
field public static final int dialogTheme = 16843528; // 0x1010308
field public static final int dialogTitle = 16843250; // 0x10101f2
field public static final int digits = 16843110; // 0x1010166

16
core/res/AndroidManifest.xml
View File

@@ -2940,7 +2940,7 @@
android:label="@string/managed_profile_label">
</activity-alias>
<activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"
android:theme="@style/Theme.Material.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/heavy_weight_switcher_title"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"
@@ -2960,7 +2960,7 @@
<activity android:name="android.accounts.ChooseAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@android:style/Theme.Material.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
@@ -2968,14 +2968,14 @@
<activity android:name="android.accounts.ChooseTypeAndAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@android:style/Theme.Material.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
<activity android:name="android.accounts.ChooseAccountTypeActivity"
android:excludeFromRecents="true"
android:theme="@android:style/Theme.Material.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
@@ -2983,19 +2983,19 @@
<activity android:name="android.accounts.CantAddAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@android:style/Theme.Material.Dialog.NoActionBar"
android:theme="@style/Theme.Material.Light.Dialog.NoActionBar"
android:process=":ui">
</activity>
<activity android:name="android.accounts.GrantCredentialsPermissionActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@android:style/Theme.Material.DialogWhenLarge"
android:theme="@style/Theme.Material.Light.DialogWhenLarge"
android:process=":ui">
</activity>
<activity android:name="android.content.SyncActivityTooManyDeletes"
android:theme="@android:style/Theme.Holo.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/sync_too_many_deletes"
android:process=":ui">
</activity>
@@ -3014,7 +3014,7 @@
</activity>
<activity android:name="com.android.internal.app.NetInitiatedActivity"
android:theme="@style/Theme.Holo.Dialog.Alert"
android:theme="@style/Theme.Material.Light.Dialog.Alert"
android:excludeFromRecents="true"
android:process=":ui">
</activity>

10
core/res/res/layout/activity_chooser_view_list_item.xml
View File

@@ -17,11 +17,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list_item"
android:layout_width="match_parent"
android:layout_height="?android:attr/dropdownListPreferredItemHeight"
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:layout_height="?attr/dropdownListPreferredItemHeight"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
android:minWidth="196dip"
android:background="?android:attr/activatedBackgroundIndicator"
android:background="?attr/activatedBackgroundIndicator"
android:orientation="vertical" >
<LinearLayout
@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
android:textAppearance="?attr/textAppearanceLargePopupMenu"
android:duplicateParentState="true"
android:singleLine="true"
android:ellipsize="marquee"

8
core/res/res/layout/activity_list_item_2.xml
View File

@@ -17,9 +17,9 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:minHeight="?attr/listPreferredItemHeight"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:drawablePadding="14dip"
android:paddingStart="16dip"
android:paddingEnd="16dip" />
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd" />

14
core/res/res/layout/alert_dialog_material.xml
View File

@@ -31,9 +31,9 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical|start"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingTop="@dimen/alert_dialog_padding_top_material">
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material">
<ImageView android:id="@+id/icon"
android:layout_width="32dip"
android:layout_height="32dip"
@@ -74,13 +74,13 @@
style="@style/TextAppearance.Material.Subhead"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingTop="@dimen/alert_dialog_padding_top_material"
android:paddingEnd="@dimen/alert_dialog_padding_material" />
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material"
android:paddingEnd="?attr/dialogPreferredPadding" />
<Space android:id="@+id/textSpacerNoButtons"
android:visibility="gone"
android:layout_width="0dp"
android:layout_height="@dimen/alert_dialog_padding_top_material" />
android:layout_height="@dimen/dialog_padding_top_material" />
</LinearLayout>
</ScrollView>
<View android:id="@+id/scrollIndicatorDown"

8
core/res/res/layout/alert_dialog_progress_material.xml
View File

@@ -18,10 +18,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingTop="@dimen/alert_dialog_padding_top_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingBottom="@dimen/alert_dialog_padding_top_material">
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingBottom="@dimen/dialog_padding_top_material">
<ProgressBar
android:id="@+id/progress"
style="?attr/progressBarStyleHorizontal"

39
core/res/res/layout/app_not_authorized.xml
View File

@@ -26,30 +26,33 @@
<TextView android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="start|center_vertical"
android:paddingTop="16dip"
android:paddingBottom="16dip"
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material"
android:paddingEnd="?attr/dialogPreferredPadding"
android:text="@string/error_message_change_not_allowed"
/>
style="@style/TextAppearance.Material.Subhead" />
<!-- Horizontal divider line -->
<View android:layout_height="1dip"
android:layout_width="match_parent"
android:background="?android:attr/dividerHorizontal" />
<!-- Alert dialog style buttons along the bottom. -->
<LinearLayout android:id="@+id/button_bar"
style="?android:attr/buttonBarStyle"
<LinearLayout android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:measureWithLargestChild="true">
<Button android:id="@android:id/button1"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layoutDirection="locale"
android:orientation="horizontal"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:gravity="bottom">
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
android:visibility="invisible" />
<Button android:id="@+id/button1"
style="?attr/buttonBarNegativeButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@android:string/yes"
android:onClick="onCancelButtonClicked" />
</LinearLayout>

6
core/res/res/layout/choose_account.xml
View File

@@ -21,11 +21,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="16dip"
android:paddingEnd="16dip">
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding">
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
android:id="@id/list"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"

10
core/res/res/layout/choose_account_row.xml
View File

@@ -18,8 +18,8 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
android:orientation="horizontal" >
<ImageView android:id="@+id/account_row_icon"
@@ -31,8 +31,8 @@
android:id="@+id/account_row_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceListItem"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight" />
android:minHeight="?attr/listPreferredItemHeight" />
</LinearLayout>
</LinearLayout>

63
core/res/res/layout/choose_type_and_account.xml
View File

@@ -26,45 +26,52 @@
<TextView android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="start|center_vertical"
android:paddingTop="16dip"
android:paddingBottom="16dip"
android:paddingStart="16dip"
android:paddingEnd="16dip"
/>
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material"
android:paddingEnd="?attr/dialogPreferredPadding"
style="@style/TextAppearance.Material.Subhead" />
<!-- List of accounts, with "Add new account" as the last item -->
<ListView android:id="@android:id/list"
<FrameLayout android:id="@+id/contentPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="false"
android:layout_weight="1"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:choiceMode="singleChoice" />
android:minHeight="48dp">
<ListView android:id="@id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="false"
android:layout_weight="1"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:choiceMode="singleChoice" />
</FrameLayout>
<!-- Horizontal divider line -->
<View android:layout_height="1dip"
android:layout_width="match_parent"
android:background="?android:attr/dividerHorizontal" />
<!-- Alert dialog style buttons along the bottom. -->
<LinearLayout android:id="@+id/button_bar"
style="?android:attr/buttonBarStyle"
<LinearLayout android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:measureWithLargestChild="true">
<Button android:id="@android:id/button1"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layoutDirection="locale"
android:orientation="horizontal"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:gravity="bottom">
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
android:text="@android:string/no"
android:onClick="onCancelButtonClicked" />
<Button android:id="@android:id/button2"
style="?android:attr/buttonBarButtonStyle"
android:visibility="invisible" />
<Button android:id="@+id/button1"
style="?attr/buttonBarNegativeButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@android:string/no"
android:onClick="onCancelButtonClicked" />
<Button android:id="@+id/button2"
style="?attr/buttonBarPositiveButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/yes"
android:onClick="onOkButtonClicked" />
</LinearLayout>

6
core/res/res/layout/dialog_title_icons_material.xml
View File

@@ -28,9 +28,9 @@ enabled.
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingTop="@dimen/alert_dialog_padding_material">
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="?attr/dialogPreferredPadding">
<ImageView android:id="@+id/left_icon"
android:layout_width="32dip"
android:layout_height="32dip"

6
core/res/res/layout/dialog_title_material.xml
View File

@@ -29,9 +29,9 @@ enabled.
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="viewStart"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingTop="@dimen/alert_dialog_padding_top_material" />
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material" />
<FrameLayout
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"

13
core/res/res/layout/locale_picker_item.xml
View File

@@ -19,15 +19,14 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingStart="16dp"
android:minHeight="?attr/listPreferredItemHeight"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingEnd="16dp">
android:paddingBottom="8dp">
<TextView android:id="@+id/locale"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
</LinearLayout >
android:textAppearance="?android:attr/textAppearanceListItem" />
</LinearLayout>

6
core/res/res/layout/popup_menu_item_layout.xml
View File

@@ -16,7 +16,7 @@
<com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?android:attr/dropdownListPreferredItemHeight"
android:layout_height="?attr/dropdownListPreferredItemHeight"
android:minWidth="196dip"
android:paddingEnd="16dip">
@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
android:textAppearance="?attr/textAppearanceLargePopupMenu"
android:singleLine="true"
android:duplicateParentState="true"
android:ellipsize="marquee"
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_alignParentStart="true"
android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
android:textAppearance="?attr/textAppearanceSmallPopupMenu"
android:singleLine="true"
android:duplicateParentState="true"
android:textAlignment="viewStart" />

10
core/res/res/layout/progress_dialog_material.xml
View File

@@ -25,10 +25,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingTop="@dimen/alert_dialog_padding_top_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingBottom="@dimen/alert_dialog_padding_top_material">
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingBottom="@dimen/dialog_padding_top_material">
<ProgressBar
android:id="@id/progress"
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:max="10000"
android:layout_marginEnd="@dimen/alert_dialog_padding_material" />
android:layout_marginEnd="?attr/dialogPreferredPadding" />
<TextView
android:id="@+id/message"

8
core/res/res/layout/resolve_list_item.xml
View File

@@ -32,8 +32,8 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="?attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:scaleType="fitCenter" />
@@ -41,8 +41,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="start|center_vertical"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="start|center_vertical">

15
core/res/res/layout/resolver_list.xml
View File

@@ -23,23 +23,21 @@
android:maxWidth="@dimen/resolver_max_width"
android:maxCollapsedHeight="192dp"
android:maxCollapsedHeightSmall="56dp"
android:id="@id/contentPanel"
>
android:id="@id/contentPanel">
<TextView android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alwaysShow="true"
android:minHeight="56dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?attr/textAppearanceMedium"
android:gravity="start|center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="@color/white"
android:elevation="8dp"
/>
android:elevation="8dp" />
<ListView
android:layout_width="match_parent"
@@ -50,8 +48,7 @@
android:background="@color/white"
android:elevation="8dp"
android:nestedScrollingEnabled="true"
android:divider="@null"
/>
android:divider="@null" />
<TextView android:id="@+id/empty"
android:layout_width="match_parent"

4
core/res/res/layout/select_dialog_multichoice_material.xml
View File

@@ -23,8 +23,8 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:checkMarkGravity="start"
android:ellipsize="marquee" />

4
core/res/res/layout/select_dialog_singlechoice_material.xml
View File

@@ -23,8 +23,8 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding"
android:checkMark="?android:attr/listChoiceIndicatorSingle"
android:checkMarkGravity="start"
android:ellipsize="marquee" />

22
core/res/res/layout/simple_account_item.xml
View File

@@ -18,13 +18,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:minHeight="?attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingStart="16dip"
android:paddingEnd="?android:attr/scrollbarSize">
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/scrollbarSize">
<ImageView
android:id="@+android:id/icon"
android:id="@id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
@@ -36,20 +36,20 @@
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
<TextView android:id="@+android:id/title"
<TextView android:id="@id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="none"
android:textAppearance="?android:attr/textAppearanceListItem" />
<TextView android:id="@+android:id/summary"
android:textAppearance="?attr/textAppearanceListItem" />
<TextView android:id="@id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:layout_below="@id/title"
android:layout_alignStart="@id/title"
android:singleLine="true"
android:ellipsize="none"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"/>
android:textAppearance="?attr/textAppearanceListItemSecondary"
android:textColor="?attr/textColorSecondary"/>
</RelativeLayout>
</LinearLayout>

2
core/res/res/layout/simple_list_item_2_single_choice.xml
View File

@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingStart="16dip"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="12dip"
android:minHeight="?attr/listPreferredItemHeightSmall"
android:background="@color/transparent">

4
core/res/res/layout/user_switching_dialog.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingStart="@dimen/alert_dialog_padding_material"
android:paddingEnd="@dimen/alert_dialog_padding_material"
android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="24dp"
android:paddingBottom="24dp" />

8
core/res/res/values/attrs.xml
View File

@@ -908,12 +908,14 @@
<!-- Theme to use for dialogs spawned from this theme. -->
<attr name="dialogTheme" format="reference" />
<!-- Window decor layout to use in dialog mode with icons -->
<!-- Window decor layout to use in dialog mode with icons. -->
<attr name="dialogTitleIconsDecorLayout" format="reference" />
<!-- Window decor layout to use in dialog mode with custom titles -->
<!-- Window decor layout to use in dialog mode with custom titles. -->
<attr name="dialogCustomTitleDecorLayout" format="reference" />
<!-- Window decor layout to use in dialog mode with title only -->
<!-- Window decor layout to use in dialog mode with title only. -->
<attr name="dialogTitleDecorLayout" format="reference" />
<!-- Preferred padding for dialog content. -->
<attr name="dialogPreferredPadding" format="dimension" />
<!-- Theme to use for alert dialogs spawned from this theme. -->
<attr name="alertDialogTheme" format="reference" />

3
core/res/res/values/dimens.xml
View File

@@ -123,6 +123,9 @@
be either a fraction or a dimension. -->
<item type="dimen" name="dialog_min_width_minor">95%</item>
<!-- Default padding for dialogs. -->
<dimen name="dialog_padding">16dp</dimen>
<!-- The width of the big icons in notifications. -->
<dimen name="notification_large_icon_width">64dp</dimen>
<!-- The width of the big icons in notifications. -->

4
core/res/res/values/dimens_material.xml
View File

@@ -91,6 +91,6 @@
<!-- Default rounded corner for controls -->
<dimen name="control_corner_material">2dp</dimen>
<dimen name="alert_dialog_padding_material">24dp</dimen>
<dimen name="alert_dialog_padding_top_material">18dp</dimen>
<dimen name="dialog_padding_material">24dp</dimen>
<dimen name="dialog_padding_top_material">18dp</dimen>
</resources>

1
core/res/res/values/public.xml
View File

@@ -2599,5 +2599,6 @@
<public type="attr" name="collapseContentDescription"/>
<public type="attr" name="accessibilityTraversalBefore" />
<public type="attr" name="accessibilityTraversalAfter" />
<public type="attr" name="dialogPreferredPadding" />
</resources>

4
core/res/res/values/styles.xml
View File

@@ -43,6 +43,10 @@ please see styles_device_defaults.xml.
<item name="shadowRadius">2.75</item>
</style>
<style name="DialogWindowTitleBackground">
<item name="background">@drawable/title_bar</item>
</style>
<style name="DialogWindowTitle">
<item name="maxLines">1</item>
<item name="scrollHorizontally">true</item>

9
core/res/res/values/styles_material.xml
View File

@@ -1128,6 +1128,15 @@ please see styles_device_defaults.xml.
<item name="textAlignment">viewStart</item>
</style>
<style name="DialogWindowTitleBackground.Material">
<item name="background">@null</item>
<item name="paddingStart">?attr/dialogPreferredPadding</item>
<item name="paddingEnd">?attr/dialogPreferredPadding</item>
<item name="paddingTop">@dimen/dialog_padding_top_material</item>
</style>
<style name="DialogWindowTitleBackground.Material.Light" />
<style name="DialogWindowTitle.Material">
<item name="maxLines">1</item>
<item name="scrollHorizontally">true</item>

1
core/res/res/values/themes.xml
View File

@@ -210,6 +210,7 @@ please see themes_device_defaults.xml.
<item name="dialogTitleIconsDecorLayout">@layout/dialog_title_icons</item>
<item name="dialogCustomTitleDecorLayout">@layout/dialog_custom_title</item>
<item name="dialogTitleDecorLayout">@layout/dialog_title</item>
<item name="dialogPreferredPadding">@dimen/dialog_padding</item>
<!-- AlertDialog attributes -->
<item name="alertDialogTheme">@style/Theme.Dialog.Alert</item>

4
core/res/res/values/themes_material.xml
View File

@@ -178,6 +178,7 @@ please see themes_device_defaults.xml.
<item name="dialogTitleIconsDecorLayout">@layout/dialog_title_icons_material</item>
<item name="dialogCustomTitleDecorLayout">@layout/dialog_custom_title_material</item>
<item name="dialogTitleDecorLayout">@layout/dialog_title_material</item>
<item name="dialogPreferredPadding">@dimen/dialog_padding_material</item>
<!-- AlertDialog attributes -->
<item name="alertDialogTheme">@style/Theme.Material.Dialog.Alert</item>
@@ -529,6 +530,7 @@ please see themes_device_defaults.xml.
<item name="dialogTitleIconsDecorLayout">@layout/dialog_title_icons_material</item>
<item name="dialogCustomTitleDecorLayout">@layout/dialog_custom_title_material</item>
<item name="dialogTitleDecorLayout">@layout/dialog_title_material</item>
<item name="dialogPreferredPadding">@dimen/dialog_padding_material</item>
<!-- AlertDialog attributes -->
<item name="alertDialogTheme">@style/Theme.Material.Light.Dialog.Alert</item>
@@ -1001,6 +1003,7 @@ please see themes_device_defaults.xml.
<item name="windowFrame">@null</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Material</item>
<item name="windowTitleBackgroundStyle">@style/DialogWindowTitleBackground.Material</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
<item name="windowElevation">@dimen/floating_window_z</item>
<item name="windowIsFloating">true</item>
@@ -1117,6 +1120,7 @@ please see themes_device_defaults.xml.
<item name="windowFrame">@null</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Material.Light</item>
<item name="windowTitleBackgroundStyle">@style/DialogWindowTitleBackground.Material.Light</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
<item name="windowElevation">@dimen/floating_window_z</item>
<item name="windowIsFloating">true</item>