Merge changes Id81c9034,I49f71f91 into rvc-dev am: 8a0c8f12f5 am: dd80d85f28 (075d9340) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -86,7 +86,8 @@ public class ExpandHelper implements Gefingerpoken {
		private float mInitialTouchSpan;
		private float mLastFocusY;
		private float mLastSpanY;
		private int mTouchSlop;
		private final int mTouchSlop;
		private final float mSlopMultiplier;
		private float mLastMotionY;
		private float mPullGestureMinXSpan;
		private Callback mCallback;
		@@ -177,6 +178,7 @@ public class ExpandHelper implements Gefingerpoken {

		final ViewConfiguration configuration = ViewConfiguration.get(mContext);
		mTouchSlop = configuration.getScaledTouchSlop();
		mSlopMultiplier = configuration.getAmbiguousGestureMultiplier();

		mSGD = new ScaleGestureDetector(context, mScaleGestureListener);
		mFlingAnimationUtils = new FlingAnimationUtils(mContext.getResources().getDisplayMetrics(),
		@@ -258,6 +260,13 @@ public class ExpandHelper implements Gefingerpoken {
		mScrollAdapter = adapter;
		}

		private float getTouchSlop(MotionEvent event) {
		// Adjust the touch slop if another gesture may be being performed.
		return event.getClassification() == MotionEvent.CLASSIFICATION_AMBIGUOUS_GESTURE
		? mTouchSlop * mSlopMultiplier
		: mTouchSlop;
		}

		@Override
		public boolean onInterceptTouchEvent(MotionEvent ev) {
		if (!isEnabled()) {
		@@ -303,7 +312,7 @@ public class ExpandHelper implements Gefingerpoken {
		if (mWatchingForPull) {
		final float yDiff = ev.getRawY() - mInitialTouchY;
		final float xDiff = ev.getRawX() - mInitialTouchX;
		if (yDiff > mTouchSlop && yDiff > Math.abs(xDiff)) {
		if (yDiff > getTouchSlop(ev) && yDiff > Math.abs(xDiff)) {
		if (DEBUG) Log.v(TAG, "got venetian gesture (dy=" + yDiff + "px)");
		mWatchingForPull = false;
		if (mResizedView != null && !isFullyExpanded(mResizedView)) {
		@@ -431,7 +440,7 @@ public class ExpandHelper implements Gefingerpoken {
		if (mWatchingForPull) {
		final float yDiff = ev.getRawY() - mInitialTouchY;
		final float xDiff = ev.getRawX() - mInitialTouchX;
		if (yDiff > mTouchSlop && yDiff > Math.abs(xDiff)) {
		if (yDiff > getTouchSlop(ev) && yDiff > Math.abs(xDiff)) {
		if (DEBUG) Log.v(TAG, "got venetian gesture (dy=" + yDiff + "px)");
		mWatchingForPull = false;
		if (mResizedView != null && !isFullyExpanded(mResizedView)) {

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

+39 −30

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ public class SwipeHelper implements Gefingerpoken {

		private final FlingAnimationUtils mFlingAnimationUtils;
		private float mPagingTouchSlop;
		private final float mSlopMultiplier;
		private final Callback mCallback;
		private final int mSwipeDirection;
		private final VelocityTracker mVelocityTracker;
		@@ -84,11 +85,28 @@ public class SwipeHelper implements Gefingerpoken {
		private float mTranslation = 0;

		private boolean mMenuRowIntercepting;
		private boolean mLongPressSent;
		private Runnable mWatchLongPress;
		private final long mLongPressTimeout;
		private boolean mLongPressSent;
		private final float[] mDownLocation = new float[2];
		private final Runnable mPerformLongPress = new Runnable() {

		private final int[] mViewOffset = new int[2];

		@Override
		public void run() {
		if (mCurrView != null && !mLongPressSent) {
		mLongPressSent = true;
		if (mCurrView instanceof ExpandableNotificationRow) {
		mCurrView.getLocationOnScreen(mViewOffset);
		final int x = (int) mDownLocation[0] - mViewOffset[0];
		final int y = (int) mDownLocation[1] - mViewOffset[1];
		mCurrView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
		((ExpandableNotificationRow) mCurrView).doLongClickCallback(x, y);
		}
		}
		}
		};

		final private int[] mTmpPos = new int[2];
		private final int mFalsingThreshold;
		private boolean mTouchAboveFalsingThreshold;
		private boolean mDisableHwLayers;
		@@ -102,7 +120,9 @@ public class SwipeHelper implements Gefingerpoken {
		mHandler = new Handler();
		mSwipeDirection = swipeDirection;
		mVelocityTracker = VelocityTracker.obtain();
		mPagingTouchSlop = ViewConfiguration.get(context).getScaledPagingTouchSlop();
		final ViewConfiguration configuration = ViewConfiguration.get(context);
		mPagingTouchSlop = configuration.getScaledPagingTouchSlop();
		mSlopMultiplier = configuration.getScaledAmbiguousGestureMultiplier();

		// Extra long-press!
		mLongPressTimeout = (long) (ViewConfiguration.getLongPressTimeout() * 1.5f);
		@@ -255,10 +275,7 @@ public class SwipeHelper implements Gefingerpoken {
		}

		public void cancelLongPress() {
		if (mWatchLongPress != null) {
		mHandler.removeCallbacks(mWatchLongPress);
		mWatchLongPress = null;
		}
		mHandler.removeCallbacks(mPerformLongPress);
		}

		@Override
		@@ -287,27 +304,9 @@ public class SwipeHelper implements Gefingerpoken {
		mInitialTouchPos = getPos(ev);
		mPerpendicularInitialTouchPos = getPerpendicularPos(ev);
		mTranslation = getTranslation(mCurrView);
		if (mWatchLongPress == null) {
		mWatchLongPress = new Runnable() {
		@Override
		public void run() {
		if (mCurrView != null && !mLongPressSent) {
		mLongPressSent = true;
		mCurrView.getLocationOnScreen(mTmpPos);
		final int x = (int) ev.getRawX() - mTmpPos[0];
		final int y = (int) ev.getRawY() - mTmpPos[1];
		if (mCurrView instanceof ExpandableNotificationRow) {
		mCurrView.sendAccessibilityEvent(
		AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
		ExpandableNotificationRow currRow =
		(ExpandableNotificationRow) mCurrView;
		currRow.doLongClickCallback(x, y);
		}
		}
		}
		};
		}
		mHandler.postDelayed(mWatchLongPress, mLongPressTimeout);
		mDownLocation[0] = ev.getRawX();
		mDownLocation[1] = ev.getRawY();
		mHandler.postDelayed(mPerformLongPress, mLongPressTimeout);
		}
		break;

		@@ -318,7 +317,12 @@ public class SwipeHelper implements Gefingerpoken {
		float perpendicularPos = getPerpendicularPos(ev);
		float delta = pos - mInitialTouchPos;
		float deltaPerpendicular = perpendicularPos - mPerpendicularInitialTouchPos;
		if (Math.abs(delta) > mPagingTouchSlop
		// Adjust the touch slop if another gesture may be being performed.
		final float pagingTouchSlop =
		ev.getClassification() == MotionEvent.CLASSIFICATION_AMBIGUOUS_GESTURE
		? mPagingTouchSlop * mSlopMultiplier
		: mPagingTouchSlop;
		if (Math.abs(delta) > pagingTouchSlop
		&& Math.abs(delta) > Math.abs(deltaPerpendicular)) {
		if (mCallback.canChildBeDragged(mCurrView)) {
		mCallback.onBeginDrag(mCurrView);
		@@ -327,6 +331,11 @@ public class SwipeHelper implements Gefingerpoken {
		mTranslation = getTranslation(mCurrView);
		}
		cancelLongPress();
		} else if (ev.getClassification() == MotionEvent.CLASSIFICATION_DEEP_PRESS
		&& mHandler.hasCallbacks(mPerformLongPress)) {
		// Accelerate the long press signal.
		cancelLongPress();
		mPerformLongPress.run();
		}
		}
		break;

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,8 @@ public class DragDownHelper implements Gefingerpoken {
		private float mInitialTouchX;
		private float mInitialTouchY;
		private boolean mDraggingDown;
		private float mTouchSlop;
		private final float mTouchSlop;
		private final float mSlopMultiplier;
		private DragDownCallback mDragDownCallback;
		private View mHost;
		private final int[] mTemp2 = new int[2];
		@@ -62,7 +63,9 @@ public class DragDownHelper implements Gefingerpoken {
		FalsingManager falsingManager) {
		mMinDragDistance = context.getResources().getDimensionPixelSize(
		R.dimen.keyguard_drag_down_min_distance);
		mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
		final ViewConfiguration configuration = ViewConfiguration.get(context);
		mTouchSlop = configuration.getScaledTouchSlop();
		mSlopMultiplier = configuration.getScaledAmbiguousGestureMultiplier();
		mCallback = callback;
		mDragDownCallback = dragDownCallback;
		mHost = host;
		@@ -85,7 +88,12 @@ public class DragDownHelper implements Gefingerpoken {

		case MotionEvent.ACTION_MOVE:
		final float h = y - mInitialTouchY;
		if (h > mTouchSlop && h > Math.abs(x - mInitialTouchX)) {
		// Adjust the touch slop if another gesture may be being performed.
		final float touchSlop =
		event.getClassification() == MotionEvent.CLASSIFICATION_AMBIGUOUS_GESTURE
		? mTouchSlop * mSlopMultiplier
		: mTouchSlop;
		if (h > touchSlop && h > Math.abs(x - mInitialTouchX)) {
		mFalsingManager.onNotificatonStartDraggingDown();
		mDraggingDown = true;
		captureStartingChild(mInitialTouchX, mInitialTouchY);

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+22 −10

Original line number	Diff line number	Diff line
		@@ -222,6 +222,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		private boolean mIsScrollerBoundSet;
		private Runnable mFinishScrollingCallback;
		private int mTouchSlop;
		private float mSlopMultiplier;
		private int mMinimumVelocity;
		private int mMaximumVelocity;
		private int mOverflingDistance;
		@@ -1022,6 +1023,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		setClipChildren(false);
		final ViewConfiguration configuration = ViewConfiguration.get(context);
		mTouchSlop = configuration.getScaledTouchSlop();
		mSlopMultiplier = configuration.getScaledAmbiguousGestureMultiplier();
		mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
		mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
		mOverflingDistance = configuration.getScaledOverflingDistance();
		@@ -3744,15 +3746,23 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		mLongPressListener = listener;
		}

		private float getTouchSlop(MotionEvent event) {
		// Adjust the touch slop if another gesture may be being performed.
		return event.getClassification() == MotionEvent.CLASSIFICATION_AMBIGUOUS_GESTURE
		? mTouchSlop * mSlopMultiplier
		: mTouchSlop;
		}

		@Override
		@ShadeViewRefactor(RefactorComponent.INPUT)
		public boolean onTouchEvent(MotionEvent ev) {
		NotificationGuts guts = mNotificationGutsManager.getExposedGuts();
		boolean isCancelOrUp = ev.getActionMasked() == MotionEvent.ACTION_CANCEL
		\|\| ev.getActionMasked() == MotionEvent.ACTION_UP;
		handleEmptySpaceClick(ev);
		boolean expandWantsIt = false;
		boolean swipingInProgress = mSwipingInProgress;
		if (mIsExpanded && !swipingInProgress && !mOnlyScrollingInThisMotion) {
		if (mIsExpanded && !swipingInProgress && !mOnlyScrollingInThisMotion && guts == null) {
		if (isCancelOrUp) {
		mExpandHelper.onlyObserveMovements(false);
		}
		@@ -3778,7 +3788,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		}

		// Check if we need to clear any snooze leavebehinds
		NotificationGuts guts = mNotificationGutsManager.getExposedGuts();
		if (guts != null && !NotificationSwipeHelper.isTouchInView(ev, guts)
		&& guts.getGutsContent() instanceof NotificationSnooze) {
		NotificationSnooze ns = (NotificationSnooze) guts.getGutsContent();
		@@ -3891,12 +3900,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		int deltaY = mLastMotionY - y;
		final int xDiff = Math.abs(x - mDownX);
		final int yDiff = Math.abs(deltaY);
		if (!mIsBeingDragged && yDiff > mTouchSlop && yDiff > xDiff) {
		final float touchSlop = getTouchSlop(ev);
		if (!mIsBeingDragged && yDiff > touchSlop && yDiff > xDiff) {
		setIsBeingDragged(true);
		if (deltaY > 0) {
		deltaY -= mTouchSlop;
		deltaY -= touchSlop;
		} else {
		deltaY += mTouchSlop;
		deltaY += touchSlop;
		}
		}
		if (mIsBeingDragged) {
		@@ -4046,9 +4056,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		public boolean onInterceptTouchEvent(MotionEvent ev) {
		initDownStates(ev);
		handleEmptySpaceClick(ev);

		NotificationGuts guts = mNotificationGutsManager.getExposedGuts();
		boolean expandWantsIt = false;
		boolean swipingInProgress = mSwipingInProgress;
		if (!swipingInProgress && !mOnlyScrollingInThisMotion) {
		if (!swipingInProgress && !mOnlyScrollingInThisMotion && guts == null) {
		expandWantsIt = mExpandHelper.onInterceptTouchEvent(ev);
		}
		boolean scrollWantsIt = false;
		@@ -4065,7 +4077,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		}
		// Check if we need to clear any snooze leavebehinds
		boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP;
		NotificationGuts guts = mNotificationGutsManager.getExposedGuts();
		if (!NotificationSwipeHelper.isTouchInView(ev, guts) && isUp && !swipeWantsIt &&
		!expandWantsIt && !scrollWantsIt) {
		mCheckForLeavebehind = false;
		@@ -4083,8 +4094,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		private void handleEmptySpaceClick(MotionEvent ev) {
		switch (ev.getActionMasked()) {
		case MotionEvent.ACTION_MOVE:
		if (mTouchIsClick && (Math.abs(ev.getY() - mInitialTouchY) > mTouchSlop
		\|\| Math.abs(ev.getX() - mInitialTouchX) > mTouchSlop)) {
		final float touchSlop = getTouchSlop(ev);
		if (mTouchIsClick && (Math.abs(ev.getY() - mInitialTouchY) > touchSlop
		\|\| Math.abs(ev.getX() - mInitialTouchX) > touchSlop)) {
		mTouchIsClick = false;
		}
		break;
		@@ -4168,7 +4180,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		final int x = (int) ev.getX(pointerIndex);
		final int yDiff = Math.abs(y - mLastMotionY);
		final int xDiff = Math.abs(x - mDownX);
		if (yDiff > mTouchSlop && yDiff > xDiff) {
		if (yDiff > getTouchSlop(ev) && yDiff > xDiff) {
		setIsBeingDragged(true);
		mLastMotionY = y;
		mDownX = x;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1021,7 +1021,8 @@ public class NotificationPanelViewController extends PanelViewController {
		trackMovement(event);
		return true;
		}
		if (Math.abs(h) > mTouchSlop && Math.abs(h) > Math.abs(x - mInitialTouchX)
		if (Math.abs(h) > getTouchSlop(event)
		&& Math.abs(h) > Math.abs(x - mInitialTouchX)
		&& shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, h)) {
		mQsTracking = true;
		onQsExpansionStarted();