Revert "base: Use old battery percent on hideimage with newStatusBarIcons feature"
This reverts commit f7a798c41376ad35ac698b6c7395d003babcc0aa.
Seem not needed now and break the switch for the hide and show battery image and text
Change-Id: I2ab543406dced1a5afe694f09cb83c66f532234c
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
index 24747ad..f91b24b 100644
--- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
@@ -108,8 +108,6 @@
private BatteryDrawableState mUnifiedBatteryState =
BatteryDrawableState.Companion.getDefaultInitialState();
- private boolean mHideImage;
-
public BatteryMeterView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
@@ -321,7 +319,7 @@
return;
}
mPowerSaveEnabled = isPowerSave;
- if (!newStatusBarIcons() || isImageHidden()) {
+ if (!newStatusBarIcons()) {
mDrawable.setPowerSaveEnabled(isPowerSave);
} else {
setBatteryDrawableState(
@@ -419,7 +417,7 @@
}
void updatePercentText() {
- if (!newStatusBarIcons() || mHideImage) {
+ if (!newStatusBarIcons()) {
updatePercentTextLegacy();
return;
}
@@ -531,7 +529,7 @@
}
void updateShowPercent() {
- if (!newStatusBarIcons() || mHideImage) {
+ if (!newStatusBarIcons()) {
updateShowPercentLegacy();
return;
}
@@ -560,11 +558,10 @@
// The legacy impl used the percent view for the estimate and the percent text. The modern
// version only uses it for estimate. It can be safely removed here
- // Omni: Don't remove mBatteryPercentView for percent on lockscreen with hideImage
- /*if (mShowPercentMode != MODE_ESTIMATE) {
+ if (mShowPercentMode != MODE_ESTIMATE) {
removeView(mBatteryPercentView);
mBatteryPercentView = null;
- }*/
+ }
}
private void updateShowPercentLegacy() {
@@ -595,20 +592,13 @@
}
void updateShowImage() {
- mHideImage = Settings.System.getIntForUser(getContext().getContentResolver(),
- OMNI_SHOW_BATTERY_IMAGE, 1, UserHandle.USER_CURRENT) == 0;
- mBatteryIconView.setVisibility(mHideImage ? View.GONE : View.VISIBLE);
- if (mHideImage) {
- updateShowPercentLegacy();
- updatePercentTextLegacy();
- } else {
- removeView(mBatteryPercentView);
- mBatteryPercentView = null;
- }
- }
-
- boolean isImageHidden() {
- return mHideImage && mBatteryPercentView != null;
+ final boolean hideImage = Settings.System.getIntForUser(getContext().getContentResolver(),
+ OMNI_SHOW_BATTERY_IMAGE, 1, UserHandle.USER_CURRENT) == 0;
+ mBatteryIconView.setVisibility(hideImage ? View.GONE : View.VISIBLE);
+ //int padding = getResources().getDimensionPixelSize(R.dimen.signal_cluster_battery_padding);
+ //LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) getLayoutParams();
+ //lp.setMargins(hideImage ? -padding : 0, 0, 0, 0);
+ //setLayoutParams(lp);
}
private Drawable getUnknownStateDrawable() {
@@ -733,7 +723,7 @@
public void onDarkChanged(ArrayList<Rect> areas, float darkIntensity, int tint) {
if (mIsStaticColor) return;
- if (!newStatusBarIcons() || isImageHidden()) {
+ if (!newStatusBarIcons()) {
onDarkChangedLegacy(areas, darkIntensity, tint);
return;
}
@@ -793,7 +783,7 @@
/** For newStatusBarIcons(), we use a BatteryColors object to declare the theme */
public void setUnifiedBatteryColors(BatteryColors colors) {
- if (!newStatusBarIcons() || isImageHidden()) return;
+ if (!newStatusBarIcons()) return;
mUnifiedBatteryColors = colors;
mUnifiedBattery.setColors(mUnifiedBatteryColors);
diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java
index 38b26a1..4224f1b 100644
--- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java
@@ -173,7 +173,6 @@
mView.updateShowPercent();
mView.updateShowImage();
- mView.isImageHidden();
}
@Override
@@ -243,7 +242,6 @@
super.onChange(selfChange, uri);
mView.updateShowPercent();
mView.updateShowImage();
- mView.isImageHidden();
if (TextUtils.equals(uri.getLastPathSegment(),
Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME)) {
// update the text for sure if the estimate in the cache was updated