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

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

Some cleanup in RecentsView 

> Merging overview and all-apps scrims into a single View
> Decoupling TaskMenuView from taskView

Bug: 184676497
Test: Manual

Change-Id: I49f7249eaa2a800054385ab8e73a441d6a1b5e16
parent fc3bc609

quickstep/res/layout/scrim_view.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.quickstep.views.AllAppsScrimView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:id="@+id/scrim_view" />
 
 No newline at end of file

quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java

+0 −17
Original line number Diff line number Diff line
@@ -18,12 +18,9 @@ package com.android.launcher3.uioverrides; 


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

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

import static com.android.launcher3.graphics.OverviewScrim.SCRIM_MULTIPLIER;

import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;

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

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

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

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

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

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

import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
@@ -40,7 +37,6 @@ import androidx.annotation.NonNull; 
import com.android.launcher3.BaseQuickstepLauncher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.graphics.OverviewScrim;

import com.android.launcher3.statemanager.StateManager.StateHandler;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.touch.PagedOrientationHandler;
@@ -70,9 +66,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
        TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);



        getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);

        OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();

        SCRIM_PROGRESS.set(scrim, state.getOverviewScrimAlpha(mLauncher));

        SCRIM_MULTIPLIER.set(scrim, 1f);

        getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());

        RECENTS_GRID_PROGRESS.set(mRecentsView,

                state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);
@@ -111,16 +104,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 


        setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,

                config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));

        OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();

        setter.setFloat(scrim, SCRIM_PROGRESS, toState.getOverviewScrimAlpha(mLauncher),

                config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));

        setter.setFloat(scrim, SCRIM_MULTIPLIER, 1f,

                config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));

        if (toState.areElementsVisible(mLauncher, LauncherState.SPLIT_PLACHOLDER_VIEW)) {

            scrim.updateStableScrimmedView(mLauncher.getSplitPlaceholderView());

        } else {

            scrim.updateStableScrimmedView(mLauncher.getOverviewPanel());

        }



        setter.setFloat(

                mRecentsView, getTaskModalnessProperty(),

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

+5 −0
Original line number Diff line number Diff line
@@ -90,4 +90,9 @@ public class AllAppsState extends LauncherState { 
    public LauncherState getHistoryForState(LauncherState previousState) {

        return previousState == OVERVIEW ? OVERVIEW : NORMAL;

    }



    @Override

    public float getWorkspaceScrimAlpha(Launcher launcher) {

        return 1;

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class OverviewState extends LauncherState { 
    }



    @Override

    public float getOverviewScrimAlpha(Launcher launcher) {

    public float getWorkspaceScrimAlpha(Launcher launcher) {

        return 1f;

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.launcher3.anim.Interpolators; 
import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.graphics.OverviewScrim;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.touch.SingleAxisSwipeDetector;

import com.android.launcher3.util.TouchController;
@@ -141,10 +140,6 @@ public class NavBarToHomeTouchController implements TouchController, 
            AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,

                    builder);



            builder.setFloat(mLauncher.getDragLayer().getOverviewScrim(),

                    OverviewScrim.SCRIM_MULTIPLIER, OVERVIEW_TO_HOME_SCRIM_MULTIPLIER,

                    PULLBACK_INTERPOLATOR);



            if (LIVE_TILE.get()) {

                builder.addOnFrameCallback(recentsView::redrawLiveTile);

            }