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

Commit 2e64c71a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26497774',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26497774', 'googleplex-android-review.googlesource.com/26544858', 'googleplex-android-review.googlesource.com/26553571'] into 24Q2-release.

Change-Id: I9688377ae9f2d17236449736df91b7302b8f6a0b
parents f265be31 0425766b

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

+1 −2
Original line number Diff line number Diff line
@@ -135,8 +135,7 @@ public class QuickstepAtomicAnimationFactory extends 
                config.duration = Math.max(config.duration, scrollDuration);



                // Sync scroll so that it ends before or at the same time as the taskbar animation.

                if (DisplayController.isTransientTaskbar(mActivity)

                        && mActivity.getDeviceProfile().isTaskbarPresent) {

                if (mActivity.getDeviceProfile().isTaskbarPresent) {

                    config.duration = Math.min(config.duration, TASKBAR_TO_HOME_DURATION);

                }

                overview.snapToPage(DEFAULT_PAGE, Math.toIntExact(config.duration));

quickstep/src/com/android/quickstep/ViewUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class ViewUtils { 
        boolean mSurfaceCallbackRegistered = false;

        boolean mFinished;



        int mDeferFrameCount = 1;

        int mDeferFrameCount = 2;



        FrameHandler(View view, Runnable finishCallback, BooleanSupplier cancelled) {

            mViewRoot = view.getViewRootImpl();

quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.java

+6 −0
Original line number Diff line number Diff line
@@ -304,6 +304,12 @@ public class LandscapePagedViewHandler implements RecentsPagedOrientationHandler 
        }

    }



    @Override

    public int getTaskMenuHeight(float taskInsetMargin, DeviceProfile deviceProfile,

            float taskMenuX, float taskMenuY) {

        return (int) (taskMenuX - taskInsetMargin);

    }



    @Override

    public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,

            LinearLayout taskMenuLayout, int dividerSpacing,

quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java

+6 −0
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ public class PortraitPagedViewHandler extends DefaultPagedViewHandler implements 
                : thumbnailView.getMeasuredWidth()) - (2 * padding);

    }



    @Override

    public int getTaskMenuHeight(float taskInsetMargin, DeviceProfile deviceProfile,

            float taskMenuX, float taskMenuY) {

        return (int) (deviceProfile.availableHeightPx - taskInsetMargin - taskMenuY);

    }



    @Override

    public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,

            LinearLayout taskMenuLayout, int dividerSpacing,

quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.java

+3 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ public interface RecentsPagedOrientationHandler extends PagedOrientationHandler 
            View taskMenuView, float taskInsetMargin, View taskViewIcon);

    int getTaskMenuWidth(View thumbnailView, DeviceProfile deviceProfile,

            @StagePosition int stagePosition);



    int getTaskMenuHeight(float taskInsetMargin, DeviceProfile deviceProfile, float taskMenuX,

            float taskMenuY);

    /**

     * Sets linear layout orientation for {@link com.android.launcher3.popup.SystemShortcut} items

     * inside task menu view.