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

Merge "Motion: tweak split shade expansion on lockscreen with media." into tm-dev

Browse Source
This commit is contained in:
Christian Göllner
2022-02-23 17:19:23 +00:00
committed by Android (Google) Code Review
parent 1c5859537d 36e1d8ebde
commit aea2342dde
9 changed files with 182 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values-sw600dp-land/dimens.xml
View File

@@ -42,4 +42,8 @@
the shade (in alpha) -->
<dimen name="lockscreen_shade_scrim_transition_distance">200dp</dimen>
<!-- Distance that the full shade transition takes in order for media to fully transition to
the shade -->
<dimen name="lockscreen_shade_media_transition_distance">200dp</dimen>
</resources>

16
packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt
View File

@@ -795,6 +795,9 @@ class MediaHierarchyManager @Inject constructor(
@TransformationType
fun calculateTransformationType(): Int {
if (isTransitioningToFullShade) {
if (inSplitShade) {
return TRANSFORMATION_TYPE_TRANSITION
}
return TRANSFORMATION_TYPE_FADE
}
if (previousLocation == LOCATION_LOCKSCREEN && desiredLocation == LOCATION_QS ||
@@ -961,6 +964,7 @@ class MediaHierarchyManager @Inject constructor(
(qsExpansion > 0.0f || inSplitShade) && !onLockscreen -> LOCATION_QS
qsExpansion > 0.4f && onLockscreen -> LOCATION_QS
!hasActiveMedia -> LOCATION_QS
onLockscreen && isSplitShadeExpanding() -> LOCATION_QS
onLockscreen && isTransformingToFullShadeAndInQQS() -> LOCATION_QQS
onLockscreen && allowedOnLockscreen -> LOCATION_LOCKSCREEN
else -> LOCATION_QQS
@@ -986,6 +990,10 @@ class MediaHierarchyManager @Inject constructor(
return location
}
private fun isSplitShadeExpanding(): Boolean {
return inSplitShade && isTransitioningToFullShade
}
/**
* Are we currently transforming to the full shade and already in QQS
*/
@@ -993,6 +1001,10 @@ class MediaHierarchyManager @Inject constructor(
if (!isTransitioningToFullShade) {
return false
}
if (inSplitShade) {
// Split shade doesn't use QQS.
return false
}
return fullShadeTransitionProgress > 0.5f
}
@@ -1000,6 +1012,10 @@ class MediaHierarchyManager @Inject constructor(
* Is the current transformationType fading
*/
private fun isCurrentlyFading(): Boolean {
if (isSplitShadeExpanding()) {
// Split shade always uses transition instead of fade.
return false
}
if (isTransitioningToFullShade) {
return true
}

4
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -513,7 +513,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
mContainer.setExpansion(expansion);
final float translationScaleY = (mInSplitShade
? 1 : QSAnimator.SHORT_PARALLAX_AMOUNT) * (expansion - 1);
boolean onKeyguardAndExpanded = isKeyguardState() && !mShowCollapsedOnKeyguard;
boolean onKeyguard = isKeyguardState();
boolean onKeyguardAndExpanded = onKeyguard && !mShowCollapsedOnKeyguard;
if (!mHeaderAnimating && !headerWillBeAnimating()) {
getView().setTranslationY(
onKeyguardAndExpanded
@@ -547,6 +548,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
mHeader.updateResources();
}
}
mQSPanelController.setIsOnKeyguard(onKeyguard);
mFooter.setExpansion(onKeyguardAndExpanded ? 1 : expansion);
mQSFooterActionController.setExpansion(onKeyguardAndExpanded ? 1 : expansion);
mQSPanelController.setRevealExpansion(expansion);

26
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

@@ -110,6 +110,8 @@ public class QSPanel extends LinearLayout implements Tunable {
private final ArrayMap<View, Integer> mChildrenLayoutTop = new ArrayMap<>();
private final Rect mClippingRect = new Rect();
private boolean mUseNewFooter = false;
private ViewGroup mMediaHostView;
private boolean mShouldMoveMediaOnExpansion = true;
public QSPanel(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -289,9 +291,15 @@ public class QSPanel extends LinearLayout implements Tunable {
for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i);
if (move) {
int topOffset;
if (child == mMediaHostView && !mShouldMoveMediaOnExpansion) {
topOffset = 0;
} else {
topOffset = tileHeightOffset;
}
int top = Objects.requireNonNull(mChildrenLayoutTop.get(child));
child.setLeftTopRightBottom(child.getLeft(), top + tileHeightOffset,
child.getRight(), top + tileHeightOffset + child.getHeight());
child.setLeftTopRightBottom(child.getLeft(), top + topOffset,
child.getRight(), top + topOffset + child.getHeight());
}
if (child == mTileLayout) {
move = true;
@@ -463,6 +471,7 @@ public class QSPanel extends LinearLayout implements Tunable {
if (!mUsingMediaPlayer) {
return;
}
mMediaHostView = hostView;
ViewGroup newParent = horizontal ? mHorizontalLinearLayout : this;
ViewGroup currentParent = (ViewGroup) hostView.getParent();
if (currentParent != newParent) {
@@ -656,6 +665,19 @@ public class QSPanel extends LinearLayout implements Tunable {
updatePadding();
}
/**
* Sets whether the media container should move during the expansion of the QS Panel.
*
* As the QS Panel expands and the QS unsquish, the views below the QS tiles move to adapt to
* the new height of the QS tiles.
*
* In some cases this might not be wanted for media. One example is when there is a transition
* animation of the media container happening on split shade lock screen.
*/
public void setShouldMoveMediaOnExpansion(boolean shouldMoveMediaOnExpansion) {
mShouldMoveMediaOnExpansion = shouldMoveMediaOnExpansion;
}
private class H extends Handler {
private static final int ANNOUNCE_FOR_ACCESSIBILITY = 1;

10
packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java
View File

@@ -419,6 +419,16 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
return mView.getBrightnessView();
}
/** Sets whether we are currently on lock screen. */
public void setIsOnKeyguard(boolean isOnKeyguard) {
boolean isOnSplitShadeLockscreen = mShouldUseSplitNotificationShade && isOnKeyguard;
// When the split shade is expanding on lockscreen, the media container transitions from the
// lockscreen to QS.
// We have to prevent the media container position from moving during the transition to have
// a smooth translation animation without stuttering.
mView.setShouldMoveMediaOnExpansion(!isOnSplitShadeLockscreen);
}
/** */
public static final class TileRecord {
public TileRecord(QSTile tile, com.android.systemui.plugins.qs.QSTileView tileView) {

4
packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
View File

@@ -342,9 +342,7 @@ class LockscreenShadeTransitionController @Inject constructor(
qS.setTransitionToFullShadeAmount(field, qSDragProgress)
notificationPanelController.setTransitionToFullShadeAmount(field,
false /* animate */, 0 /* delay */)
// TODO: appear media also in split shade
val mediaAmount = if (useSplitShade) 0f else field
mediaHierarchyManager.setTransitionToFullShadeAmount(mediaAmount)
mediaHierarchyManager.setTransitionToFullShadeAmount(field)
transitionToShadeAmountCommon(field)
}
}

104
packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt
View File

@@ -33,10 +33,11 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager
import com.android.systemui.statusbar.StatusBarState
import com.android.systemui.statusbar.SysuiStatusBarStateController
import com.android.systemui.statusbar.phone.KeyguardBypassController
import com.android.systemui.statusbar.policy.ConfigurationController
import com.android.systemui.statusbar.policy.FakeConfigurationController
import com.android.systemui.statusbar.policy.KeyguardStateController
import com.android.systemui.util.animation.UniqueObjectHostView
import junit.framework.Assert
import com.android.systemui.util.mockito.any
import com.google.common.truth.Truth.assertThat
import org.junit.Assert.assertNotNull
import org.junit.Before
import org.junit.Rule
@@ -44,16 +45,16 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
import org.mockito.ArgumentMatchers
import org.mockito.ArgumentMatchers.anyBoolean
import org.mockito.ArgumentMatchers.anyLong
import org.mockito.Captor
import org.mockito.Mock
import org.mockito.Mockito.`when`
import org.mockito.Mockito.any
import org.mockito.Mockito.anyBoolean
import org.mockito.Mockito.anyLong
import org.mockito.Mockito.clearInvocations
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
import org.mockito.junit.MockitoJUnit
import org.mockito.Mockito.`when` as whenever
@SmallTest
@RunWith(AndroidTestingRunner::class)
@@ -83,8 +84,6 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
@Mock
private lateinit var keyguardViewController: KeyguardViewController
@Mock
private lateinit var configurationController: ConfigurationController
@Mock
private lateinit var uniqueObjectHostView: UniqueObjectHostView
@Mock
private lateinit var dreamOverlayStateController: DreamOverlayStateController
@@ -97,6 +96,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
val mockito = MockitoJUnit.rule()
private lateinit var mediaHiearchyManager: MediaHierarchyManager
private lateinit var mediaFrame: ViewGroup
private val configurationController = FakeConfigurationController()
@Before
fun setup() {
@@ -176,12 +176,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
@Test
fun testGoingToFullShade() {
// Let's set it onto Lock screen
`when`(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD)
`when`(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn(
true)
statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD)
clearInvocations(mediaCarouselController)
goToLockscreen()
// Let's transition all the way to full shade
mediaHiearchyManager.setTransitionToFullShadeAmount(100000f)
@@ -204,41 +199,48 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
// Let's make sure alpha is set
mediaHiearchyManager.setTransitionToFullShadeAmount(2.0f)
Assert.assertTrue("alpha should not be 1.0f when cross fading", mediaFrame.alpha != 1.0f)
assertThat(mediaFrame.alpha).isNotEqualTo(1.0f)
}
@Test
fun testTransformationOnLockScreenIsFading() {
// Let's set it onto Lock screen
`when`(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD)
`when`(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn(
true)
statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD)
clearInvocations(mediaCarouselController)
goToLockscreen()
expandQS()
// Let's transition from lockscreen to qs
mediaHiearchyManager.qsExpansion = 1.0f
val transformType = mediaHiearchyManager.calculateTransformationType()
Assert.assertTrue("media isn't transforming to qs with a fade",
transformType == MediaHierarchyManager.TRANSFORMATION_TYPE_FADE)
assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_FADE)
}
@Test
fun calculateTransformationType_onLockShade_inSplitShade_goingToFullShade_returnsTransition() {
enableSplitShade()
goToLockscreen()
expandQS()
mediaHiearchyManager.setTransitionToFullShadeAmount(10000f)
val transformType = mediaHiearchyManager.calculateTransformationType()
assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_TRANSITION)
}
@Test
fun calculateTransformationType_onLockShade_inSplitShade_notExpanding_returnsFade() {
enableSplitShade()
goToLockscreen()
goToLockedShade()
expandQS()
mediaHiearchyManager.setTransitionToFullShadeAmount(0f)
val transformType = mediaHiearchyManager.calculateTransformationType()
assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_FADE)
}
@Test
fun testTransformationOnLockScreenToQQSisFading() {
// Let's set it onto Lock screen
`when`(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD)
`when`(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn(
true)
statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD)
clearInvocations(mediaCarouselController)
goToLockscreen()
goToLockedShade()
// Let's transition from lockscreen to qs
`when`(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED)
statusBarCallback.value.onStatePreChange(StatusBarState.KEYGUARD,
StatusBarState.SHADE_LOCKED)
val transformType = mediaHiearchyManager.calculateTransformationType()
Assert.assertTrue("media isn't transforming to qqswith a fade",
transformType == MediaHierarchyManager.TRANSFORMATION_TYPE_FADE)
assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_FADE)
}
@Test
@@ -254,4 +256,32 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
verify(mediaCarouselController).closeGuts()
}
}
private fun enableSplitShade() {
context.getOrCreateTestableResources().addOverride(
R.bool.config_use_split_notification_shade, true
)
configurationController.notifyConfigurationChanged()
}
private fun goToLockscreen() {
whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD)
whenever(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn(
true
)
statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD)
clearInvocations(mediaCarouselController)
}
private fun goToLockedShade() {
whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED)
statusBarCallback.value.onStatePreChange(
StatusBarState.KEYGUARD,
StatusBarState.SHADE_LOCKED
)
}
private fun expandQS() {
mediaHiearchyManager.qsExpansion = 1.0f
}
}

28
packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
View File

@@ -23,7 +23,7 @@ import com.android.systemui.statusbar.phone.LSShadeTransitionLogger
import com.android.systemui.statusbar.phone.NotificationPanelViewController
import com.android.systemui.statusbar.phone.ScrimController
import com.android.systemui.statusbar.phone.StatusBar
import com.android.systemui.statusbar.policy.ConfigurationController
import com.android.systemui.statusbar.policy.FakeConfigurationController
import org.junit.After
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
@@ -66,7 +66,6 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() {
@Mock lateinit var wakefulnessLifecycle: WakefulnessLifecycle
@Mock lateinit var mediaHierarchyManager: MediaHierarchyManager
@Mock lateinit var scrimController: ScrimController
@Mock lateinit var configurationController: ConfigurationController
@Mock lateinit var falsingManager: FalsingManager
@Mock lateinit var notificationPanelController: NotificationPanelViewController
@Mock lateinit var nsslController: NotificationStackScrollLayoutController
@@ -77,6 +76,8 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() {
@Mock lateinit var qS: QS
@JvmField @Rule val mockito = MockitoJUnit.rule()
private val configurationController = FakeConfigurationController()
@Before
fun setup() {
val helper = NotificationTestHelper(
@@ -244,4 +245,27 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() {
verify(qS).setTransitionToFullShadeAmount(anyFloat(), anyFloat())
verify(depthController).transitionToFullShadeProgress = anyFloat()
}
@Test
fun setDragDownAmount_setsValueOnMediaHierarchyManager() {
transitionController.dragDownAmount = 10f
verify(mediaHierarchyManager).setTransitionToFullShadeAmount(10f)
}
@Test
fun setDragDownAmount_inSplitShade_setsValueOnMediaHierarchyManager() {
enableSplitShade()
transitionController.dragDownAmount = 10f
verify(mediaHierarchyManager).setTransitionToFullShadeAmount(10f)
}
private fun enableSplitShade() {
context.getOrCreateTestableResources().addOverride(
R.bool.config_use_split_notification_shade, true
)
configurationController.notifyConfigurationChanged()
}
}

31
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt Normal file
View File

@@ -0,0 +1,31 @@
package com.android.systemui.statusbar.policy
import android.content.res.Configuration
/** Fake implementation of [ConfigurationController] for tests. */
class FakeConfigurationController : ConfigurationController {
private var listener: ConfigurationController.ConfigurationListener? = null
override fun addCallback(listener: ConfigurationController.ConfigurationListener) {
this.listener = listener
}
override fun removeCallback(listener: ConfigurationController.ConfigurationListener) {
this.listener = null
}
override fun onConfigurationChanged(newConfiguration: Configuration?) {
listener?.onConfigChanged(newConfiguration)
}
override fun notifyThemeChanged() {
listener?.onThemeChanged()
}
fun notifyConfigurationChanged() {
onConfigurationChanged(newConfiguration = null)
}
override fun isLayoutRtl(): Boolean = false
}