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

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

Pulled HeaderLayout style and added its attribute to dimens.

parent c979349c

core/res/res/layout/tmobile_header_button.xml

+10 −8
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:paddingRight="10dp"

		android:layout_weight="1.0"

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

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



	<Button android:layout_width="wrap_content"

		android:layout_height="wrap_content" 

		style="@android:style/HeaderButton"

	<Button

		android:layout_width="wrap_content"

		android:layout_height="@android:dimen/header_button_height"

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

</merge>

core/res/res/layout/tmobile_header_product_panel.xml

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ 


            <Button

                android:layout_width="120dp"

                android:layout_height="wrap_content"

                style="@android:style/HeaderButton"

				android:layout_height="@android:dimen/header_button_height"

                android:layout_gravity="right"

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

core/res/res/layout/tmobile_header_subheader_icon_button.xml

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
		</LinearLayout>



		<Button android:layout_width="wrap_content"

			android:layout_height="wrap_content" 

			style="@android:style/HeaderButton"

			android:layout_height="@android:dimen/header_button_height"

			android:layout_gravity="center_vertical" 

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

	</LinearLayout>

core/res/res/layout/tmobile_header_twin_button.xml

+17 −20
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:layout_weight="1.0"

		android:paddingRight="10dp"

		android:paddingRight="8dp"

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

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



		<Button android:layout_width="wrap_content"

			android:layout_height="wrap_content" 

			android:paddingLeft="3dp"

			android:paddingRight="3dp"

	<Button

		android:layout_width="wrap_content"

		android:layout_height="@android:dimen/header_button_height"

		style="?android:attr/buttonStyleSplitLeft"

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

		<!-- <ImageView android:layout_width="wrap_content"

			android:layout_height="wrap_content"

			android:src="@drawable/pluto_splitbutton_seperator"/> -->

		<Button android:layout_width="wrap_content"

			android:layout_height="wrap_content" 

			android:paddingLeft="3dp"

			android:paddingRight="3dp"

	<Button

		android:layout_width="wrap_content"

		android:layout_height="@android:dimen/header_button_height"

		style="?android:attr/buttonStyleSplitRight"

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

</merge>

core/res/res/layout/tmobile_section_header_button.xml

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
		android:id="@+id/headerId" />



	<Button android:layout_width="wrap_content"

		android:layout_height="wrap_content" 

		style="@android:style/HeaderButton"

		android:layout_height="@android:dimen/header_button_height"

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

</merge>