Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5206abf6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Move expansion constant out." into tm-qpr-dev am: 20630764 

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



Change-Id: I597b0f8c6aafd5668b6ce22d9c024fa078ae8176
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e91a725c 20630764

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt

+4 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.flags.FeatureFlags 
import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.shade.ShadeExpansionListener
@@ -40,7 +41,6 @@ import com.android.systemui.shade.ShadeExpansionStateManager 
import com.android.systemui.statusbar.LockscreenShadeTransitionController

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.notification.stack.StackStateAnimator

import com.android.systemui.statusbar.phone.KeyguardBouncer

import com.android.systemui.statusbar.phone.KeyguardBouncer.PrimaryBouncerExpansionCallback

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager.KeyguardViewManagerCallback
@@ -112,10 +112,10 @@ constructor( 
        }

    /**

     * Hidden amount of input (pin/pattern/password) bouncer. This is used

     * [KeyguardBouncer.EXPANSION_VISIBLE] (0f) to [KeyguardBouncer.EXPANSION_HIDDEN] (1f). Only

     * used for the non-modernBouncer.

     * [KeyguardBouncerConstants.EXPANSION_VISIBLE] (0f) to

     * [KeyguardBouncerConstants.EXPANSION_HIDDEN] (1f). Only used for the non-modernBouncer.

     */

    private var inputBouncerHiddenAmount = KeyguardBouncer.EXPANSION_HIDDEN

    private var inputBouncerHiddenAmount = KeyguardBouncerConstants.EXPANSION_HIDDEN

    private var inputBouncerExpansion = 0f // only used for modernBouncer



    private val stateListener: StatusBarStateController.StateListener =

packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java

+9 −6
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ import androidx.annotation.VisibleForTesting; 


import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants;

