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

Merge "Fix gear being covered on notification update" into nyc-dev

Browse Source
This commit is contained in:
Mady Mellor
2016-04-25 19:06:16 +00:00
committed by Android (Google) Code Review
parent 5a3e441158 86889c2d21
commit 904a39ca92
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/SwipeHelper.java
View File

@@ -493,7 +493,15 @@ public class SwipeHelper implements Gefingerpoken {
updateSwipeProgressFromOffset(view, canAnimViewBeDismissed);
}
public void snapChildIfNeeded(final View view, boolean animate) {
/**
* Called when a view is updated to be non-dismissable, if the view was being dismissed before
* the update this will handle snapping it back into place.
*
* @param view the view to snap if necessary.
* @param animate whether to animate the snap or not.
* @param targetLeft the target to snap to.
*/
public void snapChildIfNeeded(final View view, boolean animate, float targetLeft) {
if ((mDragging && mCurrView == view) || mSnappingChild) {
return;
}
@@ -507,7 +515,7 @@ public class SwipeHelper implements Gefingerpoken {
}
if (needToSnap) {
if (animate) {
snapChild(view, 0 /* targetLeft */, 0.0f /* velocity */);
snapChild(view, targetLeft, 0.0f /* velocity */);
} else {
snapChildInstantly(view);
}

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

@@ -990,9 +990,11 @@ public class NotificationStackScrollLayout extends ViewGroup
true /* isDismissAll */);
}
public void snapViewIfNeeded(View child) {
public void snapViewIfNeeded(ExpandableNotificationRow child) {
boolean animate = mIsExpanded || isPinnedHeadsUp(child);
mSwipeHelper.snapChildIfNeeded(child, animate);
// If the child is showing the gear to go to settings, snap to that
float targetLeft = child.getSettingsRow().isVisible() ? child.getTranslation() : 0;
mSwipeHelper.snapChildIfNeeded(child, animate, targetLeft);
}
@Override