Ignore the charging ripple flag.
Will fully remove the flag in a follow up CL. Bug: 210438197 Test: adb shell cmd statusbar charging-ripple Change-Id: I5a6a1eb902fef5485f56ab4e48e11f8596001075
This commit is contained in:
@@ -93,9 +93,8 @@ class WiredChargingRippleController @Inject constructor(
|
||||
nowPluggedIn: Boolean,
|
||||
charging: Boolean
|
||||
) {
|
||||
// Suppresses the ripple when it's disabled, or when the state change comes
|
||||
// from wireless charging.
|
||||
if (!rippleEnabled || batteryController.isPluggedInWireless) {
|
||||
// Suppresses the ripple when the state change comes from wireless charging.
|
||||
if (batteryController.isPluggedInWireless) {
|
||||
return
|
||||
}
|
||||
val wasPluggedIn = pluggedIn
|
||||
@@ -145,7 +144,7 @@ class WiredChargingRippleController @Inject constructor(
|
||||
}
|
||||
|
||||
fun startRipple() {
|
||||
if (!rippleEnabled || rippleView.rippleInProgress || rippleView.parent != null) {
|
||||
if (rippleView.rippleInProgress || rippleView.parent != null) {
|
||||
// Skip if ripple is still playing, or not playing but already added the parent
|
||||
// (which might happen just before the animation starts or right after
|
||||
// the animation ends.)
|
||||
|
||||
Reference in New Issue
Block a user