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

Commit 77eb57fc authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5142716 - Dialog content font size/padding is inconsistent... 

Merge "Fix bug 5142716 - Dialog content font size/padding is inconsistent across different applications."
parents cbf3e595 d257544e

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -958,6 +958,8 @@ package android { 
    field public static final int textAppearanceLarge = 16842816; // 0x1010040

    field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043

    field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301

    field public static final int textAppearanceListItem = 16843688; // 0x10103a8

    field public static final int textAppearanceListItemSmall = 16843689; // 0x10103a9

    field public static final int textAppearanceMedium = 16842817; // 0x1010041

    field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044

    field public static final int textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0

core/res/res/layout/activity_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
    android:layout_height="wrap_content"

    android:paddingTop="1dip"

    android:paddingBottom="1dip"

    android:paddingLeft="6dip"

    android:paddingRight="6dip">

    android:paddingLeft="8dip"

    android:paddingRight="8dip">



    <ImageView android:id="@+id/icon"

        android:layout_width="24dip"

core/res/res/layout/list_menu_item_layout.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginLeft="6dip"

        android:layout_marginRight="6dip"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:duplicateParentState="true">

        

        <TextView
@@ -36,7 +36,7 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_alignParentLeft="true"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:textAppearance="?android:attr/textAppearanceListItemSmall"

            android:singleLine="true"

            android:duplicateParentState="true"

            android:ellipsize="marquee"

core/res/res/layout/select_dialog_item_holo.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textAppearance="?android:attr/textAppearanceListItemSmall"

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

    android:paddingLeft="16dip"

core/res/res/layout/simple_expandable_list_item_1.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="?android:attr/listPreferredItemHeight"

    android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"

    android:textAppearance="?android:attr/textAppearanceLarge"

    android:textAppearance="?android:attr/textAppearanceListItem"

    android:gravity="center_vertical"

/>