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

Commit fb6721da authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Initial changes to support full-width quickscrubbing." into ub-launcher3-edmonton

parents d5ccb697 ededa9cc

quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java

+4 −6
Original line number Diff line number Diff line
@@ -265,13 +265,11 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 


        if (Looper.myLooper() != Looper.getMainLooper()) {

            startActivity.run();

            if (!mIsDeferredDownTarget) {

            try {

                drawWaitLock.await(LAUNCHER_DRAW_TIMEOUT_MS, TimeUnit.MILLISECONDS);

            } catch (Exception e) {

                // We have waited long enough for launcher to draw

            }

            }

        } else {

            // We should almost always get touch-town on background thread. This is an edge case

            // when the background Choreographer has not yet initialized.

quickstep/src/com/android/quickstep/QuickScrubController.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class QuickScrubController implements OnAlarmListener { 
     * Snap to a new page when crossing these thresholds. The first and last auto-advance.

     */

    private static final float[] QUICK_SCRUB_THRESHOLDS = new float[] {

            0.04f, 0.27f, 0.50f, 0.73f, 0.96f

            0.05f, 0.20f, 0.35f, 0.50f, 0.65f, 0.80f, 0.95f

    };



    private static final String TAG = "QuickScrubController";