diff options
8 files changed, 246 insertions, 211 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt index eae6cdbe4d2c..d921dde1fa44 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/TaskbarDelegateTest.kt @@ -35,44 +35,30 @@ import org.mockito.MockitoAnnotations @SmallTest @RunWith(AndroidJUnit4::class) class TaskbarDelegateTest : SysuiTestCase() { - val DISPLAY_ID = 0; - val MODE_GESTURE = 0; - val MODE_THREE_BUTTON = 1; + val DISPLAY_ID = 0 + + val MODE_GESTURE = 0 + + val MODE_THREE_BUTTON = 1 private lateinit var mTaskStackChangeListeners: TaskStackChangeListeners private lateinit var mTaskbarDelegate: TaskbarDelegate - @Mock - lateinit var mEdgeBackGestureHandler : EdgeBackGestureHandler - @Mock - lateinit var mLightBarControllerFactory : LightBarTransitionsController.Factory - @Mock - lateinit var mLightBarTransitionController: LightBarTransitionsController - @Mock - lateinit var mCommandQueue: CommandQueue - @Mock - lateinit var mOverviewProxyService: OverviewProxyService - @Mock - lateinit var mNavBarHelper: NavBarHelper - @Mock - lateinit var mNavigationModeController: NavigationModeController - @Mock - lateinit var mSysUiState: SysUiState - @Mock - lateinit var mDumpManager: DumpManager - @Mock - lateinit var mAutoHideController: AutoHideController - @Mock - lateinit var mLightBarController: LightBarController - @Mock - lateinit var mOptionalPip: Optional<Pip> - @Mock - lateinit var mBackAnimation: BackAnimation - @Mock - lateinit var mCurrentSysUiState: NavBarHelper.CurrentSysuiState - @Mock - lateinit var mStatusBarKeyguardViewManager: StatusBarKeyguardViewManager - @Mock - lateinit var mStatusBarStateController: StatusBarStateController + @Mock lateinit var mEdgeBackGestureHandler: EdgeBackGestureHandler + @Mock lateinit var mLightBarControllerFactory: LightBarTransitionsController.Factory + @Mock lateinit var mLightBarTransitionController: LightBarTransitionsController + @Mock lateinit var mCommandQueue: CommandQueue + @Mock lateinit var mOverviewProxyService: OverviewProxyService + @Mock lateinit var mNavBarHelper: NavBarHelper + @Mock lateinit var mNavigationModeController: NavigationModeController + @Mock lateinit var mSysUiState: SysUiState + @Mock lateinit var mDumpManager: DumpManager + @Mock lateinit var mAutoHideController: AutoHideController + @Mock lateinit var mLightBarController: LightBarController + @Mock lateinit var mOptionalPip: Optional<Pip> + @Mock lateinit var mBackAnimation: BackAnimation + @Mock lateinit var mCurrentSysUiState: NavBarHelper.CurrentSysuiState + @Mock lateinit var mStatusBarKeyguardViewManager: StatusBarKeyguardViewManager + @Mock lateinit var mStatusBarStateController: StatusBarStateController @Before fun setup() { @@ -82,11 +68,26 @@ class TaskbarDelegateTest : SysuiTestCase() { `when`(mNavBarHelper.currentSysuiState).thenReturn(mCurrentSysUiState) `when`(mSysUiState.setFlag(anyLong(), anyBoolean())).thenReturn(mSysUiState) mTaskStackChangeListeners = TaskStackChangeListeners.getTestInstance() - mTaskbarDelegate = TaskbarDelegate(context, mLightBarControllerFactory, - mStatusBarKeyguardViewManager, mStatusBarStateController) - mTaskbarDelegate.setDependencies(mCommandQueue, mOverviewProxyService, mNavBarHelper, - mNavigationModeController, mSysUiState, mDumpManager, mAutoHideController, - mLightBarController, mOptionalPip, mBackAnimation, mTaskStackChangeListeners) + mTaskbarDelegate = + TaskbarDelegate( + context, + mLightBarControllerFactory, + mStatusBarKeyguardViewManager, + mStatusBarStateController, + ) + mTaskbarDelegate.setDependencies( + mCommandQueue, + mOverviewProxyService, + mNavBarHelper, + mNavigationModeController, + mSysUiState, + mDumpManager, + mAutoHideController, + mLightBarController, + mOptionalPip, + mBackAnimation, + mTaskStackChangeListeners, + ) } @Test @@ -108,10 +109,12 @@ class TaskbarDelegateTest : SysuiTestCase() { fun screenPinningEnabled_updatesSysuiState() { mTaskbarDelegate.init(DISPLAY_ID) mTaskStackChangeListeners.listenerImpl.onLockTaskModeChanged( - ActivityManager.LOCK_TASK_MODE_PINNED) - verify(mSysUiState, times(1)).setFlag( - ArgumentMatchers.eq(QuickStepContract.SYSUI_STATE_SCREEN_PINNING), - ArgumentMatchers.eq(true) + ActivityManager.LOCK_TASK_MODE_PINNED ) + verify(mSysUiState, times(1)) + .setFlag( + ArgumentMatchers.eq(QuickStepContract.SYSUI_STATE_SCREEN_PINNING), + ArgumentMatchers.eq(true), + ) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt index f3cea3e8bb96..a64eda7af790 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt @@ -8,24 +8,23 @@ import com.android.systemui.shared.rotation.FloatingRotationButtonPositionCalcul import com.android.systemui.shared.rotation.FloatingRotationButtonPositionCalculator.Position import com.google.common.truth.Truth.assertThat import org.junit.Test +import org.junit.runner.RunWith import platform.test.runner.parameterized.ParameterizedAndroidJunit4 -import platform.test.runner.parameterized.Parameter import platform.test.runner.parameterized.Parameters -import org.junit.runner.RunWith @RunWith(ParameterizedAndroidJunit4::class) @SmallTest -internal class FloatingRotationButtonPositionCalculatorTest( - private val testCase: TestCase, -) : SysuiTestCase() { +internal class FloatingRotationButtonPositionCalculatorTest(private val testCase: TestCase) : + SysuiTestCase() { @Test fun calculatePosition() { - val position = testCase.calculator.calculatePosition( - testCase.rotation, - testCase.taskbarVisible, - testCase.taskbarStashed - ) + val position = + testCase.calculator.calculatePosition( + testCase.rotation, + testCase.taskbarVisible, + testCase.taskbarStashed, + ) assertThat(position).isEqualTo(testCase.expectedPosition) } @@ -34,21 +33,22 @@ internal class FloatingRotationButtonPositionCalculatorTest( val rotation: Int, val taskbarVisible: Boolean, val taskbarStashed: Boolean, - val expectedPosition: Position + val expectedPosition: Position, ) { - override fun toString(): String = - buildString { - append("when calculator = ") - append(when (calculator) { - posLeftCalculator -> "LEFT" - posRightCalculator -> "RIGHT" - else -> error("Unknown calculator: $calculator") - }) - append(", rotation = $rotation") - append(", taskbarVisible = $taskbarVisible") - append(", taskbarStashed = $taskbarStashed") - append(" - expected $expectedPosition") + override fun toString(): String = buildString { + append("when calculator = ") + append( + when (calculator) { + posLeftCalculator -> "LEFT" + posRightCalculator -> "RIGHT" + else -> error("Unknown calculator: $calculator") } + ) + append(", rotation = $rotation") + append(", taskbarVisible = $taskbarVisible") + append(", taskbarStashed = $taskbarStashed") + append(" - expected $expectedPosition") + } } companion object { @@ -56,12 +56,20 @@ internal class FloatingRotationButtonPositionCalculatorTest( private const val MARGIN_TASKBAR_LEFT = 20 private const val MARGIN_TASKBAR_BOTTOM = 30 - private val posLeftCalculator = FloatingRotationButtonPositionCalculator( - MARGIN_DEFAULT, MARGIN_TASKBAR_LEFT, MARGIN_TASKBAR_BOTTOM, true - ) - private val posRightCalculator = FloatingRotationButtonPositionCalculator( - MARGIN_DEFAULT, MARGIN_TASKBAR_LEFT, MARGIN_TASKBAR_BOTTOM, false - ) + private val posLeftCalculator = + FloatingRotationButtonPositionCalculator( + MARGIN_DEFAULT, + MARGIN_TASKBAR_LEFT, + MARGIN_TASKBAR_BOTTOM, + true, + ) + private val posRightCalculator = + FloatingRotationButtonPositionCalculator( + MARGIN_DEFAULT, + MARGIN_TASKBAR_LEFT, + MARGIN_TASKBAR_BOTTOM, + false, + ) @Parameters(name = "{0}") @JvmStatic @@ -73,77 +81,84 @@ internal class FloatingRotationButtonPositionCalculatorTest( rotation = Surface.ROTATION_0, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.LEFT, - translationX = MARGIN_DEFAULT, - translationY = -MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.LEFT, + translationX = MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT, + ), ), TestCase( calculator = posLeftCalculator, rotation = Surface.ROTATION_90, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.RIGHT, - translationX = -MARGIN_DEFAULT, - translationY = -MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT, + ), ), TestCase( calculator = posLeftCalculator, rotation = Surface.ROTATION_180, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.TOP or Gravity.RIGHT, - translationX = -MARGIN_DEFAULT, - translationY = MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.TOP or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = MARGIN_DEFAULT, + ), ), TestCase( calculator = posLeftCalculator, rotation = Surface.ROTATION_270, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.TOP or Gravity.LEFT, - translationX = MARGIN_DEFAULT, - translationY = MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.TOP or Gravity.LEFT, + translationX = MARGIN_DEFAULT, + translationY = MARGIN_DEFAULT, + ), ), TestCase( calculator = posLeftCalculator, rotation = Surface.ROTATION_0, taskbarVisible = true, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.LEFT, - translationX = MARGIN_TASKBAR_LEFT, - translationY = -MARGIN_TASKBAR_BOTTOM - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.LEFT, + translationX = MARGIN_TASKBAR_LEFT, + translationY = -MARGIN_TASKBAR_BOTTOM, + ), ), TestCase( calculator = posLeftCalculator, rotation = Surface.ROTATION_0, taskbarVisible = true, taskbarStashed = true, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.LEFT, - translationX = MARGIN_DEFAULT, - translationY = -MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.LEFT, + translationX = MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT, + ), ), TestCase( calculator = posLeftCalculator, rotation = Surface.ROTATION_90, taskbarVisible = true, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.RIGHT, - translationX = -MARGIN_TASKBAR_LEFT, - translationY = -MARGIN_TASKBAR_BOTTOM - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_TASKBAR_LEFT, + translationY = -MARGIN_TASKBAR_BOTTOM, + ), ), // Position right @@ -152,78 +167,85 @@ internal class FloatingRotationButtonPositionCalculatorTest( rotation = Surface.ROTATION_0, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.RIGHT, - translationX = -MARGIN_DEFAULT, - translationY = -MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT, + ), ), TestCase( calculator = posRightCalculator, rotation = Surface.ROTATION_90, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.TOP or Gravity.RIGHT, - translationX = -MARGIN_DEFAULT, - translationY = MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.TOP or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = MARGIN_DEFAULT, + ), ), TestCase( calculator = posRightCalculator, rotation = Surface.ROTATION_180, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.TOP or Gravity.LEFT, - translationX = MARGIN_DEFAULT, - translationY = MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.TOP or Gravity.LEFT, + translationX = MARGIN_DEFAULT, + translationY = MARGIN_DEFAULT, + ), ), TestCase( calculator = posRightCalculator, rotation = Surface.ROTATION_270, taskbarVisible = false, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.LEFT, - translationX = MARGIN_DEFAULT, - translationY = -MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.LEFT, + translationX = MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT, + ), ), TestCase( calculator = posRightCalculator, rotation = Surface.ROTATION_0, taskbarVisible = true, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.RIGHT, - translationX = -MARGIN_TASKBAR_LEFT, - translationY = -MARGIN_TASKBAR_BOTTOM - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_TASKBAR_LEFT, + translationY = -MARGIN_TASKBAR_BOTTOM, + ), ), TestCase( calculator = posRightCalculator, rotation = Surface.ROTATION_0, taskbarVisible = true, taskbarStashed = true, - expectedPosition = Position( - gravity = Gravity.BOTTOM or Gravity.RIGHT, - translationX = -MARGIN_DEFAULT, - translationY = -MARGIN_DEFAULT - ) + expectedPosition = + Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT, + ), ), TestCase( calculator = posRightCalculator, rotation = Surface.ROTATION_90, taskbarVisible = true, taskbarStashed = false, - expectedPosition = Position( - gravity = Gravity.TOP or Gravity.RIGHT, - translationX = -MARGIN_TASKBAR_LEFT, - translationY = MARGIN_TASKBAR_BOTTOM - ) - ) + expectedPosition = + Position( + gravity = Gravity.TOP or Gravity.RIGHT, + translationX = -MARGIN_TASKBAR_LEFT, + translationY = MARGIN_TASKBAR_BOTTOM, + ), + ), ) } } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt index c392c2ff17f3..45ff7f4f87ef 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt @@ -18,9 +18,9 @@ package com.android.systemui.navigationbar import com.android.internal.statusbar.RegisterStatusBarResult import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.shared.statusbar.phone.BarTransitions import com.android.systemui.navigationbar.views.NavigationBar import com.android.systemui.navigationbar.views.NavigationBarView +import com.android.systemui.shared.statusbar.phone.BarTransitions import javax.inject.Inject /** A no-op version of [NavigationBarController] for variants like Arc and TV. */ @@ -30,18 +30,28 @@ class NavigationBarControllerEmptyImpl @Inject constructor() : NavigationBarCont includeDefaultDisplay: Boolean, result: RegisterStatusBarResult?, ) {} + override fun removeNavigationBar(displayId: Int) {} + override fun checkNavBarModes(displayId: Int) {} + override fun finishBarAnimations(displayId: Int) {} + override fun touchAutoDim(displayId: Int) {} + override fun transitionTo( displayId: Int, @BarTransitions.TransitionMode barMode: Int, animate: Boolean, ) {} + override fun disableAnimationsDuringHide(displayId: Int, delay: Long) {} + override fun getDefaultNavigationBarView(): NavigationBarView? = null + override fun getNavigationBarView(displayId: Int): NavigationBarView? = null + override fun isOverviewEnabled(displayId: Int) = false + override fun getDefaultNavigationBar(): NavigationBar? = null } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt index e931f8f5398a..2d001508a720 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt @@ -46,7 +46,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : private var arrowLength = AnimatedFloat( name = "arrowLength", - minimumVisibleChange = SpringAnimation.MIN_VISIBLE_CHANGE_PIXELS + minimumVisibleChange = SpringAnimation.MIN_VISIBLE_CHANGE_PIXELS, ) /** @@ -56,7 +56,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : var arrowHeight = AnimatedFloat( name = "arrowHeight", - minimumVisibleChange = SpringAnimation.MIN_VISIBLE_CHANGE_ROTATION_DEGREES + minimumVisibleChange = SpringAnimation.MIN_VISIBLE_CHANGE_ROTATION_DEGREES, ) val backgroundWidth = @@ -89,7 +89,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : AnimatedFloat( name = "scale", minimumVisibleChange = SpringAnimation.MIN_VISIBLE_CHANGE_SCALE, - minimumValue = 0f + minimumValue = 0f, ) val scalePivotX = @@ -111,7 +111,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : name = "arrowAlpha", minimumVisibleChange = SpringAnimation.MIN_VISIBLE_CHANGE_ALPHA, minimumValue = 0f, - maximumValue = 1f + maximumValue = 1f, ) val backgroundAlpha = @@ -119,7 +119,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : name = "backgroundAlpha", minimumVisibleChange = SpringAnimation.MIN_VISIBLE_CHANGE_ALPHA, minimumValue = 0f, - maximumValue = 1f + maximumValue = 1f, ) private val allAnimatedFloat = @@ -133,7 +133,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : scale, horizontalTranslation, arrowAlpha, - backgroundAlpha + backgroundAlpha, ) /** @@ -162,7 +162,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : com.android.internal.R.attr.materialColorOnSecondaryContainer } else { com.android.internal.R.attr.materialColorOnSecondaryFixed - } + }, ) arrowBackgroundPaint.color = @@ -172,7 +172,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : com.android.internal.R.attr.materialColorSecondaryContainer } else { com.android.internal.R.attr.materialColorSecondaryFixedDim - } + }, ) } @@ -242,7 +242,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : fun stretchTo( stretchAmount: Float, startingVelocity: Float? = null, - springForce: SpringForce? = null + springForce: SpringForce? = null, ) { animation.apply { startingVelocity?.let { @@ -303,7 +303,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : fun addAnimationEndListener( animatedFloat: AnimatedFloat, - endListener: DelayedOnAnimationEndListener + endListener: DelayedOnAnimationEndListener, ): Boolean { return if (animatedFloat.isRunning) { animatedFloat.addEndListener(endListener) @@ -327,43 +327,43 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : backgroundHeightStretchAmount: Float, edgeCornerStretchAmount: Float, farCornerStretchAmount: Float, - fullyStretchedDimens: EdgePanelParams.BackIndicatorDimens + fullyStretchedDimens: EdgePanelParams.BackIndicatorDimens, ) { horizontalTranslation.stretchBy( finalPosition = fullyStretchedDimens.horizontalTranslation, - amount = horizontalTranslationStretchAmount + amount = horizontalTranslationStretchAmount, ) arrowLength.stretchBy( finalPosition = fullyStretchedDimens.arrowDimens.length, - amount = arrowStretchAmount + amount = arrowStretchAmount, ) arrowHeight.stretchBy( finalPosition = fullyStretchedDimens.arrowDimens.height, - amount = arrowStretchAmount + amount = arrowStretchAmount, ) arrowAlpha.stretchBy( finalPosition = fullyStretchedDimens.arrowDimens.alpha, - amount = arrowAlphaStretchAmount + amount = arrowAlphaStretchAmount, ) backgroundAlpha.stretchBy( finalPosition = fullyStretchedDimens.backgroundDimens.alpha, - amount = backgroundAlphaStretchAmount + amount = backgroundAlphaStretchAmount, ) backgroundWidth.stretchBy( finalPosition = fullyStretchedDimens.backgroundDimens.width, - amount = backgroundWidthStretchAmount + amount = backgroundWidthStretchAmount, ) backgroundHeight.stretchBy( finalPosition = fullyStretchedDimens.backgroundDimens.height, - amount = backgroundHeightStretchAmount + amount = backgroundHeightStretchAmount, ) backgroundEdgeCornerRadius.stretchBy( finalPosition = fullyStretchedDimens.backgroundDimens.edgeCornerRadius, - amount = edgeCornerStretchAmount + amount = edgeCornerStretchAmount, ) backgroundFarCornerRadius.stretchBy( finalPosition = fullyStretchedDimens.backgroundDimens.farCornerRadius, - amount = farCornerStretchAmount + amount = farCornerStretchAmount, ) } @@ -381,7 +381,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : arrowAlpha.stretchTo( stretchAmount = 0f, startingVelocity = startingVelocity, - springForce = springForce + springForce = springForce, ) } @@ -403,7 +403,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : /** Updates resting arrow and background size not accounting for stretch */ internal fun setRestingDimens( restingParams: EdgePanelParams.BackIndicatorDimens, - animate: Boolean = true + animate: Boolean = true, ) { horizontalTranslation.updateRestingPosition(restingParams.horizontalTranslation) scale.updateRestingPosition(restingParams.scale) @@ -417,11 +417,11 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : backgroundHeight.updateRestingPosition(restingParams.backgroundDimens.height, animate) backgroundEdgeCornerRadius.updateRestingPosition( restingParams.backgroundDimens.edgeCornerRadius, - animate + animate, ) backgroundFarCornerRadius.updateRestingPosition( restingParams.backgroundDimens.farCornerRadius, - animate + animate, ) } @@ -483,11 +483,11 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : topLeft = edgeCorner, bottomLeft = edgeCorner, topRight = farCorner, - bottomRight = farCorner + bottomRight = farCorner, ) canvas.drawPath( arrowBackground, - arrowBackgroundPaint.apply { alpha = (255 * backgroundAlpha.pos).toInt() } + arrowBackgroundPaint.apply { alpha = (255 * backgroundAlpha.pos).toInt() }, ) val dx = arrowLength.pos @@ -498,7 +498,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : val arrowOffset = (backgroundWidth - dx) / 2 canvas.translate( /* dx= */ arrowOffset, - /* dy= */ 0f /* pass 0 for the y position since the canvas was already translated */ + /* dy= */ 0f, /* pass 0 for the y position since the canvas was already translated */ ) val arrowPointsAwayFromEdge = !arrowsPointLeft.xor(isLeftPanel) @@ -532,7 +532,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : topLeft: Float = 0f, topRight: Float = 0f, bottomRight: Float = 0f, - bottomLeft: Float = 0f + bottomLeft: Float = 0f, ): Path = Path().apply { val corners = @@ -544,7 +544,7 @@ class BackPanel(context: Context, private val latencyTracker: LatencyTracker) : bottomRight, bottomRight, bottomLeft, - bottomLeft + bottomLeft, ) addRoundRect(this@toPathWithRoundCorners, corners, Path.Direction.CW) } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt index d8c13b6e8f6d..7e07e4d5097f 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt @@ -124,7 +124,7 @@ internal constructor( vibratorHelper, configurationController, latencyTracker, - interactionJankMonitor + interactionJankMonitor, ) .also { it.init() } } @@ -206,7 +206,7 @@ internal constructor( COMMITTED, /* back action currently cancelling, arrow soon to be GONE */ - CANCELLED + CANCELLED, } /** @@ -224,7 +224,7 @@ internal constructor( animation: DynamicAnimation<*>, canceled: Boolean, value: Float, - velocity: Float + velocity: Float, ) { animation.removeEndListener(this) @@ -421,7 +421,7 @@ internal constructor( if ( isPastThresholdToActive( isPastThreshold = isPastStaticThreshold, - dynamicDelay = entryToActiveDelayCalculation + dynamicDelay = entryToActiveDelayCalculation, ) ) { updateArrowState(GestureState.ACTIVE) @@ -437,7 +437,7 @@ internal constructor( isPastStaticThreshold && isPastDynamicReactivationThreshold && isWithinYActivationThreshold, - delay = MIN_DURATION_INACTIVE_BEFORE_ACTIVE_ANIMATION + delay = MIN_DURATION_INACTIVE_BEFORE_ACTIVE_ANIMATION, ) ) { updateArrowState(GestureState.ACTIVE) @@ -593,7 +593,7 @@ internal constructor( arrowAlphaStretchAmount = 1f, edgeCornerStretchAmount = 1f, farCornerStretchAmount = 1f, - fullyStretchedDimens = params.fullyStretchedIndicator + fullyStretchedDimens = params.fullyStretchedIndicator, ) } @@ -608,7 +608,7 @@ internal constructor( params.entryIndicator.arrowDimens.alphaInterpolator?.get(progress)?.value ?: 0f, edgeCornerStretchAmount = params.edgeCornerInterpolator.getInterpolation(progress), farCornerStretchAmount = params.farCornerInterpolator.getInterpolation(progress), - fullyStretchedDimens = params.preThresholdIndicator + fullyStretchedDimens = params.preThresholdIndicator, ) } @@ -643,7 +643,7 @@ internal constructor( ?: 0f, edgeCornerStretchAmount = params.edgeCornerInterpolator.getInterpolation(progress), farCornerStretchAmount = params.farCornerInterpolator.getInterpolation(progress), - fullyStretchedDimens = params.preThresholdIndicator + fullyStretchedDimens = params.preThresholdIndicator, ) } @@ -688,7 +688,7 @@ internal constructor( private fun isPastThresholdToActive( isPastThreshold: Boolean, delay: Float? = null, - dynamicDelay: () -> Float = { delay ?: 0F } + dynamicDelay: () -> Float = { delay ?: 0F }, ): Boolean { val resetValue = 0L val isPastThresholdForFirstTime = pastThresholdWhileEntryOrInactiveTime == resetValue @@ -709,7 +709,7 @@ internal constructor( private fun playWithBackgroundWidthAnimation( onEnd: DelayedOnAnimationEndListener, - delay: Long = 0L + delay: Long = 0L, ) { if (delay == 0L) { updateRestingArrowDimens() @@ -871,8 +871,8 @@ internal constructor( GestureState.FLUNG -> params.activeIndicator.backgroundDimens GestureState.COMMITTED -> params.committedIndicator.backgroundDimens GestureState.CANCELLED -> params.cancelledIndicator.backgroundDimens - } - ) + }, + ), ) } @@ -970,7 +970,7 @@ internal constructor( } mainHandler.postDelayed( onEndSetCommittedStateListener.runnable, - MIN_DURATION_FLING_ANIMATION + MIN_DURATION_FLING_ANIMATION, ) updateRestingArrowDimens() } @@ -984,13 +984,13 @@ internal constructor( updateRestingArrowDimens() mainHandler.postDelayed( onEndSetGoneStateListener.runnable, - MIN_DURATION_COMMITTED_AFTER_FLING_ANIMATION + MIN_DURATION_COMMITTED_AFTER_FLING_ANIMATION, ) } else { mView.popScale(POP_ON_COMMITTED_VELOCITY) mainHandler.postDelayed( onAlphaEndSetGoneStateListener.runnable, - MIN_DURATION_COMMITTED_ANIMATION + MIN_DURATION_COMMITTED_ANIMATION, ) } } @@ -1008,14 +1008,14 @@ internal constructor( private fun performDeactivatedHapticFeedback() { vibratorHelper.performHapticFeedback( mView, - HapticFeedbackConstants.GESTURE_THRESHOLD_DEACTIVATE + HapticFeedbackConstants.GESTURE_THRESHOLD_DEACTIVATE, ) } private fun performActivatedHapticFeedback() { vibratorHelper.performHapticFeedback( mView, - HapticFeedbackConstants.GESTURE_THRESHOLD_ACTIVATE + HapticFeedbackConstants.GESTURE_THRESHOLD_ACTIVATE, ) } @@ -1075,7 +1075,7 @@ internal constructor( "xDelta=${"%.1f".format(totalTouchDeltaActive)}", "xTranslation=${"%.1f".format(previousXTranslation)}", "pre=${"%.0f".format(preProgress)}%", - "post=${"%.0f".format(postProgress)}%" + "post=${"%.0f".format(postProgress)}%", ) val debugPaint = Paint().apply { color = Color.WHITE } val debugInfoBottom = debugStrings.size * 32f + 4f @@ -1084,7 +1084,7 @@ internal constructor( 4f, canvas.width.toFloat(), debugStrings.size * 32f + 4f, - debugPaint + debugPaint, ) debugPaint.apply { color = Color.BLACK @@ -1132,7 +1132,7 @@ class Step<T>( private val threshold: Float, private val factor: Float = 1.1f, private val postThreshold: T, - private val preThreshold: T + private val preThreshold: T, ) { data class Value<T>(val value: T, val isNewState: Boolean) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt index db8749f59d9c..283ae7f84c59 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt @@ -16,7 +16,7 @@ data class EdgePanelParams(private var resources: Resources) { val heightSpring: SpringForce? = null, val lengthSpring: SpringForce? = null, var alphaSpring: Step<SpringForce>? = null, - var alphaInterpolator: Step<Float>? = null + var alphaInterpolator: Step<Float>? = null, ) data class BackgroundDimens( @@ -178,14 +178,14 @@ data class EdgePanelParams(private var resources: Resources) { threshold = commonArrowDimensAlphaThreshold, factor = commonArrowDimensAlphaFactor, postThreshold = createSpring(180f, 0.9f), - preThreshold = createSpring(2000f, 0.6f) + preThreshold = createSpring(2000f, 0.6f), ) val commonArrowDimensAlphaSpringInterpolator = Step( threshold = commonArrowDimensAlphaThreshold, factor = commonArrowDimensAlphaFactor, postThreshold = 1f, - preThreshold = 0f + preThreshold = 0f, ) entryIndicator = @@ -204,7 +204,7 @@ data class EdgePanelParams(private var resources: Resources) { lengthSpring = createSpring(600f, 0.4f), heightSpring = createSpring(600f, 0.4f), alphaSpring = commonArrowDimensAlphaSpring, - alphaInterpolator = commonArrowDimensAlphaSpringInterpolator + alphaInterpolator = commonArrowDimensAlphaSpringInterpolator, ), backgroundDimens = BackgroundDimens( @@ -217,7 +217,7 @@ data class EdgePanelParams(private var resources: Resources) { heightSpring = createSpring(1500f, 0.45f), farCornerRadiusSpring = createSpring(300f, 0.5f), edgeCornerRadiusSpring = createSpring(150f, 0.5f), - ) + ), ) activeIndicator = @@ -235,7 +235,7 @@ data class EdgePanelParams(private var resources: Resources) { lengthSpring = activeCommittedArrowLengthSpring, heightSpring = activeCommittedArrowHeightSpring, alphaSpring = commonArrowDimensAlphaSpring, - alphaInterpolator = commonArrowDimensAlphaSpringInterpolator + alphaInterpolator = commonArrowDimensAlphaSpringInterpolator, ), backgroundDimens = BackgroundDimens( @@ -248,7 +248,7 @@ data class EdgePanelParams(private var resources: Resources) { heightSpring = createSpring(10000f, 1f), edgeCornerRadiusSpring = createSpring(2600f, 0.855f), farCornerRadiusSpring = createSpring(1200f, 0.30f), - ) + ), ) preThresholdIndicator = @@ -266,7 +266,7 @@ data class EdgePanelParams(private var resources: Resources) { lengthSpring = createSpring(100f, 0.6f), heightSpring = createSpring(100f, 0.6f), alphaSpring = commonArrowDimensAlphaSpring, - alphaInterpolator = commonArrowDimensAlphaSpringInterpolator + alphaInterpolator = commonArrowDimensAlphaSpringInterpolator, ), backgroundDimens = BackgroundDimens( @@ -281,7 +281,7 @@ data class EdgePanelParams(private var resources: Resources) { heightSpring = createSpring(1500f, 0.45f), farCornerRadiusSpring = createSpring(300f, 1f), edgeCornerRadiusSpring = createSpring(250f, 0.5f), - ) + ), ) committedIndicator = @@ -317,7 +317,7 @@ data class EdgePanelParams(private var resources: Resources) { lengthSpring = createSpring(850f, 0.46f), heightSpring = createSpring(850f, 0.46f), length = activeIndicator.arrowDimens.length, - height = activeIndicator.arrowDimens.height + height = activeIndicator.arrowDimens.height, ), backgroundDimens = committedIndicator.backgroundDimens.copy( @@ -325,7 +325,7 @@ data class EdgePanelParams(private var resources: Resources) { heightSpring = flungCommittedHeightSpring, edgeCornerRadiusSpring = flungCommittedEdgeCornerSpring, farCornerRadiusSpring = flungCommittedFarCornerSpring, - ) + ), ) cancelledIndicator = @@ -334,7 +334,7 @@ data class EdgePanelParams(private var resources: Resources) { entryIndicator.backgroundDimens.copy( width = 0f, alpha = 0f, - alphaSpring = createSpring(450f, 1f) + alphaSpring = createSpring(450f, 1f), ) ) @@ -366,7 +366,7 @@ data class EdgePanelParams(private var resources: Resources) { heightSpring = null, edgeCornerRadiusSpring = null, farCornerRadiusSpring = null, - ) + ), ) } } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/domain/GestureInteractor.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/domain/GestureInteractor.kt index 0166176721c3..ba746cda480e 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/domain/GestureInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/domain/GestureInteractor.kt @@ -55,7 +55,7 @@ constructor( ) { enum class Scope { Local, - Global + Global, } private val _localGestureBlockedMatchers = MutableStateFlow<Set<TaskMatcher>>(setOf()) @@ -86,7 +86,7 @@ constructor( combine( _topActivity, gestureRepository.gestureBlockedMatchers, - _localGestureBlockedMatchers.asStateFlow() + _localGestureBlockedMatchers.asStateFlow(), ) { runningTask, global, local -> runningTask != null && (global + local).any { it.matches(runningTask) } } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/NavbarOrientationTrackingLogger.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/NavbarOrientationTrackingLogger.kt index a5ba17b98a40..251fd2e5954c 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/NavbarOrientationTrackingLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/NavbarOrientationTrackingLogger.kt @@ -31,7 +31,7 @@ constructor(@NavbarOrientationTrackingLog private val buffer: LogBuffer) { isImmersiveMode: Boolean, isSecondaryHandleVisible: Boolean, currentRotation: Int, - startingQuickSwitchRotation: Int + startingQuickSwitchRotation: Int, ) { buffer.log( TAG, @@ -52,7 +52,7 @@ constructor(@NavbarOrientationTrackingLog private val buffer: LogBuffer) { "\tDelta Rotation: ${getDeltaRotation(int1, int2)}\n" + "\tStarting QuickSwitch Rotation: $int1\n" + "\tCurrent Rotation: $int2\n" - } + }, ) } |