import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settingslib.graph.BatteryMeterDrawableBase;
+import com.android.settingslib.graph.ThemedBatteryDrawable;
public class BatteryMeterView extends ImageView {
@VisibleForTesting
final int frameColor = context.getColor(R.color.meter_background_color);
mAccentColorFilter = new PorterDuffColorFilter(
Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent),
- PorterDuff.Mode.SRC_IN);
+ PorterDuff.Mode.SRC);
mErrorColorFilter = new PorterDuffColorFilter(
context.getColor(R.color.battery_icon_color_error), PorterDuff.Mode.SRC_IN);
mDrawable = new BatteryMeterDrawable(context, frameColor);
- mDrawable.setShowPercent(false);
- mDrawable.setBatteryColorFilter(mAccentColorFilter);
- mDrawable.setWarningColorFilter(
- new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN));
+ mDrawable.setColorFilter(mAccentColorFilter);
setImageDrawable(mDrawable);
+ setLayerType(LAYER_TYPE_SOFTWARE, null);
}
public void setBatteryLevel(int level) {
mDrawable.setBatteryLevel(level);
if (level < mDrawable.getCriticalLevel()) {
- mDrawable.setBatteryColorFilter(mErrorColorFilter);
+ mDrawable.setColorFilter(mErrorColorFilter);
} else {
- mDrawable.setBatteryColorFilter(mAccentColorFilter);
+ mDrawable.setColorFilter(mAccentColorFilter);
}
}
public void setPowerSave(boolean powerSave) {
- mDrawable.setPowerSave(powerSave);
+ mDrawable.setPowerSaveEnabled(powerSave);
mPowerSaveEnabled = powerSave;
}
}
public int getBatteryLevel() {
- return mDrawable.getBatteryLevel();
+ return mDrawable.getLevel();
}
public void setCharging(boolean charging) {
return mDrawable.getCharging();
}
- public static class BatteryMeterDrawable extends BatteryMeterDrawableBase {
+ public static class BatteryMeterDrawable extends ThemedBatteryDrawable {
private final int mIntrinsicWidth;
private final int mIntrinsicHeight;
public int getIntrinsicHeight() {
return mIntrinsicHeight;
}
-
- public void setWarningColorFilter(@Nullable ColorFilter colorFilter) {
- mWarningTextPaint.setColorFilter(colorFilter);
- }
-
- public void setBatteryColorFilter(@Nullable ColorFilter colorFilter) {
- mFramePaint.setColorFilter(colorFilter);
- mBatteryPaint.setColorFilter(colorFilter);
- mBoltPaint.setColorFilter(colorFilter);
- }
}
-
}