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

Merge "Update battery content descriptions with labels" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-06-22 13:22:45 +00:00
committed by Android (Google) Code Review
parent 87fcf9e95f d589bafc4a
commit 2a6b3d4db1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/fuelgauge/PowerGaugePreference.java
View File

@@ -35,7 +35,7 @@ public class PowerGaugePreference extends TintablePreference {
private final int mIconSize; private final int mIconSize;
private BatteryEntry mInfo; private BatteryEntry mInfo;
private final CharSequence mContentDescription; private CharSequence mContentDescription;
private CharSequence mProgress; private CharSequence mProgress;
public PowerGaugePreference(Context context, Drawable icon, CharSequence contentDescription, public PowerGaugePreference(Context context, Drawable icon, CharSequence contentDescription,
@@ -48,6 +48,11 @@ public class PowerGaugePreference extends TintablePreference {
mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size); mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
} }
public void setContentDescription(String name) {
mContentDescription = name;
notifyChanged();
}
public void setPercent(double percentOfMax, double percentOfTotal) { public void setPercent(double percentOfMax, double percentOfTotal) {
mProgress = Utils.formatPercentage((int) (percentOfTotal + 0.5)); mProgress = Utils.formatPercentage((int) (percentOfTotal + 0.5));
notifyChanged(); notifyChanged();

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

@@ -432,6 +432,9 @@ public class PowerUsageSummary extends PowerUsageBase {
final UserHandle userHandle = new UserHandle(userId); final UserHandle userHandle = new UserHandle(userId);
pgp.setIcon(mUm.getBadgedIconForUser(entry.getIcon(), userHandle)); pgp.setIcon(mUm.getBadgedIconForUser(entry.getIcon(), userHandle));
pgp.setTitle(entry.name); pgp.setTitle(entry.name);
if (entry.sipper.drainType == DrainType.APP) {
pgp.setContentDescription(entry.name);
}
} }
break; break;
case BatteryEntry.MSG_REPORT_FULLY_DRAWN: case BatteryEntry.MSG_REPORT_FULLY_DRAWN: