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

Commit 38bc885d authored by Uwais Ashraf's avatar Uwais Ashraf Committed by Alex Chau
Browse files

Revert "Update Split button visibility based on DeviceProfile change" 

This reverts commit 170306d5.

Reason for revert: Cause of b/332673787

Bug: 321291049
Change-Id: Id5ae99d28a7497debaabbc5ed09cd18f9c253750
parent 170306d5

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

+4 −5
Original line number Diff line number Diff line
@@ -243,13 +243,13 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 


    /**

     * Updates a batch of flags to hide and show actions buttons for tablet/non tablet case.

     * @param isSmallScreen True if the current display is a small screen.

     */

    private void updateForIsTablet() {

        assert mDp != null;

    public void updateForSmallScreen(boolean isSmallScreen) {

        // Update flags to see if split button should be hidden.

        updateSplitButtonHiddenFlags(FLAG_SMALL_SCREEN_HIDE_SPLIT, !mDp.isTablet);

        updateSplitButtonHiddenFlags(FLAG_SMALL_SCREEN_HIDE_SPLIT, isSmallScreen);

        // Update flags to see if save app pair button should be hidden.

        updateAppPairButtonHiddenFlags(FLAG_SMALL_SCREEN_HIDE_APP_PAIR, !mDp.isTablet);

        updateAppPairButtonHiddenFlags(FLAG_SMALL_SCREEN_HIDE_APP_PAIR, isSmallScreen);

    }



    /**
@@ -386,7 +386,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
        mDp = dp;

        mTaskSize.set(taskSize);

        updateVerticalMargin(DisplayController.getNavigationMode(getContext()));

        updateForIsTablet();



        requestLayout();

quickstep/src/com/android/quickstep/views/RecentsView.java

+2 −0
Original line number Diff line number Diff line
@@ -3962,6 +3962,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        // Update flags to see if actions bar should show buttons for a single task or a pair of

        // tasks.

        mActionsView.updateForGroupedTask(isCurrentSplit);

        // Update flags to see if actions bar should show buttons for tablets or phones.

        mActionsView.updateForSmallScreen(!mActivity.getDeviceProfile().isTablet);

        // Update flags for 1p/3p launchers

        mActionsView.updateFor3pLauncher(!supportsAppPairs());