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

Commit 28e39335 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Add ENABLE_SCRIM_FOR_APP_LAUNCH feature flag." into sc-dev

parents d2ad9798 b73e5917

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

+21 −15
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5; 
import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;

import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;

import static com.android.launcher3.anim.Interpolators.LINEAR;

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

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

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

import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
@@ -508,6 +509,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                launcherAnimator.play(scaleAnim);

            });



            final boolean scrimEnabled = ENABLE_SCRIM_FOR_APP_LAUNCH.get();

            if (scrimEnabled) {

                int scrimColor = Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor);

                int scrimColorTrans = ColorUtils.setAlphaComponent(scrimColor, 0);

                int[] colors = isAppOpening
@@ -523,6 +526,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                    scrim.setInterpolator(DEACCEL_1_5);

                    launcherAnimator.play(scrim);

                }

            }



            // Pause page indicator animations as they lead to layer trashing.

            mLauncher.getWorkspace().getPageIndicator().pauseAnimations();
@@ -532,7 +536,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                    SCALE_PROPERTY.set(view, 1f);

                    view.setLayerType(View.LAYER_TYPE_NONE, null);

                });

                scrimView.setBackgroundColor(Color.TRANSPARENT);

                if (scrimEnabled) {

                    mLauncher.getScrimView().setBackgroundColor(Color.TRANSPARENT);

                }

                mLauncher.getWorkspace().getPageIndicator().skipAnimationsToEnd();

            };

        }

src/com/android/launcher3/config/FeatureFlags.java

+4 −0
Original line number Diff line number Diff line
@@ -220,6 +220,10 @@ public final class FeatureFlags { 
            "ENABLE_TWO_PANEL_HOME", false,

            "Uses two panel on home screen. Only applicable on large screen devices.");



    public static final BooleanFlag ENABLE_SCRIM_FOR_APP_LAUNCH = getDebugFlag(

            "ENABLE_SCRIM_FOR_APP_LAUNCH", false,

            "Enables scrim during app launch animation.");



    public static final BooleanFlag ENABLE_SPLIT_SELECT = getDebugFlag(

            "ENABLE_SPLIT_SELECT", false, "Uses new split screen selection overview UI");