Merge "Fix issues #16941902, #16901402, and #16135174." into lmp-dev (6d1297ed) · Commits · e / os / android_packages_apps_Settings

res/layout/manage_applications_item.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		android:layout_marginTop="2dip"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead"
		android:textAlignment="viewStart" />

		<CheckBox android:id="@+id/app_on_sdcard"
		@@ -59,13 +59,15 @@
		android:id="@+id/app_size"
		android:layout_width="0dip"
		android:layout_gravity="fill_horizontal\|top"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:textAlignment="viewStart" />

		<TextView
		android:id="@+id/app_disabled"
		android:layout_marginStart="8dip"
		android:layout_gravity="top"
		android:textAppearance="?android:attr/textAppearanceSmall" />
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />

		</GridLayout>

res/layout/running_processes_header.xml

+113 −97

Original line number	Diff line number	Diff line
		@@ -27,38 +27,43 @@
		<TextView
		android:id="@+id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:layout_height="48sp"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body2"
		android:textColor="?android:attr/colorAccent"
		android:textAlignment="viewStart"
		android:gravity="left\|center_vertical"
		android:text="@string/running_processes_header_title" />

		<view class="com.android.settings.applications.LinearColorBar"
		android:id="@+id/color_bar"
		android:layout_width="match_parent"
		android:layout_height="18sp"
		android:layout_marginTop="8dp"
		android:layout_height="16sp"
		android:orientation="horizontal" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:orientation="horizontal"
		android:baselineAligned="true">
		android:layout_height="32sp"
		android:layout_marginTop="8sp"
		android:orientation="horizontal">
		<ImageView
		android:layout_width="16sp"
		android:layout_height="16sp"
		android:layout_gravity="center"
		android:scaleType="centerInside"
		android:baselineAlignBottom="true"
		android:src="@color/running_processes_system_ram"
		android:contentDescription="@null" />
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:orientation="horizontal">
		<TextView
		android:id="@+id/systemSizePrefix"
		android:text="@string/running_processes_header_system_prefix"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_marginLeft="16dp"
		@@ -75,34 +80,39 @@
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/systemSize"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="4dp"
		android:orientation="horizontal"
		android:baselineAligned="true">
		android:layout_height="32sp"
		android:orientation="horizontal">
		<ImageView
		android:layout_width="16sp"
		android:layout_height="16sp"
		android:baselineAlignBottom="true"
		android:layout_gravity="center"
		android:scaleType="centerInside"
		android:src="@color/running_processes_apps_ram"
		android:contentDescription="@null" />
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:orientation="horizontal">
		<TextView
		android:id="@+id/appsSizePrefix"
		android:text="@string/running_processes_header_apps_prefix"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_marginLeft="16dp"
		android:maxLines="1"
		android:paddingTop="6dip" />
		android:maxLines="1" />
		<ImageView
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		@@ -115,35 +125,39 @@
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/appsSize"
		android:paddingTop="6dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="4dp"
		android:orientation="horizontal"
		android:baselineAligned="true">
		android:layout_height="32sp"
		android:orientation="horizontal">
		<ImageView
		android:layout_width="16sp"
		android:layout_height="16sp"
		android:baselineAlignBottom="true"
		android:layout_gravity="center"
		android:scaleType="centerInside"
		android:src="@color/running_processes_free_ram"
		android:contentDescription="@null" />
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:orientation="horizontal">
		<TextView
		android:id="@+id/freeSizePrefix"
		android:text="@string/running_processes_header_free_prefix"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_marginLeft="16dp"
		android:maxLines="1"
		android:paddingTop="6dip" />
		android:maxLines="1" />
		<ImageView
		android:src="@drawable/dotted_line_480px"
		android:layout_width="0dip"
		@@ -156,23 +170,25 @@
		android:contentDescription="@null" />
		<TextView
		android:id="@+id/freeSize"
		android:paddingTop="6dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:maxLines="1" />
		</LinearLayout>
		</LinearLayout>

		<TextView
		android:id="@+id/listHeader"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="16dp"
		android:layout_marginBottom="16dp"
		android:layout_height="48dp"
		android:layout_marginTop="8sp"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Body2"
		android:textColor="?android:attr/colorAccent"
		android:textAlignment="viewStart"
		android:gravity="left\|center_vertical"
		android:text="@string/running_processes_header_footer" />

		</LinearLayout>

res/layout/running_processes_item.xml

+7 −4

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@
		android:layout_weight="1"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead"
		android:textAlignment="viewStart" />

		<TextView
		@@ -56,7 +56,8 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="8dip"
		android:textAppearance="?android:attr/textAppearanceSmall" />
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />

		</LinearLayout>

		@@ -69,7 +70,8 @@
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:textAlignment="viewStart" />

		<TextView
		@@ -77,7 +79,8 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="8dip"
		android:textAppearance="?android:attr/textAppearanceSmall" />
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />

		</LinearLayout>

src/com/android/settings/fuelgauge/PowerUsageSummary.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -112,6 +112,12 @@ public class PowerUsageSummary extends PreferenceFragment {
		setHasOptionsMenu(true);
		}

		@Override
		public void onStart() {
		super.onStart();
		mStatsHelper.clearStats();
		}

		@Override
		public void onResume() {
		super.onResume();
		@@ -250,7 +256,8 @@ public class PowerUsageSummary extends PreferenceFragment {
		mAppListGroup.addPreference(mHistPref);
		boolean addedSome = false;

		PowerProfile powerProfile = mStatsHelper.getPowerProfile();
		final PowerProfile powerProfile = mStatsHelper.getPowerProfile();
		final BatteryStats stats = mStatsHelper.getStats();
		final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
		if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP) {
		final List<UserHandle> profiles = mUm.getUserProfiles();
		@@ -259,7 +266,7 @@ public class PowerUsageSummary extends PreferenceFragment {

		final List<BatterySipper> usageList = mStatsHelper.getUsageList();

		final int dischargeAmount = mStatsHelper.getStats().getDischargeAmount(mStatsType);
		final int dischargeAmount = stats != null ? stats.getDischargeAmount(mStatsType) : 0;
		final int numSippers = usageList.size();
		for (int i = 0; i < numSippers; i++) {
		final BatterySipper sipper = usageList.get(i);