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

Commit 1b9afd4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reading navigation_bar_gesture_height for bottom swipe region" into ub-launcher3-qt-dev

parents 789fe60d f5d02b06

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+3 −11
Original line number Diff line number Diff line
@@ -331,16 +331,8 @@ public class TouchInteractionService extends Service implements 
        defaultDisplay.getRealSize(realSize);

        mSwipeTouchRegion.set(0, 0, realSize.x, realSize.y);

        if (mMode == Mode.NO_BUTTON) {

            switch (defaultDisplay.getRotation()) {

                case Surface.ROTATION_90:

                case Surface.ROTATION_270:

                    mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - getNavbarSize(

                            ResourceUtils.NAVBAR_LANDSCAPE_BOTTOM_SIZE);

                    break;

                default:

                    mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - getNavbarSize(

                            ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE);

            }

            mSwipeTouchRegion.top = mSwipeTouchRegion.bottom -

                    getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);

        } else {

            switch (defaultDisplay.getRotation()) {

                case Surface.ROTATION_90:
@@ -353,7 +345,7 @@ public class TouchInteractionService extends Service implements 
                    break;

                default:

                    mSwipeTouchRegion.top = mSwipeTouchRegion.bottom

                            - getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE);

                            - getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);

            }

        }

    }

src/com/android/launcher3/ResourceUtils.java

+2 −3
Original line number Diff line number Diff line
@@ -21,10 +21,9 @@ import android.util.DisplayMetrics; 
import android.util.TypedValue;



public class ResourceUtils {

    public static final String NAVBAR_PORTRAIT_BOTTOM_SIZE = "navigation_bar_frame_height";

    public static final String NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE = "navigation_bar_width";

    public static final String NAVBAR_LANDSCAPE_BOTTOM_SIZE

            = "navigation_bar_frame_height_landscape";

    public static final String NAVBAR_BOTTOM_GESTURE_SIZE = "navigation_bar_gesture_height";





    public static int getNavbarSize(String resName, Resources res) {

        return getDimenByName(resName, res, 48);

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ public abstract class AbstractLauncherUiTest { 
     */

    protected UiObject2 scrollAndFind(UiObject2 container, BySelector condition) {

        final int margin = ResourceUtils.getNavbarSize(

                ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE, mLauncher.getResources()) + 1;

                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources()) + 1;

        container.setGestureMargins(0, 0, 0, margin);



        int i = 0;

tests/tapl/com/android/launcher3/tapl/AllApps.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { 
                    0,

                    getSearchBox(allAppsContainer).getVisibleBounds().bottom + 1,

                    0,

                    ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE,

                    ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE,

                            mLauncher.getResources()) + 1);

            final BySelector appIconSelector = AppIcon.getAppIconSelector(appName, mLauncher);

            if (!hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector)) {

tests/tapl/com/android/launcher3/tapl/Widgets.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer { 
            LauncherInstrumentation.log("Widgets.flingForward enter");

            final UiObject2 widgetsContainer = verifyActiveContainer();

            widgetsContainer.setGestureMargins(0, 0, 0,

                    ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE,

                    ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE,

                            mLauncher.getResources()) + 1);

            widgetsContainer.fling(Direction.DOWN,

                    (int) (FLING_SPEED * mLauncher.getDisplayDensity()));