Merge "Merge "Disable Clock View Layer and ignore assigned alpha" into udc-dev am: f31d364775 am: ff41e81934" into main

2023-07-19 03:35:41 +00:00
parent 56bf63a155 738882a65d
commit a9a2f98f42
1 changed files with 2 additions and 5 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockFrame.kt
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockFrame.kt
@@ -12,12 +12,9 @@ class KeyguardClockFrame(
 ) : FrameLayout(context, attrs) {
    private var drawAlpha: Int = 255

-    init {
-        setLayerType(View.LAYER_TYPE_SOFTWARE, null)
-    }
-
    protected override fun onSetAlpha(alpha: Int): Boolean {
-        drawAlpha = alpha
+        // Ignore alpha passed from View, prefer to compute it from set values
+        drawAlpha = (255 * this.alpha * transitionAlpha).toInt()
        return true
    }