Header redline mods. (a2c1a0eb) · Commits · e / os / android_frameworks_base

core/res/res/layout/tmobile_header_personal_panel.xml

+56 −57

Original line number	Diff line number	Diff line
		@@ -3,28 +3,25 @@
		xmlns:android="http://schemas.android.com/apk/res/android">

		<FrameLayout
		android:paddingRight="5sp"
		android:paddingRight="8dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">

		<ImageView
		android:id="@+id/headerIcon"
		android:layout_width="fill_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:scaleType="center"
		style="@android:style/HeaderSecondaryIcon" />
		android:scaleType="center" />

		<ImageView
		android:id="@+id/header2Icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom\|right"
		android:paddingBottom="3sp"
		style="@android:style/HeaderSecondaryIcon" />
		android:layout_margin="3dp" />
		</FrameLayout>

		<LinearLayout
		android:paddingLeft="5sp"
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:id="@+id/innerLayout1"
		@@ -33,7 +30,8 @@
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceLabelHeader"
		android:textAppearance="?android:attr/textAppearanceLabelPersonalHeader"
		android:singleLine="true"
		android:id="@+id/headerId" />

		<LinearLayout
		@@ -46,12 +44,13 @@
		android:id="@+id/header3Icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/HeaderSecondaryIcon" />
		android:paddingRight="6dp" />

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceLabelSubHeader"
		android:textAppearance="?android:attr/textAppearanceLabelPersonalSubHeader"
		android:singleLine="true"
		android:id="@+id/subHeaderId1" />

		</LinearLayout>

core/res/res/layout/tmobile_header_product_panel.xml

+100 −103

Original line number	Diff line number	Diff line
		@@ -2,109 +2,106 @@
		<merge
		xmlns:android="http://schemas.android.com/apk/res/android">

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="wrap_content">

		<ImageView
		android:layout_width="80dp"
		android:layout_height="80dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/headerIcon"
		android:layout_gravity="top"
		android:paddingTop="8dp" />
		android:paddingRight="8dp" />

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		android:paddingRight="10dp"
		android:orientation="vertical"
		android:id="@+id/innerLayout1">
		android:orientation="vertical">

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal">
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLabelHeader"
		android:id="@+id/headerId" />

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLabelSubHeader"
		android:id="@+id/subHeaderId1" />
		android:id="@+id/subLabel" />

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceLabelSubHeader"
		android:id="@+id/subHeaderId2" />
		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		android:paddingTop="0dp"
		android:paddingBottom="0dp"
		android:paddingRight="10dp"
		android:id="@+id/innerLayout2"
		android:orientation="vertical"
		android:layout_gravity="top\|right">

		android:orientation="horizontal">
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLabelSubHeader"
		android:layout_gravity="right"
		android:id="@+id/subLabel" />
		android:id="@+id/subHeaderId1" />

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingTop="0dp"
		android:paddingBottom="8dp"
		android:layout_gravity="right"
		android:id="@+id/innerLayout3">
		android:orientation="horizontal">

		<ImageView
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:id="@+id/starIcon"
		style="@android:style/HeaderSecondaryThreeIcon" />
		android:layout_marginRight="6dp"
		android:id="@+id/starIcon" />

		<ImageView
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:id="@+id/star2Icon"
		style="@android:style/HeaderSecondaryThreeIcon" />
		android:layout_marginRight="6dp"
		android:id="@+id/star2Icon" />

		<ImageView
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:id="@+id/star3Icon"
		style="@android:style/HeaderSecondaryThreeIcon" />
		android:layout_marginRight="6dp"
		android:id="@+id/star3Icon" />

		<ImageView
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:id="@+id/star4Icon"
		style="@android:style/HeaderSecondaryThreeIcon" />
		android:layout_marginRight="6dp"
		android:id="@+id/star4Icon" />

		<ImageView
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:id="@+id/star5Icon"
		style="@android:style/HeaderSecondaryThreeIcon" />
		android:id="@+id/star5Icon" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal">
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLabelSubHeader"
		android:id="@+id/subHeaderId2" />

		<Button
		android:layout_width="120dp"
		android:layout_width="@android:dimen/header_button_width"
		android:layout_height="@android:dimen/header_button_height"
		android:layout_gravity="right"
		android:id="@+id/button1" />

		</LinearLayout>

		</LinearLayout>

		</merge>

		No newline at end of file

core/res/res/layout/tmobile_header_secondary_large_icon.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		xmlns:android="http://schemas.android.com/apk/res/android">

		<FrameLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:paddingRight="8dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		@@ -23,7 +22,6 @@
		</FrameLayout>

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:id="@+id/innerLayout"

core/res/res/values/attrs.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -382,6 +382,8 @@
		<attr name="textAppearanceLabel" format="reference" />
		<attr name="textAppearanceLabelHeader" format="reference" />
		<attr name="textAppearanceLabelSubHeader" format="reference" />
		<attr name="textAppearanceLabelPersonalHeader" format="reference" />
		<attr name="textAppearanceLabelPersonalSubHeader" format="reference" />
		<attr name="textAppearanceLabelListItem" format="reference" />
		<attr name="textAppearanceLabelListItemText" format="reference" />
		<attr name="textAppearanceLabelListItemSecondaryText" format="reference" />

core/res/res/values/styles.xml

+8 −13

Original line number	Diff line number	Diff line
		@@ -829,6 +829,14 @@
		<item name="android:textColor">?textColorPrimaryInverse</item>
		<item name="android:textSize">14sp</item>
		</style>
		<style name="TextAppearance.Label.PersonalHeader">
		<item name="android:textColor">?textColorPrimaryInverse</item>
		<item name="android:textSize">18sp</item>
		<item name="android:textStyle">bold</item>
		</style>
		<style name="TextAppearance.Label.PersonalSubHeader">
		<item name="android:textColor">?textColorPrimaryInverse</item>
		</style>
		<style name="TextAppearance.Label.ListItem">
		<item name="android:textStyle">bold</item>
		</style>
		@@ -839,19 +847,6 @@
		<item name="android:textSize">13sp</item>
		</style>

		<style name="HeaderSecondaryIcon">
		<item name="android:textAppearance">?android:attr/textAppearanceLabelSubHeader</item>
		<item name="android:paddingRight">3dp</item>
		<item name="android:gravity">top</item>
		<item name="android:paddingTop">4dp</item>
		</style>
		<style name="HeaderSecondaryThreeIcon">
		<item name="android:textAppearance">?android:attr/textAppearanceLabelSubHeader</item>
		<item name="android:paddingLeft">3dp</item>
		<item name="android:paddingRight">3dp</item>
		<item name="android:gravity">top</item>
		<item name="android:paddingTop">8dp</item>
		</style>
		<style name="ListItemIcon">
		<item name="android:gravity">center_vertical</item>
		</style>