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

Commit d4fcd22c authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "7/ Clean up some usage of getLooper" into sc-dev am: a7e151f0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13419812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia65e6002740901a093fc022f9b75f85ed9cd55ae
parents ed06add7 a7e151f0
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ public class HandlerExecutor implements ShellExecutor {
        }
    }

    @Override
    public void removeAllCallbacks() {
        mHandler.removeCallbacksAndMessages(null);
    }

    @Override
    public void removeCallbacks(@NonNull Runnable r) {
        mHandler.removeCallbacks(r);
@@ -55,9 +60,4 @@ public class HandlerExecutor implements ShellExecutor {
    public boolean hasCallback(Runnable r) {
        return mHandler.hasCallbacks(r);
    }

    @Override
    public Looper getLooper() {
        return mHandler.getLooper();
    }
}
+5 −5
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ public interface ShellExecutor extends Executor {
     */
    void executeDelayed(Runnable runnable, long delayMillis);

    /**
     * Removes all pending callbacks.
     */
    void removeAllCallbacks();

    /**
     * See {@link android.os.Handler#removeCallbacks}.
     */
@@ -81,9 +86,4 @@ public interface ShellExecutor extends Executor {
     * See {@link android.os.Handler#hasCallbacks(Runnable)}.
     */
    boolean hasCallback(Runnable runnable);

    /**
     * Returns the looper that this executor is running on.
     */
    Looper getLooper();
}
+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer
    private final float[] mColor;
    private final float mAlpha;
    private final Rect mRect;
    private final Handler mHandler;
    private final Executor mMainExecutor;
    private final Point mDisplaySize = new Point();
    private final OneHandedSurfaceTransactionHelper.SurfaceControlTransactionFactory
            mSurfaceControlTransactionFactory;
@@ -76,13 +76,13 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer
                @Override
                public void onOneHandedAnimationStart(
                        OneHandedAnimationController.OneHandedTransitionAnimator animator) {
                    mHandler.post(() -> showBackgroundPanelLayer());
                    mMainExecutor.execute(() -> showBackgroundPanelLayer());
                }
            };

    @Override
    public void onStopFinished(Rect bounds) {
        mHandler.post(() -> removeBackgroundPanelLayer());
        mMainExecutor.execute(() -> removeBackgroundPanelLayer());
    }

    public OneHandedBackgroundPanelOrganizer(Context context, DisplayController displayController,
@@ -94,7 +94,7 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer
        mColor = new float[]{defaultRGB, defaultRGB, defaultRGB};
        mAlpha = res.getFloat(R.dimen.config_one_handed_background_alpha);
        mRect = new Rect(0, 0, mDisplaySize.x, mDisplaySize.y);
        mHandler = new Handler();
        mMainExecutor = executor;
        mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new;
    }

+8 −2
Original line number Diff line number Diff line
@@ -221,8 +221,14 @@ public class OneHandedGestureHandler implements OneHandedTransitionCallback,
                    displaySize.y);
            mInputMonitor = InputManager.getInstance().monitorGestureInput(
                    "onehanded-gesture-offset", DEFAULT_DISPLAY);
            try {
                mMainExecutor.executeBlocking(() -> {
                    mInputEventReceiver = new EventReceiver(
                    mInputMonitor.getInputChannel(), mMainExecutor.getLooper());
                            mInputMonitor.getInputChannel(), Looper.myLooper());
                });
            } catch (InterruptedException e) {
                throw new RuntimeException("Failed to create input event receiver", e);
            }
        }
    }

+8 −2
Original line number Diff line number Diff line
@@ -132,8 +132,14 @@ public class OneHandedTouchHandler implements OneHandedTransitionCallback {
        if (mIsEnabled) {
            mInputMonitor = InputManager.getInstance().monitorGestureInput(
                    "onehanded-touch", DEFAULT_DISPLAY);
            try {
                mMainExecutor.executeBlocking(() -> {
                    mInputEventReceiver = new EventReceiver(
                    mInputMonitor.getInputChannel(), mMainExecutor.getLooper());
                            mInputMonitor.getInputChannel(), Looper.myLooper());
                });
            } catch (InterruptedException e) {
                throw new RuntimeException("Failed to create input event receiver", e);
            }
        }
    }

Loading