Unfurl media player on AOD=>lockscreen wakeup
Clip MediaContainerView to round rect with new height when ExpandableView#actualHeight updates Bug: 213503823 Test: MediaContainerTest Test: press power button to wakeup, media player unfurls Test: press power button to sleep, media player furls up Change-Id: I58101a307f31fd5a90f05674352aad00c234a5fa
This commit is contained in:
@@ -1,46 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.systemui.statusbar.notification.stack;
|
||||
|
||||
import android.animation.AnimatorListenerAdapter;
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import com.android.systemui.statusbar.notification.row.ExpandableView;
|
||||
|
||||
/**
|
||||
* Root view to insert Lock screen media controls into the notification stack.
|
||||
*/
|
||||
public class MediaContainerView extends ExpandableView {
|
||||
|
||||
public MediaContainerView(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long performRemoveAnimation(long duration, long delay, float translationDirection,
|
||||
boolean isHeadsUpAnimation, float endLocation, Runnable onFinishedRunnable,
|
||||
AnimatorListenerAdapter animationListener) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void performAddAnimation(long delay, long duration, boolean isHeadsUpAppear,
|
||||
Runnable onEnd) {
|
||||
// No animation, it doesn't need it, this would be local
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.systemui.statusbar.notification.stack
|
||||
|
||||
import android.animation.AnimatorListenerAdapter
|
||||
import android.content.Context
|
||||
import android.content.res.Configuration
|
||||
import android.graphics.Canvas
|
||||
import android.graphics.Path
|
||||
import android.graphics.RectF
|
||||
import android.util.AttributeSet
|
||||
import com.android.systemui.R
|
||||
import com.android.systemui.statusbar.notification.row.ExpandableView
|
||||
|
||||
/**
|
||||
* Root view to insert Lock screen media controls into the notification stack.
|
||||
*/
|
||||
class MediaContainerView(context: Context, attrs: AttributeSet?) : ExpandableView(context, attrs) {
|
||||
|
||||
var cornerRadius = 0f
|
||||
var clipHeight = 0
|
||||
var clipRect = RectF()
|
||||
var clipPath = Path()
|
||||
|
||||
init {
|
||||
setWillNotDraw(false) // Run onDraw after invalidate.
|
||||
updateResources()
|
||||
}
|
||||
|
||||
override fun onConfigurationChanged(newConfig: Configuration?) {
|
||||
super.onConfigurationChanged(newConfig)
|
||||
updateResources()
|
||||
}
|
||||
|
||||
private fun updateResources() {
|
||||
cornerRadius = context.resources
|
||||
.getDimensionPixelSize(R.dimen.notification_corner_radius).toFloat()
|
||||
}
|
||||
|
||||
public override fun updateClipping() {
|
||||
if (clipHeight != actualHeight) {
|
||||
clipHeight = actualHeight
|
||||
}
|
||||
invalidate()
|
||||
}
|
||||
|
||||
override fun onDraw(canvas: Canvas) {
|
||||
super.onDraw(canvas)
|
||||
|
||||
val bounds = canvas.clipBounds
|
||||
bounds.bottom = clipHeight
|
||||
clipRect.set(bounds)
|
||||
|
||||
clipPath.reset()
|
||||
clipPath.addRoundRect(clipRect, cornerRadius, cornerRadius, Path.Direction.CW)
|
||||
canvas.clipPath(clipPath)
|
||||
}
|
||||
|
||||
|
||||
override fun performRemoveAnimation(duration: Long, delay: Long, translationDirection: Float,
|
||||
isHeadsUpAnimation: Boolean, endLocation: Float,
|
||||
onFinishedRunnable: Runnable?,
|
||||
animationListener: AnimatorListenerAdapter?): Long {
|
||||
return 0
|
||||
}
|
||||
|
||||
override fun performAddAnimation(delay: Long, duration: Long, isHeadsUpAppear: Boolean,
|
||||
onEnd: Runnable?) {
|
||||
// No animation, it doesn't need it, this would be local
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.android.systemui.statusbar.notification.stack
|
||||
|
||||
import android.testing.AndroidTestingRunner
|
||||
import android.testing.TestableLooper
|
||||
import android.view.LayoutInflater
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.R
|
||||
import junit.framework.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
|
||||
/**
|
||||
* Tests for {@link MediaContainView}.
|
||||
*/
|
||||
@SmallTest
|
||||
@RunWith(AndroidTestingRunner::class)
|
||||
@TestableLooper.RunWithLooper
|
||||
class MediaContainerViewTest : SysuiTestCase() {
|
||||
|
||||
lateinit var mediaContainerView : MediaContainerView
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
mediaContainerView = LayoutInflater.from(context).inflate(
|
||||
R.layout.keyguard_media_container, null, false) as MediaContainerView
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUpdateClipping_updatesClipHeight() {
|
||||
assertTrue(mediaContainerView.clipHeight == 0)
|
||||
|
||||
mediaContainerView.actualHeight = 10
|
||||
mediaContainerView.updateClipping()
|
||||
assertTrue(mediaContainerView.clipHeight == 10)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user