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

Update color filter for battery saver mode

Browse Source 
Fixes: 129498556
Test: Manual
Change-Id: I57809c77e488b9828bea50d4c4f410d49912cd4b
This commit is contained in:
Lei Yu
2019-04-09 10:33:45 -07:00
parent 4b54ad9bd5
commit eba850e8d9
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/fuelgauge/BatteryMeterView.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.fuelgauge;
import android.annotation.Nullable;
import android.content.Context;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
@@ -38,7 +37,8 @@ public class BatteryMeterView extends ImageView {
ColorFilter mErrorColorFilter;
@VisibleForTesting
ColorFilter mAccentColorFilter;
private boolean mPowerSaveEnabled;
@VisibleForTesting
ColorFilter mForegroundColorFilter;
public BatteryMeterView(Context context) {
this(context, null, 0);
@@ -57,7 +57,9 @@ public class BatteryMeterView extends ImageView {
PorterDuff.Mode.SRC);
mErrorColorFilter = new PorterDuffColorFilter(
context.getColor(R.color.battery_icon_color_error), PorterDuff.Mode.SRC_IN);
mForegroundColorFilter =new PorterDuffColorFilter(
Utils.getColorAttrDefaultColor(context, android.R.attr.colorForeground),
PorterDuff.Mode.SRC);
mDrawable = new BatteryMeterDrawable(context, frameColor);
mDrawable.setColorFilter(mAccentColorFilter);
setImageDrawable(mDrawable);
@@ -65,20 +67,16 @@ public class BatteryMeterView extends ImageView {
public void setBatteryLevel(int level) {
mDrawable.setBatteryLevel(level);
if (level < mDrawable.getCriticalLevel()) {
mDrawable.setColorFilter(mErrorColorFilter);
} else {
mDrawable.setColorFilter(mAccentColorFilter);
}
updateColorFilter();
}
public void setPowerSave(boolean powerSave) {
mDrawable.setPowerSaveEnabled(powerSave);
mPowerSaveEnabled = powerSave;
updateColorFilter();
}
public boolean getPowerSave() {
return mPowerSaveEnabled;
return mDrawable.getPowerSaveEnabled();
}
public int getBatteryLevel() {
@@ -94,6 +92,18 @@ public class BatteryMeterView extends ImageView {
return mDrawable.getCharging();
}
private void updateColorFilter() {
final boolean powerSaveEnabled = mDrawable.getPowerSaveEnabled();
final int level = mDrawable.getBatteryLevel();
if (powerSaveEnabled) {
mDrawable.setColorFilter(mForegroundColorFilter);
} else if (level < mDrawable.getCriticalLevel()) {
mDrawable.setColorFilter(mErrorColorFilter);
} else {
mDrawable.setColorFilter(mAccentColorFilter);
}
}
public static class BatteryMeterDrawable extends ThemedBatteryDrawable {
private final int mIntrinsicWidth;
private final int mIntrinsicHeight;

4
tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
View File

@@ -43,6 +43,8 @@ public class BatteryMeterViewTest {
private ColorFilter mErrorColorFilter;
@Mock
private ColorFilter mAccentColorFilter;
@Mock
private ColorFilter mForegroundColorFilter;
private Context mContext;
private BatteryMeterView mBatteryMeterView;
private BatteryMeterView.BatteryMeterDrawable mDrawable;
@@ -58,6 +60,7 @@ public class BatteryMeterViewTest {
mBatteryMeterView.mDrawable = mDrawable;
mBatteryMeterView.mAccentColorFilter = mAccentColorFilter;
mBatteryMeterView.mErrorColorFilter = mErrorColorFilter;
mBatteryMeterView.mForegroundColorFilter = mForegroundColorFilter;
when(mDrawable.getCriticalLevel()).thenReturn(BATTERY_CRITICAL_LEVEL);
}
@@ -88,5 +91,6 @@ public class BatteryMeterViewTest {
mBatteryMeterView.setPowerSave(true);
assertThat(mBatteryMeterView.getPowerSave()).isEqualTo(true);
verify(mDrawable).setColorFilter(mForegroundColorFilter);
}
}