Merge "Update the UI for battery header" into oc-dr1-dev (923f50fc) · Commits · e / os / android_packages_apps_Settings

res/layout/battery_header.xml

+8 −9

Original line number	Diff line number	Diff line
		@@ -28,15 +28,15 @@
		style="@style/EntityHeader">

		<LinearLayout
		android:layout_width="216dp"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="48dp"
		android:layout_marginEnd="12dp"
		android:layout_weight="1"
		android:layout_marginStart="56dp"
		android:orientation="vertical">

		<TextView
		android:id="@+id/battery_percent"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="12dp"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		@@ -44,14 +44,14 @@

		<TextView
		android:id="@+id/summary1"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="12dp"
		android:layout_marginTop="8dp"
		android:textAppearance="@android:style/TextAppearance.Material.Small"/>

		<TextView
		android:id="@+id/summary2"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="@android:style/TextAppearance.Material.Small"/>

		@@ -61,7 +61,6 @@
		android:id="@+id/battery_header_icon"
		android:layout_width="@dimen/battery_meter_width"
		android:layout_height="@dimen/battery_meter_height"
		android:layout_gravity="end"
		android:layout_marginEnd="24dp"/>
		android:layout_marginEnd="16dp"/>

		</LinearLayout>
		No newline at end of file