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

Commit 69cb35a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Some overview scrim and status bar color adjustments" into sc-dev

parents 0bcfe825 b4821887

quickstep/res/layout/fallback_recents_activity.xml

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ 
        android:layout_height="match_parent"

        android:clipChildren="false">



        <com.android.launcher3.views.ScrimView

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:id="@+id/scrim_view"

            android:background="@android:color/transparent" />



        <com.android.quickstep.fallback.FallbackRecentsView

            android:id="@id/overview_panel"

            android:layout_width="match_parent"

quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides.states; 
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;



import android.content.Context;

import android.graphics.Color;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.DeviceProfile;
@@ -86,6 +87,11 @@ public class BackgroundAppState extends OverviewState { 
        return 1f;

    }



    @Override

    public int getWorkspaceScrimColor(Launcher launcher) {

        return Color.TRANSPARENT;

    }



    public static float[] getOverviewScaleAndOffsetForBackgroundState(

            BaseDraggingActivity activity) {

        return new float[] {

quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.launcher3.uioverrides.states; 
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;



import com.android.launcher3.Launcher;

import com.android.launcher3.R;

import com.android.launcher3.util.Themes;



/**

 * State to indicate we are about to launch a recent task. Note that this state is only used when
@@ -38,6 +40,11 @@ public class QuickSwitchState extends BackgroundAppState { 
        return new ScaleAndTranslation(0.9f, 0, translationY);

    }



    @Override

    public int getWorkspaceScrimColor(Launcher launcher) {

        return Themes.getAttrColor(launcher, R.attr.overviewScrimColor);

    }



    @Override

    public float getVerticalProgress(Launcher launcher) {

        // Don't move all apps shelf while quick-switching (just let it fade).

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

+3 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR 
import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;

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

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

import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;

import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;

import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -143,10 +143,9 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll 
            if (tv != null) {

                sysuiFlags = tv.getThumbnail().getSysUiStatusNavFlags();

            }

            mLauncher.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, sysuiFlags);

            mLauncher.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, sysuiFlags);

        } else {

            mLauncher.getSystemUiController().updateUiState(

                    UI_STATE_OVERVIEW, mOverviewPanel.hasLightBackground());

            mLauncher.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);

        }

    }

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+3 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH 
import static com.android.launcher3.util.DisplayController.getSingleFrameMs;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;

import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.quickstep.GestureState.GestureEndTarget.HOME;

import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
@@ -664,11 +664,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            mRecentsAnimationController.setSplitScreenMinimized(swipeUpThresholdPassed);



            if (swipeUpThresholdPassed) {

                mActivity.getSystemUiController().updateUiState(

                        UI_STATE_OVERVIEW, mRecentsView.hasLightBackground());

                mActivity.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);

            } else {

                mActivity.getSystemUiController().updateUiState(

                        UI_STATE_OVERVIEW, centermostTaskFlags);

                        UI_STATE_FULLSCREEN_TASK, centermostTaskFlags);

            }

        }

    }