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

Commit d8590608 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Merging MultiValueAlpha with MultiPropertyFactory 

Bug: 246644619
Test: Presubmi
Change-Id: Id5abc5f3169544656f1139ae17ca59e34ac65dac
parent b9bced07

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+9 −7
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_SCRIM_FOR_APP_LAU 
import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION;

import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;

import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;

import static com.android.launcher3.statehandlers.DepthController.STATE_DEPTH;

import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE;

import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;

import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;

import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
@@ -388,7 +388,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                @Override

                public void onAnimationStart(Animator animation) {

                    mLauncher.addOnResumeCallback(() ->

                            ObjectAnimator.ofFloat(mLauncher.getDepthController(), STATE_DEPTH,

                            ObjectAnimator.ofFloat(mLauncher.getDepthController().stateDepth,

                                    MULTI_PROPERTY_VALUE,

                                    mLauncher.getStateManager().getState().getDepth(

                                            mLauncher)).start());

                }
@@ -412,7 +413,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            @Override

            public void onAnimationStart(Animator animation) {

                mLauncher.addOnResumeCallback(() ->

                        ObjectAnimator.ofFloat(mLauncher.getDepthController(), STATE_DEPTH,

                        ObjectAnimator.ofFloat(mLauncher.getDepthController().stateDepth,

                                MULTI_PROPERTY_VALUE,

                                mLauncher.getStateManager().getState().getDepth(

                                        mLauncher)).start());

            }
@@ -1050,8 +1052,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                && BlurUtils.supportsBlursOnWindows();



        MyDepthController depthController = new MyDepthController(mLauncher);

        ObjectAnimator backgroundRadiusAnim = ObjectAnimator.ofFloat(depthController, STATE_DEPTH,

                        BACKGROUND_APP.getDepth(mLauncher))

        ObjectAnimator backgroundRadiusAnim = ObjectAnimator.ofFloat(depthController.stateDepth,

                        MULTI_PROPERTY_VALUE, BACKGROUND_APP.getDepth(mLauncher))

                .setDuration(APP_LAUNCH_DURATION);



        if (allowBlurringLauncher) {
@@ -1591,8 +1593,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                            true /* animateOverviewScrim */, launcherView).getAnimators());



                    if (!areAllTargetsTranslucent(appTargets)) {

                        anim.play(ObjectAnimator.ofFloat(mLauncher.getDepthController(),

                                STATE_DEPTH,

                        anim.play(ObjectAnimator.ofFloat(mLauncher.getDepthController().stateDepth,

                                MULTI_PROPERTY_VALUE,

                                BACKGROUND_APP.getDepth(mLauncher), NORMAL.getDepth(mLauncher)));

                    }

quickstep/src/com/android/launcher3/statehandlers/DepthController.java

+7 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.launcher3.statehandlers; 
import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;

import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;

import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -112,7 +113,7 @@ public class DepthController extends BaseDepthController implements StateHandler 
            return;

        }



        STATE_DEPTH.set(this, toState.getDepth(mLauncher));

        stateDepth.setValue(toState.getDepth(mLauncher));

        if (toState == LauncherState.BACKGROUND_APP) {

            mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener);

        }
@@ -127,7 +128,8 @@ public class DepthController extends BaseDepthController implements StateHandler 
        }



        float toDepth = toState.getDepth(mLauncher);

        animation.setFloat(this, STATE_DEPTH, toDepth, config.getInterpolator(ANIM_DEPTH, LINEAR));

        animation.setFloat(stateDepth, MULTI_PROPERTY_VALUE, toDepth,

                config.getInterpolator(ANIM_DEPTH, LINEAR));

    }



    @Override
