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

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

Header redline mods.

parent 10ee6941

core/res/res/layout/tmobile_header_secondary_icon.xml

+22 −13
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"

	<TextView

		android:layout_width="wrap_content"

		android:layout_height="wrap_content"

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

		android:singleLine="true"

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



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

	<LinearLayout

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

		android:orientation="horizontal"

		android:gravity="top"

		android:layout_width="wrap_content"

		android:id="@+id/innerLayout"

		android:layout_height="wrap_content">



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

		<ImageView

			android:id="@+id/headerIcon"

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

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

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

			android:paddingRight="6dp" />



		<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_secondary_large_icon.xml

+28 −26
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">



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

	    android:paddingRight="5sp"

	<FrameLayout

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

		android:paddingRight="8dp"

		android:layout_width="wrap_content"

		android:layout_height="wrap_content">



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

			android:layout_width="fill_parent" 

		<ImageView

			android:id="@+id/headerIcon"

			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"

		<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>

			<!--android:layout_marginBottom="0dip" android:padding="40dip"-->





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

	    android:paddingLeft="5sp"

	<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_secondary_three_icon.xml

+35 −38
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">



	<LinearLayout 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:gravity="left" 

		android:id="@+id/innerLayout"

		>



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

			android:orientation="vertical" 

			android:layout_width="wrap_content"

		android:layout_width="fill_parent"

		android:gravity="left"

		android:id="@+id/innerLayout"

			android:layout_weight="1.0"

		android:layout_height="wrap_content">

			<TextView android:layout_width="wrap_content"

		<TextView

			android:layout_width="wrap_content"

			android:gravity="left"

			android:layout_height="wrap_content"

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

			android:singleLine="true"

			android:layout_weight="1.0"

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



			<TextView android:layout_width="wrap_content"

				android:gravity="left" 

		<ImageView

			android:id="@+id/headerIcon"

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

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

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

		</LinearLayout>

			android:paddingLeft="8dp"

			android:paddingRight="6dp" />



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

		<ImageView

			android:id="@+id/header2Icon"

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

			style="@android:style/HeaderSecondaryThreeIcon" 

			/>

			android:paddingRight="6dp" />



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

		<ImageView

			android:id="@+id/header3Icon"

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

			style="@android:style/HeaderSecondaryThreeIcon" 

			/>

			android:layout_height="wrap_content" />

	</LinearLayout>



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

	<TextView

		android:layout_width="wrap_content"

		android:gravity="left"

		android:layout_height="wrap_content"

			style="@android:style/HeaderSecondaryThreeIcon" 

			/>

	</LinearLayout>

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

		android:singleLine="true"

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

</merge>

core/res/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ 
	</style>

	

	<style name="Widget.HeaderLayout.HeaderSecondaryThreeIcon">

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

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

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

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

	</style>