Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add system config to suppress charging ripple." into sc-dev

Browse Source
This commit is contained in:
Shan Huang
2021-04-22 15:02:36 +00:00
committed by Android (Google) Code Review
parent 3fb4671026 d19fb697aa
commit 8476c06004
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt
View File

@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.charging
import android.content.Context
import android.graphics.PixelFormat
import android.graphics.PointF
import android.os.SystemProperties
import android.util.DisplayMetrics
import android.view.View
import android.view.WindowManager
@@ -47,7 +48,8 @@ class WiredChargingRippleController @Inject constructor(
private val context: Context
) {
private var charging: Boolean? = null
private val rippleEnabled: Boolean = featureFlags.isChargingRippleEnabled
private val rippleEnabled: Boolean = featureFlags.isChargingRippleEnabled &&
!SystemProperties.getBoolean("persist.debug.suppress-charging-ripple", false)
private val windowLayoutParams = WindowManager.LayoutParams().apply {
width = WindowManager.LayoutParams.MATCH_PARENT
height = WindowManager.LayoutParams.MATCH_PARENT
@@ -104,7 +106,7 @@ class WiredChargingRippleController @Inject constructor(
}
fun startRipple() {
if (rippleView.rippleInProgress || rippleView.parent != null) {
if (!rippleEnabled || 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.)