am 2e08d604: am 63b3332f: Merge "Update nav bar icons." into mnc-dev (8cde8a67) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_100.png

deleted100644 → 0

−19.3 KiB

Loading image diff...

deleted100644 → 0

−18.9 KiB

Loading image diff...

+18 −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">
		<TextView
		<View
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"/>
		android:layout_height="wrap_content"/>
		<ImageView
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"/>
		<ImageView
		android:layout_width="wrap_content"
		android:scaleType="centerInside"/>
		<View
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"/>
		android:layout_width="wrap_content"
		android:layout_weight="1"/>
		<ImageView
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"/>
		<TextView
		android:layout_width="wrap_content"
		android:scaleType="centerInside"/>
		<View
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_weight="1"/>
		<ImageView
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:scaleType="centerInside"/>
		<View
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>
		</merge>

−1.42 KiB (1.49 KiB)

Loading image diff...

−1.72 KiB (1.85 KiB)

Loading image diff...