Merge "Fix tethering re-enable after edit." into nyc-dev
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index b6eedc3..b15794e 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -38,7 +38,9 @@
}
public void setStorageSize(long size, long total) {
- setSummary(Formatter.formatFileSize(getContext(), size));
+ setSummary(size == 0
+ ? String.valueOf(0)
+ : Formatter.formatFileSize(getContext(), size));
if (total == 0) {
progress = 0;
} else {
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index b0bf4b4..9371a19 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -35,7 +35,7 @@
private final int mIconSize;
private BatteryEntry mInfo;
- private final CharSequence mContentDescription;
+ private CharSequence mContentDescription;
private CharSequence mProgress;
public PowerGaugePreference(Context context, Drawable icon, CharSequence contentDescription,
@@ -48,6 +48,11 @@
mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
}
+ public void setContentDescription(String name) {
+ mContentDescription = name;
+ notifyChanged();
+ }
+
public void setPercent(double percentOfMax, double percentOfTotal) {
mProgress = Utils.formatPercentage((int) (percentOfTotal + 0.5));
notifyChanged();
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 78f9833..443b480 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -432,6 +432,9 @@
final UserHandle userHandle = new UserHandle(userId);
pgp.setIcon(mUm.getBadgedIconForUser(entry.getIcon(), userHandle));
pgp.setTitle(entry.name);
+ if (entry.sipper.drainType == DrainType.APP) {
+ pgp.setContentDescription(entry.name);
+ }
}
break;
case BatteryEntry.MSG_REPORT_FULLY_DRAWN: