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

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

Header redline mods.

parent da6d9613
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@
	<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingRight="10dp"
		android:layout_weight="1.0"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLabelHeader"
		android:id="@+id/headerId" />

	<Button
		android:layout_width="wrap_content"
		android:layout_width="@android:dimen/header_button_width"
		android:layout_height="@android:dimen/header_button_height"
		android:paddingLeft="8dp"
		android:id="@+id/button1" />
</merge>
+28 −22
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
		android:orientation="horizontal"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		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" />
			android:paddingRight="8dp" />

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<LinearLayout
			android:orientation="vertical"
			android:layout_width="wrap_content"
			android:id="@+id/innerLayout"
			android:layout_weight="1.0"
			android:paddingRight="10dp"
			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>

		<Button android:layout_width="wrap_content"
	</LinearLayout>
	<Button
		android:layout_width="@android:dimen/header_button_width"
		android:layout_height="@android:dimen/header_button_height"
			android:layout_gravity="center_vertical" 
		android:paddingLeft="8dp"
		android:id="@+id/button1" />
	</LinearLayout>
</merge>
	
 No newline at end of file
+4 −3
Original line number Diff line number Diff line
@@ -6,17 +6,18 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		android:paddingRight="8dp"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLabelHeader"
		android:id="@+id/headerId" />

	<Button
		android:layout_width="wrap_content"
		android:layout_width="@android:dimen/header_split_button_width"
		android:layout_height="@android:dimen/header_button_height"
		android:paddingLeft="8dp"
		style="?android:attr/buttonStyleSplitLeft"
		android:id="@+id/button1" />
	<Button
		android:layout_width="wrap_content"
		android:layout_width="@android:dimen/header_split_button_width"
		android:layout_height="@android:dimen/header_button_height"
		style="?android:attr/buttonStyleSplitRight"
		android:id="@+id/button2" />
+10 −7
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:gravity="left"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLabelHeader"
		android:id="@+id/headerId" />

	<Button android:layout_width="wrap_content"
	<Button
		android:layout_width="@android:dimen/header_button_width"
		android:layout_height="@android:dimen/header_button_height"
		android:paddingLeft="8dp"
		android:id="@+id/button1" />
</merge>
+2 −0
Original line number Diff line number Diff line
@@ -28,5 +28,7 @@
    <dimen name="toast_y_offset">64dip</dimen>
    <!-- Height of the status bar -->
    <dimen name="status_bar_height">25dip</dimen>
    <dimen name="header_split_button_width">81dp</dimen>
    <dimen name="header_button_width">84dp</dimen>
    <dimen name="header_button_height">30dp</dimen>
</resources>
Loading