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

Commit 5292702c authored by Scott Hancher's avatar Scott Hancher Committed by Josh Guilfoyle
Browse files

More redline fixes.

parent 8fa34de3

core/res/res/layout/tmobile_header_icon.xml

+8 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<merge xmlns:android="http://schemas.android.com/apk/res/android">

<merge

	xmlns:android="http://schemas.android.com/apk/res/android">

	<ImageView

		android:id="@+id/headerIcon"

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

		style="@android:style/HeaderTextIcon"

		/>

		style="@android:style/HeaderTextIcon" />



	<TextView

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

		android:singleLine="true"

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

		android:id="@+id/headerId" 

		/>

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

</merge>
 
	
 No newline at end of file

core/res/res/layout/tmobile_header_subheader.xml

+8 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<merge xmlns:android="http://schemas.android.com/apk/res/android">

<merge

	xmlns:android="http://schemas.android.com/apk/res/android">

	<TextView

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

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

		android:singleLine="true"

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

	<TextView

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

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

		android:singleLine="true"

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

</merge>

core/res/res/layout/tmobile_header_subheader_icon.xml

+24 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

	<!--

		Header Label (bold, 22) with 1 Sub-header line <LinearLayout

		android:layout_width="fill_parent" android:layout_height="80sp"

		style="@style/HeaderLayout" >

	-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">



	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<merge

	xmlns:android="http://schemas.android.com/apk/res/android">



	<LinearLayout

		xmlns:android="http://schemas.android.com/apk/res/android"

		android:orientation="horizontal"

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

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



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

		<ImageView

			android:id="@+id/headerIcon"

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

			style="@android:style/HeaderTextIcon" 

			/>

			style="@android:style/HeaderTextIcon" />



		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

		<LinearLayout

			xmlns:android="http://schemas.android.com/apk/res/android"

			android:orientation="vertical"

			android:layout_width="wrap_content"

			android:id="@+id/innerLayout"

			android:layout_height="wrap_content">



			<TextView android:layout_width="wrap_content"

			<TextView

				android:layout_width="wrap_content"

				android:layout_height="wrap_content"

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

				android:singleLine="true"

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



			<TextView android:layout_width="wrap_content"

			<TextView

				android:layout_width="wrap_content"

				android:layout_height="wrap_content"

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

				android:singleLine="true"

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



		</LinearLayout>

core/res/res/layout/tmobile_header_twin_subheader.xml

+5 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<merge xmlns:android="http://schemas.android.com/apk/res/android">

<merge

	xmlns:android="http://schemas.android.com/apk/res/android">

	<TextView

		android:id="@+id/headerId"

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

		android:singleLine="true"

		android:textAppearance="?android:attr/textAppearanceLabelHeader" />

	<TextView

		android:id="@+id/subHeaderId1"

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

		android:singleLine="true"

		android:textAppearance="?android:attr/textAppearanceLabelSubHeader" />

	<TextView

		android:id="@+id/subHeaderId2"

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

		android:singleLine="true"

		android:textAppearance="?android:attr/textAppearanceLabelSubHeader" />

</merge>

core/res/res/layout/tmobile_header_twin_subheader_icon.xml

+29 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

	<!--

		Header Label (bold, 22) with 1 Sub-header line <LinearLayout

		android:layout_width="fill_parent" android:layout_height="80sp"

		style="@style/HeaderLayout" >

	-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">



	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<merge

	xmlns:android="http://schemas.android.com/apk/res/android">



	<LinearLayout

		xmlns:android="http://schemas.android.com/apk/res/android"

		android:orientation="horizontal"

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

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



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

		<ImageView

			android:id="@+id/headerIcon"

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

			style="@android:style/HeaderTextIcon" 

			/>

			style="@android:style/HeaderTextIcon" />



		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

		<LinearLayout

			xmlns:android="http://schemas.android.com/apk/res/android"

			android:orientation="vertical"

			android:layout_width="wrap_content"

			android:id="@+id/innerLayout"

			android:layout_height="wrap_content">



			<TextView android:layout_width="wrap_content"

			<TextView

				android:layout_width="wrap_content"

				android:layout_height="wrap_content"

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

				android:singleLine="true"

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



			<TextView android:layout_width="wrap_content"

			<TextView

				android:layout_width="wrap_content"

				android:layout_height="wrap_content"

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

				android:singleLine="true"

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



			<TextView android:layout_width="wrap_content"

			<TextView

				android:layout_width="wrap_content"

				android:layout_height="wrap_content"

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

				android:singleLine="true"

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

		</LinearLayout>