Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev (5bb0b230) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -4949,6 +4949,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.
		*