@@ -140,7 +142,7 @@ public class DepthController extends BaseDepthController implements StateHandler 
    public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {

        mIgnoreStateChangesDuringMultiWindowAnimation = true;



        ObjectAnimator mwAnimation = ObjectAnimator.ofFloat(this, STATE_DEPTH,

        ObjectAnimator mwAnimation = ObjectAnimator.ofFloat(stateDepth, MULTI_PROPERTY_VALUE,

                mLauncher.getStateManager().getState().getDepth(mLauncher, isInMultiWindowMode))

                .setDuration(300);

        mwAnimation.addListener(new AnimatorListenerAdapter() {
@@ -158,8 +160,8 @@ public class DepthController extends BaseDepthController implements StateHandler 
        writer.println(prefix + "\tmMaxBlurRadius=" + mMaxBlurRadius);

        writer.println(prefix + "\tmCrossWindowBlursEnabled=" + mCrossWindowBlursEnabled);

        writer.println(prefix + "\tmSurface=" + mSurface);

        writer.println(prefix + "\tmStateDepth=" + STATE_DEPTH.get(this));

        writer.println(prefix + "\tmWidgetDepth=" + WIDGET_DEPTH.get(this));

        writer.println(prefix + "\tmStateDepth=" + stateDepth.getValue());

        writer.println(prefix + "\tmWidgetDepth=" + widgetDepth.getValue());

        writer.println(prefix + "\tmCurrentBlur=" + mCurrentBlur);

        writer.println(prefix + "\tmInEarlyWakeUp=" + mInEarlyWakeUp);

        writer.println(prefix + "\tmIgnoreStateChangesDuringMultiWindowAnimation="

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+9 −7
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RE 
import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_KEYGUARD;

import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_SMALL_SCREEN;

import static com.android.launcher3.taskbar.Utilities.appendFlag;

import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED;
@@ -84,6 +85,7 @@ import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton; 
import com.android.launcher3.taskbar.navbutton.NavButtonLayoutFactory;

import com.android.launcher3.taskbar.navbutton.NavButtonLayoutFactory.NavButtonLayoutter;

import com.android.launcher3.util.DimensionUtils;

import com.android.launcher3.util.MultiPropertyFactory.MultiProperty;

import com.android.launcher3.util.MultiValueAlpha;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.views.BaseDragLayer;
@@ -227,13 +229,13 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 


        mPropertyHolders.add(new StatePropertyHolder(

                mControllers.taskbarViewController.getTaskbarIconAlpha()

                        .getProperty(ALPHA_INDEX_KEYGUARD),

                        .get(ALPHA_INDEX_KEYGUARD),

                flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0

                        && (flags & FLAG_SCREEN_PINNING_ACTIVE) == 0));



        mPropertyHolders.add(new StatePropertyHolder(

                mControllers.taskbarViewController.getTaskbarIconAlpha()

                        .getProperty(ALPHA_INDEX_SMALL_SCREEN),

                        .get(ALPHA_INDEX_SMALL_SCREEN),

                flags -> (flags & FLAG_SMALL_SCREEN) == 0));



        mPropertyHolders.add(new StatePropertyHolder(mControllers.taskbarDragLayerController
@@ -340,7 +342,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
        mBackButtonAlpha = new MultiValueAlpha(mBackButton, NUM_ALPHA_CHANNELS);

        mBackButtonAlpha.setUpdateVisibility(true);

        mPropertyHolders.add(new StatePropertyHolder(

                mBackButtonAlpha.getProperty(ALPHA_INDEX_KEYGUARD_OR_DISABLE),

                mBackButtonAlpha.get(ALPHA_INDEX_KEYGUARD_OR_DISABLE),

                flags -> {

                    // Show only if not disabled, and if not on the keyguard or otherwise only when

                    // the bouncer or a lockscreen app is showing above the keyguard
@@ -368,7 +370,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
        mHomeButtonAlpha = new MultiValueAlpha(mHomeButton, NUM_ALPHA_CHANNELS);

        mHomeButtonAlpha.setUpdateVisibility(true);

        mPropertyHolders.add(

                new StatePropertyHolder(mHomeButtonAlpha.getProperty(

                new StatePropertyHolder(mHomeButtonAlpha.get(

                        ALPHA_INDEX_KEYGUARD_OR_DISABLE),

                flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 &&

                        (flags & FLAG_DISABLE_HOME) == 0));
@@ -720,7 +722,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 


            // Hide back button in SUW if keyboard is showing (IME draws its own back).

            mPropertyHolders.add(new StatePropertyHolder(

                    mBackButtonAlpha.getProperty(ALPHA_INDEX_SUW),

                    mBackButtonAlpha.get(ALPHA_INDEX_SUW),

                    flags -> (flags & FLAG_IME_VISIBLE) == 0));



            // TODO(b/210906568) Dark intensity is currently not propagated during setup, so set
@@ -1046,9 +1048,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
            mAnimator.addListener(new AlphaUpdateListener(view));

        }



        StatePropertyHolder(MultiValueAlpha.AlphaProperty alphaProperty,

        StatePropertyHolder(MultiProperty alphaProperty,

                IntPredicate enableCondition) {

            this(alphaProperty, enableCondition, MultiValueAlpha.VALUE, 1, 0);

            this(alphaProperty, enableCondition, MULTI_PROPERTY_VALUE, 1, 0);

        }



        StatePropertyHolder(AnimatedFloat animatedFloat, IntPredicate enableCondition) {

quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java

+4 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.RevealOutlineAnimation;

import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;

import com.android.launcher3.util.Executors;

import com.android.launcher3.util.MultiPropertyFactory;

import com.android.launcher3.util.MultiValueAlpha;

import com.android.quickstep.AnimatedFloat;

import com.android.systemui.shared.navigationbar.RegionSamplingHelper;
@@ -105,7 +106,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT 
                    .getDimensionPixelSize(R.dimen.taskbar_stashed_handle_width);

        }



        mTaskbarStashedHandleAlpha.getProperty(ALPHA_INDEX_STASHED).setValue(

        mTaskbarStashedHandleAlpha.get(ALPHA_INDEX_STASHED).setValue(

                isPhoneGestureNavMode(deviceProfile) ? 1 : 0);

        mTaskbarStashedHandleHintScale.updateValue(1f);
@@ -166,7 +167,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT 
        return TaskbarManager.isPhoneMode(deviceProfile) && !mActivity.isThreeButtonNav();

    }



    public MultiValueAlpha getStashedHandleAlpha() {

    public MultiPropertyFactory<View> getStashedHandleAlpha() {

        return mTaskbarStashedHandleAlpha;

    }
@@ -222,7 +223,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT 
     * Should be called when the home button is disabled, so we can hide this handle as well.

     */

    public void setIsHomeButtonDisabled(boolean homeDisabled) {

        mTaskbarStashedHandleAlpha.getProperty(ALPHA_INDEX_HOME_DISABLED).setValue(

        mTaskbarStashedHandleAlpha.get(ALPHA_INDEX_HOME_DISABLED).setValue(

                homeDisabled ? 0 : 1);

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
    private void onNotificationShadeExpandChanged(boolean isExpanded, boolean skipAnim) {

        float alpha = isExpanded ? 0 : 1;

        AnimatorSet anim = new AnimatorSet();

        anim.play(mControllers.taskbarViewController.getTaskbarIconAlpha().getProperty(

        anim.play(mControllers.taskbarViewController.getTaskbarIconAlpha().get(

                TaskbarViewController.ALPHA_INDEX_NOTIFICATION_EXPANDED).animateToValue(alpha));

        if (!isThreeButtonNav()) {

            anim.play(mControllers.taskbarDragLayerController.getNotificationShadeBgTaskbar()