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

Commit 1b40b731 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Using different resource size for touch region in landscape 

Bug: 132917885
Change-Id: Ib702fd17fecff980db2e1d00f05cd055bcc3185a
parent 136805ab

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

+13 −5
Original line number Diff line number Diff line
@@ -331,21 +331,29 @@ 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_VERTICAL_SIZE);

                            ResourceUtils.NAVBAR_LANDSCAPE_BOTTOM_SIZE);

                    break;

                default:

                    mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - getNavbarSize(

                            ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE);

            }

        } else {

            switch (defaultDisplay.getRotation()) {

                case Surface.ROTATION_90:

                    mSwipeTouchRegion.left = mSwipeTouchRegion.right

                            - getNavbarSize(ResourceUtils.NAVBAR_HORIZONTAL_SIZE);

                            - getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);

                    break;

                case Surface.ROTATION_270:

                    mSwipeTouchRegion.right = mSwipeTouchRegion.left

                            + getNavbarSize(ResourceUtils.NAVBAR_HORIZONTAL_SIZE);

                            + getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);

                    break;

                default:

                    mSwipeTouchRegion.top = mSwipeTouchRegion.bottom

                            - getNavbarSize(ResourceUtils.NAVBAR_VERTICAL_SIZE);

                            - getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE);

            }

        }

    }

src/com/android/launcher3/ResourceUtils.java

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



public class ResourceUtils {

    public static final String NAVBAR_VERTICAL_SIZE = "navigation_bar_frame_height";

    public static final String NAVBAR_HORIZONTAL_SIZE = "navigation_bar_width";

    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 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
@@ -243,7 +243,7 @@ public abstract class AbstractLauncherUiTest { 
     */

    protected UiObject2 scrollAndFind(UiObject2 container, BySelector condition) {

        final int margin = ResourceUtils.getNavbarSize(

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

                ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_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
@@ -69,7 +69,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { 
                "want to get app icon on all apps")) {

            final UiObject2 allAppsContainer = verifyActiveContainer();

            allAppsContainer.setGestureMargins(0, 0, 0,

                    ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_VERTICAL_SIZE,

                    ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE,

                            mLauncher.getResources()) + 1);

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

            if (!hasClickableIcon(allAppsContainer, 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_VERTICAL_SIZE,

                    ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE,

                            mLauncher.getResources()) + 1);

            widgetsContainer.fling(Direction.DOWN,

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