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

Commit 51f037d6 authored by Jon Miranda's avatar Jon Miranda
Browse files

Refactor edge of screen detection code. 

There were two resources that both defined the edge of the screen.

Change-Id: I82ab553cc3123ef54ff1f0c692d29f3678ad04ac
parent c48a89e5

res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -179,9 +179,6 @@ 
         also happens to equal 19dp-->

    <dimen name="deep_shortcuts_arrow_horizontal_offset">19dp</dimen>



<!-- Touch handling -->

    <dimen name="edge_of_screen_threshold">8dp</dimen>



<!-- Other -->

    <!-- Approximates the system status bar height. Not guaranteed to be always be correct. -->

    <dimen name="status_bar_height">24dp</dimen>

src/com/android/launcher3/DeviceProfile.java

+3 −3
Original line number Diff line number Diff line
@@ -612,10 +612,10 @@ public class DeviceProfile { 
        return new int[]{ padding, padding };

    }



    public boolean shouldIgnoreLongPressToOverview(float touchX, float edgeThreshold) {

    public boolean shouldIgnoreLongPressToOverview(float touchX) {

        boolean inMultiWindowMode = this != inv.landscapeProfile && this != inv.portraitProfile;

        boolean touchedLhsEdge = mInsets.left == 0 && touchX < edgeThreshold;

        boolean touchedRhsEdge = mInsets.right == 0 && touchX > (widthPx - edgeThreshold);

        boolean touchedLhsEdge = mInsets.left == 0 && touchX < edgeMarginPx;

        boolean touchedRhsEdge = mInsets.right == 0 && touchX > (widthPx - edgeMarginPx);

        return !inMultiWindowMode && (touchedLhsEdge || touchedRhsEdge);

    }

}

src/com/android/launcher3/Launcher.java

+2 −6
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ public class Launcher extends Activity 
    private UserEventDispatcher mUserEventDispatcher;



    private float mLastDispatchTouchEventX = 0.0f;

    private float mEdgeOfScreenThresholdPx = 0.0f;



    public ViewGroupFocusHelper mFocusHandler;

    private boolean mRotationEnabled = false;
@@ -395,9 +394,6 @@ public class Launcher extends Activity 


        setContentView(R.layout.launcher);



        mEdgeOfScreenThresholdPx = getResources()

                .getDimensionPixelSize(R.dimen.edge_of_screen_threshold);



        setupViews();

        mDeviceProfile.layout(this, false /* notifyListeners */);

        mExtractedColors = new ExtractedColors();
@@ -2718,8 +2714,8 @@ public class Launcher extends Activity 
        }





        boolean ignoreLongPressToOverview = mDeviceProfile.shouldIgnoreLongPressToOverview(

                mLastDispatchTouchEventX, mEdgeOfScreenThresholdPx);

        boolean ignoreLongPressToOverview =

                mDeviceProfile.shouldIgnoreLongPressToOverview(mLastDispatchTouchEventX);



        if (v instanceof Workspace) {

            if (!mWorkspace.isInOverviewMode()) {