Fixed an issue where isFalseTouch could be queried

We shouldn't forward any touches if we're not on the
lockscreen.

Test: drag down, turn of the screen
Change-Id: I90acdd7e57322227042b98741721fec977b80f97
Fixes: 63165400
This commit is contained in:
Selim Cinek
2017-08-23 12:21:23 -07:00
parent d836c4f8a5
commit 980a44e69c
2 changed files with 10 additions and 0 deletions

View File

@@ -30,6 +30,7 @@ import com.android.systemui.Gefingerpoken;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.statusbar.phone.StatusBar;
/**
* A utility class to enable the downward swipe on the lockscreen to go to the full shade and expand
@@ -149,6 +150,9 @@ public class DragDownHelper implements Gefingerpoken {
}
private boolean isFalseTouch() {
if (!mDragDownCallback.isFalsingCheckNeeded()) {
return false;
}
return mFalsingManager.isFalseTouch() || !mDraggedFarEnough;
}
@@ -249,5 +253,6 @@ public class DragDownHelper implements Gefingerpoken {
void onCrossedThreshold(boolean above);
void onTouchSlopExceeded();
void setEmptyDragAmount(float amount);
boolean isFalsingCheckNeeded();
}
}

View File

@@ -4943,6 +4943,11 @@ public class StatusBar extends SystemUI implements DemoMode,
mNotificationPanel.setEmptyDragAmount(amount);
}
@Override
public boolean isFalsingCheckNeeded() {
return mState == StatusBarState.KEYGUARD;
}
/**
* If secure with redaction: Show bouncer, go to unlocked shade.
*