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

Fixed a bug where a notification could stay userlocked

Browse Source 
Moved the responsibility to remove the userlocked flag
into the DragdownHelper instead of the Callback.

Bug: 24866646
Change-Id: Ib0dbe310f9f7637f9bae466b1029728a6611f291
This commit is contained in:
Selim Cinek
2015-10-21 14:00:33 -07:00
parent 2d3c59c389
commit 5243c12f49
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,8 @@ public class DragDownHelper implements Gefingerpoken {
(int) (y - mInitialTouchY))) {
if (mStartingChild == null) {
mDragDownCallback.setEmptyDragAmount(0f);
} else {
mCallback.setUserLockedChild(mStartingChild, false);
}
mDraggingDown = false;
} else {
@@ -180,6 +182,7 @@ public class DragDownHelper implements Gefingerpoken {
private void cancelExpansion(final ExpandableView child) {
if (child.getContentHeight() == child.getMinHeight()) {
mCallback.setUserLockedChild(child, false);
return;
}
ObjectAnimator anim = ObjectAnimator.ofInt(child, "contentHeight",

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -3986,9 +3986,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mNotificationPanel.animateToFullShade(0 /* delay */);
setBarState(StatusBarState.SHADE_LOCKED);
updateKeyguardState(false /* goingToFullShade */, false /* fromShadeLocked */);
if (row != null) {
row.setUserLocked(false);
}
}
}