Merge "Don't show estimate with center notch" into sc-dev am: 7bb24f6378

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14998945

Change-Id: I99d01d1c01453f8fe807d3be8e1a2a6e4fa922e0
This commit is contained in:
TreeHugger Robot
2021-06-16 19:49:59 +00:00
committed by Automerger Merge Worker

View File

@@ -399,12 +399,14 @@ public class QuickStatusBarHeader extends FrameLayout {
mClockIconsSeparatorLayoutParams.width = 0;
setSeparatorVisibility(false);
mShowClockIconsSeparator = false;
mBatteryRemainingIcon.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE);
} else {
datePrivacySeparatorLayoutParams.width = topCutout.width();
mDatePrivacySeparator.setVisibility(View.VISIBLE);
mClockIconsSeparatorLayoutParams.width = topCutout.width();
mShowClockIconsSeparator = true;
setSeparatorVisibility(mKeyguardExpansionFraction == 0f);
mBatteryRemainingIcon.setPercentShowMode(BatteryMeterView.MODE_ON);
}
}
mDatePrivacySeparator.setLayoutParams(datePrivacySeparatorLayoutParams);