Merge "Don't show estimate with center notch" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-06-16 19:46:45 +00:00
committed by Android (Google) Code Review

View File

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