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

Improve swiping to reveal gear for ongoing notifications with time check am: 5b3cc1158b am: 24cdde893b

Browse Source 
am: 0db0989118

Change-Id: If8f6848c8742c7e40c402b617883cd858197a60f
This commit is contained in:
Mady Mellor
2016-09-15 11:30:00 +00:00
committed by android-build-merger
parent d9bb69446f 0db0989118
commit 370a42e0e6
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -3940,6 +3940,7 @@ public class NotificationStackScrollLayout extends ViewGroup
private class NotificationSwipeHelper extends SwipeHelper {
private static final long SHOW_GEAR_DELAY = 60;
private static final long COVER_GEAR_DELAY = 4000;
private static final long SWIPE_GEAR_TIMING = 200;
private CheckForDrag mCheckForDrag;
private Runnable mFalsingCheck;
private Handler mHandler;
@@ -4056,6 +4057,9 @@ public class NotificationStackScrollLayout extends ViewGroup
boolean gestureTowardsGear = isTowardsGear(velocity, mCurrIconRow.isIconOnLeft());
boolean gestureFastEnough = Math.abs(velocity) > getEscapeVelocity();
final double timeForGesture = ev.getEventTime() - ev.getDownTime();
final boolean showGearForSlowOnGoing = !canChildBeDismissed(animView)
&& timeForGesture >= SWIPE_GEAR_TIMING;
if (mGearSnappedTo && mCurrIconRow.isVisible()) {
if (mGearSnappedOnLeft == mCurrIconRow.isIconOnLeft()) {
@@ -4080,7 +4084,8 @@ public class NotificationStackScrollLayout extends ViewGroup
} else {
dismissOrSnapBack(animView, velocity, ev);
}
} else if ((!gestureFastEnough && swipedEnoughToShowGear(animView))
} else if (((!gestureFastEnough || showGearForSlowOnGoing)
&& swipedEnoughToShowGear(animView))
|| gestureTowardsGear) {
// Gear has not been snapped to previously and this is gear revealing gesture
snapToGear(animView, velocity);
@@ -4132,13 +4137,9 @@ public class NotificationStackScrollLayout extends ViewGroup
final float multiplier = canChildBeDismissed(animView) ? 0.4f : 0.2f;
final float snapBackThreshold = getSpaceForGear(animView) * multiplier;
final float translation = getTranslation(animView);
final boolean fromLeft = translation > 0;
final float absTrans = Math.abs(translation);
final float notiThreshold = getSize(mTranslatingParentView) * 0.4f;
return mCurrIconRow.isVisible() && (mCurrIconRow.isIconOnLeft()
? (translation > snapBackThreshold && translation <= notiThreshold)
: (translation < -snapBackThreshold && translation >= -notiThreshold));
return !swipedFarEnough() && mCurrIconRow.isVisible() && (mCurrIconRow.isIconOnLeft()
? translation > snapBackThreshold
: translation < -snapBackThreshold);
}
@Override