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

Commit 2705be56 authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Revert "DO NOT MERGE Fix the cutout of magnification border" am: c91a43e1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773

Change-Id: I333af6ef9a8d29385e0cd5e08b4c3c3887f2b801
parents 4c818e40 c91a43e1

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+0 −16
Original line number Diff line number Diff line
@@ -510,20 +510,4 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
    protected boolean isUserSetupComplete() {

        return mIsUserSetupComplete;

    }



    /**

     * Called when we determine the touchable region.

     *

     * @param exclude {@code true} then the magnification region computation will omit the window.

     */

    public void excludeFromMagnificationRegion(boolean exclude) {

        if (exclude) {

            mWindowLayoutParams.privateFlags |=

                    WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION;

        } else {

            mWindowLayoutParams.privateFlags &=

                    ~WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION;

        }

        mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams);

    }

}

quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java

+0 −4
Original line number Diff line number Diff line
@@ -137,14 +137,12 @@ public class TaskbarDragLayerController { 
            // Always have nav buttons be touchable

            mControllers.navbarButtonsViewController.addVisibleButtonsRegion(

                    mTaskbarDragLayer, insetsInfo.touchableRegion);

            boolean insetsIsTouchableRegion = true;



            if (mTaskbarDragLayer.getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {

                // Let touches pass through us.

                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);

            } else if (mControllers.navbarButtonsViewController.isImeVisible()) {

                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_CONTENT);

                insetsIsTouchableRegion = false;

            } else if (!mControllers.uiController.isTaskbarTouchable()) {

                // Let touches pass through us.

                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
@@ -153,11 +151,9 @@ public class TaskbarDragLayerController { 
                // Taskbar has some touchable elements, take over the full taskbar area

                insetsInfo.setTouchableInsets(mActivity.isTaskbarWindowFullscreen()

                        ? TOUCHABLE_INSETS_FRAME : TOUCHABLE_INSETS_CONTENT);

                insetsIsTouchableRegion = false;

            } else {

                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);

            }

            mActivity.excludeFromMagnificationRegion(insetsIsTouchableRegion);

        }



        /**