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

Commit 07ae9943 authored by Nick Chameyev's avatar Nick Chameyev Committed by Android (Google) Code Review
Browse files

Merge "Fold to AOD animation: add screen off animation controller"

parents 61346426 068913a8

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.systemui.statusbar.notification.PropertyAnimator; 
import com.android.systemui.statusbar.notification.stack.AnimationProperties;

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

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

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

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

import com.android.systemui.statusbar.policy.ConfigurationController;

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

import com.android.systemui.util.ViewController;
@@ -70,7 +70,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
            DozeParameters dozeParameters,

            KeyguardUnlockAnimationController keyguardUnlockAnimationController,

            SmartspaceTransitionController smartspaceTransitionController,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {

            ScreenOffAnimationController screenOffAnimationController) {

        super(keyguardStatusView);

        mKeyguardSliceViewController = keyguardSliceViewController;

        mKeyguardClockSwitchController = keyguardClockSwitchController;
@@ -79,7 +79,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        mDozeParameters = dozeParameters;

        mKeyguardStateController = keyguardStateController;

        mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController,

                keyguardStateController, dozeParameters, unlockedScreenOffAnimationController,

                keyguardStateController, dozeParameters, screenOffAnimationController,

                /* animateYPos= */ true, /* visibleOnCommunal= */ false);

        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;

        mSmartspaceTransitionController = smartspaceTransitionController;

packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java

+6 −6
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.systemui.statusbar.notification.PropertyAnimator; 
import com.android.systemui.statusbar.notification.stack.AnimationProperties;

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

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

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

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

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



/**
@@ -42,7 +42,7 @@ public class KeyguardVisibilityHelper { 
    private final CommunalStateController mCommunalStateController;

    private final KeyguardStateController mKeyguardStateController;

    private final DozeParameters mDozeParameters;

    private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    private final ScreenOffAnimationController mScreenOffAnimationController;

    private final boolean mVisibleOnCommunal;

    private boolean mAnimateYPos;

    private boolean mKeyguardViewVisibilityAnimating;
@@ -53,14 +53,14 @@ public class KeyguardVisibilityHelper { 
            CommunalStateController communalStateController,

            KeyguardStateController keyguardStateController,

            DozeParameters dozeParameters,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,

            ScreenOffAnimationController screenOffAnimationController,

            boolean animateYPos,

            boolean visibleOnCommunal) {

        mView = view;

        mCommunalStateController = communalStateController;

        mKeyguardStateController = keyguardStateController;

        mDozeParameters = dozeParameters;

        mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

        mScreenOffAnimationController = screenOffAnimationController;

        mAnimateYPos = animateYPos;

        mVisibleOnCommunal = visibleOnCommunal;

    }
@@ -136,12 +136,12 @@ public class KeyguardVisibilityHelper { 
                            .setStartDelay(delay);

                }

                animator.start();

            } else if (mUnlockedScreenOffAnimationController.shouldAnimateInKeyguard()) {

            } else if (mScreenOffAnimationController.shouldAnimateInKeyguard()) {

                mKeyguardViewVisibilityAnimating = true;



                // Ask the screen off animation controller to animate the keyguard visibility for us

                // since it may need to be cancelled due to keyguard lifecycle events.

                mUnlockedScreenOffAnimationController.animateInKeyguard(

                mScreenOffAnimationController.animateInKeyguard(

                        mView, mAnimateKeyguardStatusViewVisibleEndRunnable);

            } else if (mLastOccludedState && !isOccluded) {

                // An activity was displayed over the lock screen, and has now gone away

packages/SystemUI/src/com/android/keyguard/TextAnimator.kt

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ class TextAnimator( 
            // No animation is requested, thus set base and target state to the same state.

            textInterpolator.progress = 1f

            textInterpolator.rebase()

            invalidateCallback()

        }

    }

}

packages/SystemUI/src/com/android/systemui/Dependency.java

+3 −4
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ import com.android.systemui.statusbar.phone.LightBarController; 
import com.android.systemui.statusbar.phone.LockscreenGestureLogger;

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

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

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

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

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

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

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

import com.android.systemui.statusbar.policy.AccessibilityController;

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;

import com.android.systemui.statusbar.policy.BatteryController;
@@ -366,7 +366,7 @@ public class Dependency { 
    @Inject Lazy<InternetDialogFactory> mInternetDialogFactory;

    @Inject Lazy<FeatureFlags> mFeatureFlagsLazy;

    @Inject Lazy<NotificationSectionsManager> mNotificationSectionsManagerLazy;

    @Inject Lazy<UnlockedScreenOffAnimationController> mUnlockedScreenOffAnimationControllerLazy;

    @Inject Lazy<ScreenOffAnimationController> mScreenOffAnimationController;

    @Inject Lazy<AmbientState> mAmbientStateLazy;

    @Inject Lazy<GroupMembershipManager> mGroupMembershipManagerLazy;

    @Inject Lazy<GroupExpansionManager> mGroupExpansionManagerLazy;
@@ -586,8 +586,7 @@ public class Dependency { 
        mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get);

        mProviders.put(StatusBarContentInsetsProvider.class, mContentInsetsProviderLazy::get);

        mProviders.put(NotificationSectionsManager.class, mNotificationSectionsManagerLazy::get);

        mProviders.put(UnlockedScreenOffAnimationController.class,

                mUnlockedScreenOffAnimationControllerLazy::get);

        mProviders.put(ScreenOffAnimationController.class, mScreenOffAnimationController::get);

        mProviders.put(AmbientState.class, mAmbientStateLazy::get);

        mProviders.put(GroupMembershipManager.class, mGroupMembershipManagerLazy::get);

        mProviders.put(GroupExpansionManager.class, mGroupExpansionManagerLazy::get);

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java

+6 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
        LayoutTransition transition = new LayoutTransition();

        transition.setDuration(200);



        // Animates appearing/disappearing of the battery percentage text using fade-in/fade-out

        // and disables all other animation types

        ObjectAnimator appearAnimator = ObjectAnimator.ofFloat(null, "alpha", 0f, 1f);

        transition.setAnimator(LayoutTransition.APPEARING, appearAnimator);

        transition.setInterpolator(LayoutTransition.APPEARING, Interpolators.ALPHA_IN);
@@ -143,6 +145,10 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
        transition.setInterpolator(LayoutTransition.DISAPPEARING, Interpolators.ALPHA_OUT);

        transition.setAnimator(LayoutTransition.DISAPPEARING, disappearAnimator);



        transition.setAnimator(LayoutTransition.CHANGE_APPEARING, null);

        transition.setAnimator(LayoutTransition.CHANGE_DISAPPEARING, null);

        transition.setAnimator(LayoutTransition.CHANGING, null);



        setLayoutTransition(transition);

    }