Merge "Disable Clock View Layer and ignore assigned alpha" into udc-qpr-dev am: e0e108bf2a

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

Change-Id: I3cdba72472842085dddd9289e3e31af3180b7999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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
     }