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

Commit 86b20648 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Fix translation speed for notifications." into tm-dev am:... 

Merge "[Bouncer] Fix translation speed for notifications." into tm-dev am: 56e8e8e7 am: a3f2c6e7

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
        public void onPanelExpansionChanged(

                float fraction, boolean expanded, boolean tracking) {

            mPanelExpansionFraction =

                    mKeyguardViewManager.bouncerIsInTransit() ? BouncerPanelExpansionCalculator

                    mKeyguardViewManager.isBouncerInTransit() ? BouncerPanelExpansionCalculator

                            .aboutToShowBouncerProgress(fraction) : fraction;

            updateAlpha();

        }

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        } else if (progress > 0 && view.getVisibility() != View.VISIBLE) {

            view.setVisibility((View.VISIBLE));

        }

        float alpha = mQSPanelController.bouncerInTransit()

        float alpha = mQSPanelController.isBouncerInTransit()

                ? BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(progress)

                : ShadeInterpolation.getContentAlpha(progress);

        view.setAlpha(alpha);

packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java

+2 −2
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
     *

     * @return if bouncer is in transit

     */

    public boolean bouncerInTransit() {

        return mStatusBarKeyguardViewManager.bouncerIsInTransit();

    public boolean isBouncerInTransit() {

        return mStatusBarKeyguardViewManager.isBouncerInTransit();

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java

+18 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow 
import com.android.systemui.statusbar.notification.row.ExpandableView;

import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm.BypassController;

import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm.SectionProvider;

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



import javax.inject.Inject;
@@ -45,6 +46,10 @@ public class AmbientState { 


    private final SectionProvider mSectionProvider;

    private final BypassController mBypassController;

    /**

     *  Used to read bouncer states.

     */

    private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private int mScrollY;

    private boolean mDimmed;

    private ActivatableNotificationView mActivatedChild;
@@ -204,9 +209,11 @@ public class AmbientState { 
    public AmbientState(

            Context context,

            @NonNull SectionProvider sectionProvider,

            @NonNull BypassController bypassController) {

            @NonNull BypassController bypassController,

            @Nullable StatusBarKeyguardViewManager statusBarKeyguardViewManager) {

        mSectionProvider = sectionProvider;

        mBypassController = bypassController;

        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        reload(context);

    }
@@ -661,4 +668,14 @@ public class AmbientState { 
    public int getStackTopMargin() {

        return mStackTopMargin;

    }



    /**

     * Check to see if we are about to show bouncer.

     *

     * @return if bouncer expansion is between 0 and 1.

     */

    public boolean isBouncerInTransit() {

        return mStatusBarKeyguardViewManager != null

                && mStatusBarKeyguardViewManager.isBouncerInTransit();

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.view.ViewGroup; 
import androidx.annotation.VisibleForTesting;



import com.android.internal.policy.SystemBarUtils;

import com.android.keyguard.BouncerPanelExpansionCalculator;

import com.android.systemui.R;

import com.android.systemui.animation.ShadeInterpolation;

import com.android.systemui.statusbar.EmptyShadeView;
@@ -431,7 +432,9 @@ public class StackScrollAlgorithm { 
        } else if (ambientState.isExpansionChanging()) {

            // Adjust alpha for shade open & close.

            float expansion = ambientState.getExpansionFraction();

            viewState.alpha = ShadeInterpolation.getContentAlpha(expansion);

            viewState.alpha = ambientState.isBouncerInTransit()

                    ? BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(expansion)

                    : ShadeInterpolation.getContentAlpha(expansion);

        }



        if (ambientState.isShadeExpanded() && view.mustStayOnScreen()