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

Commit 520d91f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't toggle scrollbar during predicitve back swipe to avoid flicker" into main

parents 4958ecfa 9eee6df6

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java

+0 −6
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Insettable;

import com.android.launcher3.R;

import com.android.launcher3.allapps.AllAppsRecyclerView;

import com.android.launcher3.anim.AnimatorListeners;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.config.FeatureFlags;
@@ -212,11 +211,6 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla 
        super.onScaleProgressChanged();

        mAppsView.setClipChildren(!mIsBackProgressing);

        mAppsView.getAppsRecyclerViewContainer().setClipChildren(!mIsBackProgressing);

        AllAppsRecyclerView rv = mAppsView.getActiveRecyclerView();

        if (rv != null && rv.getScrollbar() != null) {

            rv.getScrollbar().setVisibility(

                    mIsBackProgressing ? INVISIBLE : VISIBLE);

        }

    }



    @Override

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+0 −3
Original line number Diff line number Diff line
@@ -295,9 +295,6 @@ public class AllAppsTransitionController 
        mLauncher.getScrimView().setScrimHeaderScale(scaleProgress);



        AllAppsRecyclerView rv = mLauncher.getAppsView().getActiveRecyclerView();

        if (rv != null && rv.getScrollbar() != null) {

            rv.getScrollbar().setVisibility(scaleProgress < 1f ? View.INVISIBLE : View.VISIBLE);

        }



        // Disable view clipping from all apps' RecyclerView up to all apps view during scale

        // animation, and vice versa. The goal is to display extra roll(s) app icons (rendered in

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+0 −15
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.animation.Animator; 
import android.content.Context;

import android.content.res.Resources;

import android.graphics.Rect;

import android.os.Build;

import android.os.Bundle;

import android.os.Parcelable;

import android.os.Process;
@@ -47,12 +46,9 @@ import android.view.animation.Interpolator; 
import android.widget.Button;

import android.widget.LinearLayout;

import android.widget.TextView;

import android.window.BackEvent;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.Px;

import androidx.annotation.RequiresApi;

import androidx.annotation.VisibleForTesting;

import androidx.recyclerview.widget.DefaultItemAnimator;

import androidx.recyclerview.widget.RecyclerView;
@@ -903,17 +899,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
        return isFoldUnFold || useDifferentLayoutOnOrientationChange;

    }



    @Override

    @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    public void onBackProgressed(@NonNull BackEvent backEvent) {

        super.onBackProgressed(backEvent);

        // In two pane picker, scroll bar is always hidden.

        if (!isTwoPane()) {

            mFastScroller.setVisibility(

                    backEvent.getProgress() > 0 ? View.INVISIBLE : View.VISIBLE);

        }

    }



    @Override

    public void onBackInvoked() {

        if (mIsInSearchMode) {