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

Commit 80a315e5 authored by Shikha Malhotra's avatar Shikha Malhotra Committed by Android (Google) Code Review
Browse files

Merge "Review comments followup" into tm-dev

parents d9939d81 f78da1ba

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

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            endListener = composeViewContentAnimator(launcherAnimator, alphas, scales);

        } else {

            List<View> viewsToAnimate = new ArrayList<>();

            Workspace workspace = mLauncher.getWorkspace();

            Workspace<?> workspace = mLauncher.getWorkspace();

            workspace.forEachVisiblePage(

                    view -> viewsToAnimate.add(((CellLayout) view).getShortcutsAndWidgets()));

quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class HotseatEduController { 
    private int placeFoldersInWorkspace(ArrayDeque<FolderInfo> folders) {

        if (folders.isEmpty()) return 0;



        Workspace workspace = mLauncher.getWorkspace();

        Workspace<?> workspace = mLauncher.getWorkspace();

        InvariantDeviceProfile idp = mLauncher.getDeviceProfile().inv;



        GridOccupancy[] occupancyList = new GridOccupancy[workspace.getChildCount()];
@@ -176,7 +176,7 @@ public class HotseatEduController { 
     * @return pageId where items are migrated

     */

    private int migrateHotseatWhole() {

        Workspace workspace = mLauncher.getWorkspace();

        Workspace<?> workspace = mLauncher.getWorkspace();



        int pageId = -1;

        int toRow = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 


        switch (state.ordinal) {

            case HINT_STATE_ORDINAL: {

                Workspace workspace = getWorkspace();

                Workspace<?> workspace = getWorkspace();

                getStateManager().goToState(NORMAL);

                if (workspace.getNextPage() != Workspace.DEFAULT_PAGE) {

                    workspace.post(workspace::moveToDefaultScreen);

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

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

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



            Workspace workspace = mActivity.getWorkspace();

            Workspace<?> workspace = mActivity.getWorkspace();

            // Start from a higher workspace scale, but only if we're invisible so we don't jump.

            boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE;

            if (isWorkspaceVisible) {

quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class LauncherUnfoldAnimationController { 
    // Percentage of the width of the quick search bar that will be reduced

    // from the both sides of the bar when progress is 0

    private static final float MAX_WIDTH_INSET_FRACTION = 0.15f;

    private static final FloatProperty<Workspace> WORKSPACE_SCALE_PROPERTY =

    private static final FloatProperty<Workspace<?>> WORKSPACE_SCALE_PROPERTY =

            WORKSPACE_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_UNFOLD_ANIMATION);

    private static final FloatProperty<Hotseat> HOTSEAT_SCALE_PROPERTY =

            HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_UNFOLD_ANIMATION);