import com.android.systemui.shade.ShadeExpansionChangeEvent;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.KeyguardBouncer;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.wm.shell.animation.FlingAnimationUtils;
@@ -274,16 +274,18 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { 
                        (float) Math.hypot(horizontalVelocity, verticalVelocity);



                final float expansion = flingRevealsOverlay(verticalVelocity, velocityVector)

                        ? KeyguardBouncer.EXPANSION_HIDDEN : KeyguardBouncer.EXPANSION_VISIBLE;

                        ? KeyguardBouncerConstants.EXPANSION_HIDDEN

                        : KeyguardBouncerConstants.EXPANSION_VISIBLE;



                // Log the swiping up to show Bouncer event.

                if (!mBouncerInitiallyShowing && expansion == KeyguardBouncer.EXPANSION_VISIBLE) {

                if (!mBouncerInitiallyShowing

                        && expansion == KeyguardBouncerConstants.EXPANSION_VISIBLE) {

                    mUiEventLogger.log(DreamEvent.DREAM_SWIPED);

                }



                flingToExpansion(verticalVelocity, expansion);



                if (expansion == KeyguardBouncer.EXPANSION_HIDDEN) {

                if (expansion == KeyguardBouncerConstants.EXPANSION_HIDDEN) {

                    mStatusBarKeyguardViewManager.reset(false);

                }

                break;
@@ -302,7 +304,8 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { 
                    float dragDownAmount = expansionFraction * expansionHeight;

                    setPanelExpansion(expansionFraction, dragDownAmount);

                });

        if (!mBouncerInitiallyShowing && targetExpansion == KeyguardBouncer.EXPANSION_VISIBLE) {

        if (!mBouncerInitiallyShowing

                && targetExpansion == KeyguardBouncerConstants.EXPANSION_VISIBLE) {

            animator.addListener(

                    new AnimatorListenerAdapter() {

                        @Override
@@ -335,7 +338,7 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { 
        final float targetHeight = viewHeight * expansion;

        final float expansionHeight = targetHeight - currentHeight;

        final ValueAnimator animator = createExpansionAnimator(expansion, expansionHeight);

        if (expansion == KeyguardBouncer.EXPANSION_HIDDEN) {

        if (expansion == KeyguardBouncerConstants.EXPANSION_HIDDEN) {

            // Hides the bouncer, i.e., fully expands the space above the bouncer.

            mFlingAnimationUtilsClosing.apply(animator, currentHeight, targetHeight, velocity,

                    viewHeight);

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.os.Build 
import com.android.keyguard.ViewMediatorCallback

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN

import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel

import com.android.systemui.keyguard.shared.model.KeyguardBouncerModel

import com.android.systemui.log.dagger.BouncerLog
@@ -73,7 +74,7 @@ constructor( 
     *      1f = panel fully showing = bouncer fully hidden

     * ```

     */

    private val _panelExpansionAmount = MutableStateFlow(KeyguardBouncer.EXPANSION_HIDDEN)

    private val _panelExpansionAmount = MutableStateFlow(EXPANSION_HIDDEN)

    val panelExpansionAmount = _panelExpansionAmount.asStateFlow()

    private val _keyguardPosition = MutableStateFlow(0f)

    val keyguardPosition = _keyguardPosition.asStateFlow()

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt

+11 −11
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ import com.android.systemui.dagger.qualifiers.Main 
import com.android.systemui.keyguard.DismissCallbackRegistry

import com.android.systemui.keyguard.data.BouncerView

import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants

import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel

import com.android.systemui.keyguard.shared.model.KeyguardBouncerModel

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.shared.system.SysUiStatsLog

import com.android.systemui.statusbar.phone.KeyguardBouncer

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.policy.KeyguardStateController

import javax.inject.Inject
@@ -143,7 +143,7 @@ constructor( 
        Trace.beginSection("KeyguardBouncer#show")

        repository.setPrimaryScrimmed(isScrimmed)

        if (isScrimmed) {

            setPanelExpansion(KeyguardBouncer.EXPANSION_VISIBLE)

            setPanelExpansion(KeyguardBouncerConstants.EXPANSION_VISIBLE)

        }



        if (resumeBouncer) {
@@ -204,14 +204,14 @@ constructor( 
        }



        if (

            expansion == KeyguardBouncer.EXPANSION_VISIBLE &&

                oldExpansion != KeyguardBouncer.EXPANSION_VISIBLE

            expansion == KeyguardBouncerConstants.EXPANSION_VISIBLE &&

                oldExpansion != KeyguardBouncerConstants.EXPANSION_VISIBLE

        ) {

            falsingCollector.onBouncerShown()

            primaryBouncerCallbackInteractor.dispatchFullyShown()

        } else if (

            expansion == KeyguardBouncer.EXPANSION_HIDDEN &&

                oldExpansion != KeyguardBouncer.EXPANSION_HIDDEN

            expansion == KeyguardBouncerConstants.EXPANSION_HIDDEN &&

                oldExpansion != KeyguardBouncerConstants.EXPANSION_HIDDEN

        ) {

            /*

             * There are cases where #hide() was not invoked, such as when
@@ -222,8 +222,8 @@ constructor( 
            DejankUtils.postAfterTraversal { primaryBouncerCallbackInteractor.dispatchReset() }

            primaryBouncerCallbackInteractor.dispatchFullyHidden()

        } else if (

            expansion != KeyguardBouncer.EXPANSION_VISIBLE &&

                oldExpansion == KeyguardBouncer.EXPANSION_VISIBLE

            expansion != KeyguardBouncerConstants.EXPANSION_VISIBLE &&

                oldExpansion == KeyguardBouncerConstants.EXPANSION_VISIBLE

        ) {

            primaryBouncerCallbackInteractor.dispatchStartingToHide()

            repository.setPrimaryStartingToHide(true)
@@ -303,7 +303,7 @@ constructor( 
    fun isFullyShowing(): Boolean {

        return (repository.primaryBouncerShowingSoon.value ||

            repository.primaryBouncerVisible.value) &&

            repository.panelExpansionAmount.value == KeyguardBouncer.EXPANSION_VISIBLE &&

            repository.panelExpansionAmount.value == KeyguardBouncerConstants.EXPANSION_VISIBLE &&

            repository.primaryBouncerStartingDisappearAnimation.value == null

    }
@@ -315,8 +315,8 @@ constructor( 
    /** If bouncer expansion is between 0f and 1f non-inclusive. */

    fun isInTransit(): Boolean {

        return repository.primaryBouncerShowingSoon.value ||

            repository.panelExpansionAmount.value != KeyguardBouncer.EXPANSION_HIDDEN &&

                repository.panelExpansionAmount.value != KeyguardBouncer.EXPANSION_VISIBLE

            repository.panelExpansionAmount.value != KeyguardBouncerConstants.EXPANSION_HIDDEN &&

                repository.panelExpansionAmount.value != KeyguardBouncerConstants.EXPANSION_VISIBLE

    }



    /** Return whether bouncer is animating away. */

packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/KeyguardBouncerConstants.kt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.keyguard.shared.constants



object KeyguardBouncerConstants {

    /**

     * Values for the bouncer expansion represented as the panel expansion. Panel expansion 1f =

     * panel fully showing = bouncer fully hidden Panel expansion 0f = panel fully hiding = bouncer

     * fully showing

     */

    const val EXPANSION_HIDDEN = 1f

    const val EXPANSION_VISIBLE = 0f

}