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

Commit 894c0479 authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge "Removes deprecated uses of Display#getRealSize in Gesture Nav Edu." into tm-dev

parents fe5684c2 936c6c6e

quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java

+4 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.annotation.Nullable; 


import com.android.launcher3.ResourceUtils;

import com.android.launcher3.Utilities;

import com.android.launcher3.util.DisplayController;



/**

 * Utility class to handle edge swipes for back gestures.
@@ -115,12 +116,11 @@ public class EdgeBackGestureHandler implements OnTouchListener { 
            // Add a nav bar panel window.

            mEdgeBackPanel = new EdgeBackGesturePanel(mContext, parent, createLayoutParams());

            mEdgeBackPanel.setBackCallback(mBackCallback);

            if (mContext.getDisplay() != null) {

                mContext.getDisplay().getRealSize(mDisplaySize);

            Point currentSize = DisplayController.INSTANCE.get(mContext).getInfo().currentSize;

            mDisplaySize.set(currentSize.x, currentSize.y);

            mEdgeBackPanel.setDisplaySize(mDisplaySize);

        }

    }

    }



    void registerBackGestureAttemptCallback(BackGestureAttemptCallback callback) {

        mGestureCallback = callback;

quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java

+5 −8
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.SystemClock; 
import android.view.Display;

import android.view.GestureDetector;

import android.view.MotionEvent;

import android.view.Surface;

import android.view.View;

import android.view.View.OnTouchListener;

import android.view.ViewConfiguration;
@@ -47,6 +46,7 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.R;

import com.android.launcher3.ResourceUtils;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.DisplayController.NavigationMode;

import com.android.quickstep.util.MotionPauseDetector;

import com.android.quickstep.util.NavBarPosition;
@@ -92,13 +92,10 @@ public class NavBarGestureHandler implements OnTouchListener, 
    NavBarGestureHandler(Context context) {

        mContext = context;

        final Display display = mContext.getDisplay();

        final int displayRotation;

        if (display == null) {

            displayRotation = Surface.ROTATION_0;

        } else {

            displayRotation = display.getRotation();

            display.getRealSize(mDisplaySize);

        }

        DisplayController.Info displayInfo = DisplayController.INSTANCE.get(mContext).getInfo();

        final int displayRotation = displayInfo.rotation;

        Point currentSize = displayInfo.currentSize;

        mDisplaySize.set(currentSize.x, currentSize.y);

        mSwipeUpTouchTracker =

                new TriggerSwipeUpTouchTracker(context, true /*disableHorizontalSwipe*/,

                        new NavBarPosition(NavigationMode.NO_BUTTON, displayRotation),