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

Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev

Browse Source
This commit is contained in:
Selim Cinek
2017-08-24 16:00:20 +00:00
committed by Android (Google) Code Review
parent ac3c798ab5 980a44e69c
commit efeb2cf943
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
View File

@@ -30,6 +30,7 @@ import com.android.systemui.Gefingerpoken;
import com.android.systemui.Interpolators; import com.android.systemui.Interpolators;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager; 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 * 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() { private boolean isFalseTouch() {
if (!mDragDownCallback.isFalsingCheckNeeded()) {
return false;
}
return mFalsingManager.isFalseTouch() || !mDraggedFarEnough; return mFalsingManager.isFalseTouch() || !mDraggedFarEnough;
} }
@@ -249,5 +253,6 @@ public class DragDownHelper implements Gefingerpoken {
void onCrossedThreshold(boolean above); void onCrossedThreshold(boolean above);
void onTouchSlopExceeded(); void onTouchSlopExceeded();
void setEmptyDragAmount(float amount); void setEmptyDragAmount(float amount);
boolean isFalsingCheckNeeded();
} }
} }

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

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