PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issues #16941902, #16901402, and #16135174." into lmp-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2014-08-27 23:35:04 +00:00
committed by Android (Google) Code Review
parent ebcce2088a be300225df
commit 6d1297ed1a
4 changed files with 134 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/manage_applications_item.xml
View File

@@ -44,7 +44,7 @@
android:layout_marginTop="2dip" android:layout_marginTop="2dip"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
<CheckBox android:id="@+id/app_on_sdcard" <CheckBox android:id="@+id/app_on_sdcard"
@@ -59,13 +59,15 @@
android:id="@+id/app_size" android:id="@+id/app_size"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_gravity="fill_horizontal|top" 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" /> android:textAlignment="viewStart" />
<TextView <TextView
android:id="@+id/app_disabled" android:id="@+id/app_disabled"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:layout_gravity="top" android:layout_gravity="top"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
</GridLayout> </GridLayout>

88
res/layout/running_processes_header.xml
View File

@@ -27,38 +27,43 @@
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="48sp"
android:layout_marginTop="8dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="@android:style/TextAppearance.Material.Body2"
android:textColor="?android:attr/colorAccent"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:gravity="left|center_vertical"
android:text="@string/running_processes_header_title" /> android:text="@string/running_processes_header_title" />
<view class="com.android.settings.applications.LinearColorBar" <view class="com.android.settings.applications.LinearColorBar"
android:id="@+id/color_bar" android:id="@+id/color_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="18sp" android:layout_height="16sp"
android:layout_marginTop="8dp"
android:orientation="horizontal" /> android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="32sp"
android:layout_marginTop="8dp" android:layout_marginTop="8sp"
android:orientation="horizontal" android:orientation="horizontal">
android:baselineAligned="true">
<ImageView <ImageView
android:layout_width="16sp" android:layout_width="16sp"
android:layout_height="16sp" android:layout_height="16sp"
android:layout_gravity="center"
android:scaleType="centerInside" android:scaleType="centerInside"
android:baselineAlignBottom="true"
android:src="@color/running_processes_system_ram" android:src="@color/running_processes_system_ram"
android:contentDescription="@null" /> android:contentDescription="@null" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/systemSizePrefix" android:id="@+id/systemSizePrefix"
android:text="@string/running_processes_header_system_prefix" 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_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
@@ -75,34 +80,39 @@
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView <TextView
android:id="@+id/systemSize" 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_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:maxLines="1" /> android:maxLines="1" />
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="32sp"
android:layout_marginTop="4dp" android:orientation="horizontal">
android:orientation="horizontal"
android:baselineAligned="true">
<ImageView <ImageView
android:layout_width="16sp" android:layout_width="16sp"
android:layout_height="16sp" android:layout_height="16sp"
android:baselineAlignBottom="true" android:layout_gravity="center"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@color/running_processes_apps_ram" android:src="@color/running_processes_apps_ram"
android:contentDescription="@null" /> android:contentDescription="@null" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/appsSizePrefix" android:id="@+id/appsSizePrefix"
android:text="@string/running_processes_header_apps_prefix" 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_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:maxLines="1" android:maxLines="1" />
android:paddingTop="6dip" />
<ImageView <ImageView
android:src="@drawable/dotted_line_480px" android:src="@drawable/dotted_line_480px"
android:layout_width="0dip" android:layout_width="0dip"
@@ -115,35 +125,39 @@
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView <TextView
android:id="@+id/appsSize" android:id="@+id/appsSize"
android:paddingTop="6dip" android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:maxLines="1" /> android:maxLines="1" />
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="32sp"
android:layout_marginTop="4dp" android:orientation="horizontal">
android:orientation="horizontal"
android:baselineAligned="true">
<ImageView <ImageView
android:layout_width="16sp" android:layout_width="16sp"
android:layout_height="16sp" android:layout_height="16sp"
android:baselineAlignBottom="true" android:layout_gravity="center"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@color/running_processes_free_ram" android:src="@color/running_processes_free_ram"
android:contentDescription="@null" /> android:contentDescription="@null" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/freeSizePrefix" android:id="@+id/freeSizePrefix"
android:text="@string/running_processes_header_free_prefix" 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_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:maxLines="1" android:maxLines="1" />
android:paddingTop="6dip" />
<ImageView <ImageView
android:src="@drawable/dotted_line_480px" android:src="@drawable/dotted_line_480px"
android:layout_width="0dip" android:layout_width="0dip"
@@ -156,23 +170,25 @@
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView <TextView
android:id="@+id/freeSize" android:id="@+id/freeSize"
android:paddingTop="6dip" android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:maxLines="1" /> android:maxLines="1" />
</LinearLayout> </LinearLayout>
</LinearLayout>
<TextView <TextView
android:id="@+id/listHeader" android:id="@+id/listHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="48dp"
android:layout_marginTop="16dp" android:layout_marginTop="8sp"
android:layout_marginBottom="16dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="@android:style/TextAppearance.Material.Body2"
android:textColor="?android:attr/colorAccent"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:gravity="left|center_vertical"
android:text="@string/running_processes_header_footer" /> android:text="@string/running_processes_header_footer" />
</LinearLayout> </LinearLayout>

11
res/layout/running_processes_item.xml
View File

@@ -48,7 +48,7 @@
android:layout_weight="1" android:layout_weight="1"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
<TextView <TextView
@@ -56,7 +56,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
@@ -69,7 +70,8 @@
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
<TextView <TextView
@@ -77,7 +79,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>

11
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -112,6 +112,12 @@ public class PowerUsageSummary extends PreferenceFragment {
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@Override
public void onStart() {
super.onStart();
mStatsHelper.clearStats();
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@@ -250,7 +256,8 @@ public class PowerUsageSummary extends PreferenceFragment {
mAppListGroup.addPreference(mHistPref); mAppListGroup.addPreference(mHistPref);
boolean addedSome = false; 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); final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP) { if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP) {
final List<UserHandle> profiles = mUm.getUserProfiles(); final List<UserHandle> profiles = mUm.getUserProfiles();
@@ -259,7 +266,7 @@ public class PowerUsageSummary extends PreferenceFragment {
final List<BatterySipper> usageList = mStatsHelper.getUsageList(); 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(); final int numSippers = usageList.size();
for (int i = 0; i < numSippers; i++) { for (int i = 0; i < numSippers; i++) {
final BatterySipper sipper = usageList.get(i); final BatterySipper sipper = usageList.get(i);