Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f89b58ca authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix Material styling in remaining dialogs and layouts 

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
parent e6ef98cf

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

core/res/AndroidManifest.xml

+8 −8
Original line number Diff line number Diff line
@@ -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>

core/res/res/layout/activity_chooser_view_list_item.xml

+5 −5
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout/activity_list_item_2.xml

+4 −4
Original line number Diff line number Diff line
@@ -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" />

core/res/res/layout/alert_dialog_material.xml

+7 −7
Original line number Diff line number Diff line
@@ -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"