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

Commit f55e3808 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to r_aml_300900500 for mainline module file:... 

Make change and version bump to r_aml_300900500 for mainline module file: packages/Tethering/apex/manifest.json

Change-Id: I7daf3a7b2989105022a05e6b3c7d3fdbe165baed
parents a2b1ca56 a33e27cf

apex/extservices/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.extservices",

  "version": 300900400

  "version": 300900500

}

apex/permission/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.permission",

  "version": 300900400

  "version": 300900500

}

apex/statsd/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.os.statsd",

  "version": 300900400

  "version": 300900500

}

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+4 −2
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ public class PipTouchHandler { 
                        this::updateMovementBounds, sysUiState);

        mTouchState = new PipTouchState(ViewConfiguration.get(context), mHandler,

                () -> mMenuController.showMenuWithDelay(MENU_STATE_FULL, mMotionHelper.getBounds(),

                        true /* allowMenuTimeout */, willResizeMenu(), shouldShowResizeHandle()));

                        true /* allowMenuTimeout */, willResizeMenu(), shouldShowResizeHandle()),

                        menuController::hideMenu);



        Resources res = context.getResources();

        mEnableDismissDragToEdge = res.getBoolean(R.bool.config_pipEnableDismissDragToEdge);
@@ -708,6 +709,7 @@ public class PipTouchHandler { 
                // on and changing MotionEvents into HoverEvents.

                // Let's not enable menu show/hide for a11y services.

                if (!mAccessibilityManager.isTouchExplorationEnabled()) {

                    mTouchState.removeHoverExitTimeoutCallback();

                    mMenuController.showMenu(MENU_STATE_FULL, mMotionHelper.getBounds(),

                            false /* allowMenuTimeout */, false /* willResizeMenu */,

                            shouldShowResizeHandle());
@@ -725,7 +727,7 @@ public class PipTouchHandler { 
                // Let's not enable menu show/hide for a11y services.

                if (!mAccessibilityManager.isTouchExplorationEnabled()) {

                    mHideMenuAfterShown = true;

                    mMenuController.hideMenu();

                    mTouchState.scheduleHoverExitTimeoutCallback();

                }

                if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {

                    sendAccessibilityHoverEvent(AccessibilityEvent.TYPE_VIEW_HOVER_EXIT);

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java

+17 −1
Original line number Diff line number Diff line
@@ -36,10 +36,12 @@ public class PipTouchState { 


    @VisibleForTesting

    static final long DOUBLE_TAP_TIMEOUT = 200;

    static final long HOVER_EXIT_TIMEOUT = 50;



    private final Handler mHandler;

    private final ViewConfiguration mViewConfig;

    private final Runnable mDoubleTapTimeoutCallback;

    private final Runnable mHoverExitTimeoutCallback;



    private VelocityTracker mVelocityTracker;

    private long mDownTouchTime = 0;
@@ -64,10 +66,11 @@ public class PipTouchState { 
    private int mActivePointerId;



    public PipTouchState(ViewConfiguration viewConfig, Handler handler,

            Runnable doubleTapTimeoutCallback) {

            Runnable doubleTapTimeoutCallback, Runnable hoverExitTimeoutCallback) {

        mViewConfig = viewConfig;

        mHandler = handler;

        mDoubleTapTimeoutCallback = doubleTapTimeoutCallback;

        mHoverExitTimeoutCallback = hoverExitTimeoutCallback;

    }



    /**
@@ -197,6 +200,10 @@ public class PipTouchState { 
                recycleVelocityTracker();

                break;

            }

            case MotionEvent.ACTION_BUTTON_PRESS: {

                removeHoverExitTimeoutCallback();

                break;

            }

        }

    }
@@ -326,6 +333,15 @@ public class PipTouchState { 
        mHandler.removeCallbacks(mDoubleTapTimeoutCallback);

    }



    void scheduleHoverExitTimeoutCallback() {

        mHandler.removeCallbacks(mHoverExitTimeoutCallback);

        mHandler.postDelayed(mHoverExitTimeoutCallback, HOVER_EXIT_TIMEOUT);

    }



    void removeHoverExitTimeoutCallback() {

        mHandler.removeCallbacks(mHoverExitTimeoutCallback);

    }



    void addMovementToVelocityTracker(MotionEvent event) {

        if (mVelocityTracker == null) {

            return;