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

This commit is contained in:
Winson Chung
2018-05-24 02:24:36 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 7 deletions

View File

@@ -265,12 +265,10 @@ 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
}
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

View File

@@ -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";