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

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

Merge "Bug 5214224 - List item metrics"

parents 858c396e 7c8375d6

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -644,6 +644,8 @@ package android { 
    field public static final int listPreferredItemHeight = 16842829; // 0x101004d

    field public static final int listPreferredItemHeightLarge = 16843668; // 0x1010394

    field public static final int listPreferredItemHeightSmall = 16843669; // 0x1010395

    field public static final int listPreferredItemPaddingLeft = 16843697; // 0x10103b1

    field public static final int listPreferredItemPaddingRight = 16843698; // 0x10103b2

    field public static final int listSelector = 16843003; // 0x10100fb

    field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208

    field public static final int listViewStyle = 16842868; // 0x1010074

core/res/res/layout/activity_list_item.xml

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

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:paddingLeft="6dip" />

        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" />

</LinearLayout>

core/res/res/layout/activity_list_item_2.xml

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

    android:layout_height="wrap_content"

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

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

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

    android:gravity="center_vertical"

    android:drawablePadding="14dip"

    android:paddingLeft="16dip"

core/res/res/layout/resolve_list_item.xml

+6 −6
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    android:minHeight="?android:attr/listPreferredItemHeight"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:paddingLeft="10dip"

    android:paddingRight="15dip">

    android:paddingLeft="16dip"

    android:paddingRight="16dip">



    <!-- Activity icon when presenting dialog -->

    <ImageView android:id="@+id/icon"
@@ -39,18 +39,18 @@ 
        android:layout_height="wrap_content" >

        <!-- Activity name -->

        <TextView android:id="@android:id/text1"

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

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxLines="2"

            android:paddingLeft="10dip" />

            android:paddingLeft="16dip" />

        <!-- Extended activity info to distinguish between duplicate activity names -->

        <TextView android:id="@android:id/text2"

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

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxLines="2"

            android:paddingLeft="10dip" />

            android:paddingLeft="16dip" />

    </LinearLayout>

</LinearLayout>

core/res/res/layout/simple_list_item_1.xml

+4 −4
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
    android:id="@android:id/text1"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

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

    android:gravity="center_vertical"

    android:paddingLeft="8dip"

    android:paddingRight="8dip"

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

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

    android:paddingRight="?android:attr/listPreferredItemPaddingRight"

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

/>