Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable quickscrub with system prop flag"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-23 18:26:10 +00:00
committed by Android (Google) Code Review
parent c4788e1f04 f41f7c31b9
commit 0cfd9aa73a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
View File

@@ -28,6 +28,7 @@ import android.graphics.Paint;
import android.graphics.Rect;
import android.os.Handler;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.util.Log;
import android.util.Slog;
import android.view.Display;
@@ -131,7 +132,7 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velX, float velY) {
if (mQuickScrubActive) {
if (!isQuickScrubEnabled() || mQuickScrubActive) {
return false;
}
float velocityX = mIsRTL ? -velX : velX;
@@ -196,12 +197,13 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
case MotionEvent.ACTION_DOWN: {
int x = (int) event.getX();
int y = (int) event.getY();
if (mHomeButtonRect.contains(x, y)) {
if (isQuickScrubEnabled() && mHomeButtonRect.contains(x, y)) {
mTouchDownX = x;
mTouchDownY = y;
homeButton.setDelayTouchFeedback(true);
mHandler.postDelayed(mLongPressRunnable, LONG_PRESS_DELAY_MS);
} else {
homeButton.setDelayTouchFeedback(false);
mTouchDownX = mTouchDownY = -1;
}
break;
@@ -356,6 +358,10 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
}
}
boolean isQuickScrubEnabled() {
return SystemProperties.getBoolean("persist.quickstep.scrub.enabled", false);
}
private void startQuickScrub() {
if (!mQuickScrubActive) {
mQuickScrubActive = true;