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

Commit 0e49b074 authored by Scott Hancher's avatar Scott Hancher Committed by Josh Guilfoyle
Browse files

Sync list items with redlines.

parent 9b49b32a

core/res/res/layout/tmobile_list_item_twin_label_text.xml

+34 −31
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
	<TextView

		android:layout_width="fill_parent"

		android:layout_height="wrap_content"

        android:paddingRight="10dp"

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

		android:singleLine="true"

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

		android:id="@+id/itemLabelText" />



	<LinearLayout
@@ -17,20 +17,23 @@ 
		<TextView

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

            android:paddingRight="10dp"

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

			android:singleLine="true"

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

			android:id="@+id/itemLabel2Text" />



        <ImageView android:layout_width="wrap_content"

		<ImageView

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

			android:layout_marginLeft="8dp"

			android:layout_marginRight="8dp"

			android:layout_gravity="center_vertical"

			android:gravity="center_vertical"

			android:src="@drawable/reticle" />



		<TextView

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

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

			android:singleLine="true"

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

			android:id="@+id/itemText" />

	</LinearLayout>

</merge>

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -388,7 +388,9 @@ 
		<attr name="textAppearanceLabelPersonalHeader" format="reference" />

		<attr name="textAppearanceLabelPersonalSubHeader" format="reference" />

		<attr name="textAppearanceLabelListItem" format="reference" />

		<attr name="textAppearanceLabelListItemLarge" format="reference" />

		<attr name="textAppearanceLabelListItemText" format="reference" />

		<attr name="textAppearanceLabelListItemTextSmall" format="reference" />

		<attr name="textAppearanceLabelListItemSecondaryText" format="reference" />



		<attr name="headerLayoutBackground" format="reference" />

core/res/res/values/styles.xml

+7 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ 
        <item name="android:gravity">left|center_vertical</item>

    </style>

    <style name="Widget.ListItemLayout.ItemTwinLabelText" >

        <item name="android:minHeight">80dp</item>

        <item name="android:minHeight">70dp</item>

        <item name="android:orientation">vertical</item>

        <item name="android:gravity">left|center_vertical</item>

    </style>
@@ -847,8 +847,14 @@ 
        <item name="android:textSize">14sp</item>

        <item name="android:textStyle">bold</item>

    </style>

    <style name="TextAppearance.Label.ListItemLarge">

        <item name="android:textStyle">bold</item>

    </style>

    <style name="TextAppearance.Label.ListItemText">

    </style>

    <style name="TextAppearance.Label.ListItemTextSmall">

        <item name="android:textSize">14sp</item>

    </style>

    <style name="TextAppearance.Label.ListItemSecondaryText">

        <item name="android:textSize">13sp</item>

    </style>

core/res/res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -174,7 +174,9 @@ 
		<item name="textAppearanceLabelPersonalHeader">@android:style/TextAppearance.Label.PersonalHeader</item>

		<item name="textAppearanceLabelPersonalSubHeader">@android:style/TextAppearance.Label.PersonalSubHeader</item>

		<item name="textAppearanceLabelListItem">@android:style/TextAppearance.Label.ListItem</item>

		<item name="textAppearanceLabelListItemLarge">@android:style/TextAppearance.Label.ListItemLarge</item>

		<item name="textAppearanceLabelListItemText">@android:style/TextAppearance.Label.ListItemText</item>

		<item name="textAppearanceLabelListItemTextSmall">@android:style/TextAppearance.Label.ListItemTextSmall</item>

		<item name="textAppearanceLabelListItemSecondaryText">@android:style/TextAppearance.Label.ListItemSecondaryText</item>



		<item name="headerLayoutBackground">@color/black</item>