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

Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev

Browse Source
This commit is contained in:
John Spurlock
2013-09-12 16:05:56 +00:00
committed by Android (Google) Code Review
parent 357f9e34ca 5fee8360f8
commit 43c70b0ccf
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1737,8 +1737,15 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
} }
if (mStatusBarWindowState == WINDOW_STATE_SHOWING) { if (mStatusBarWindowState == WINDOW_STATE_SHOWING) {
final boolean upOrCancel =
event.getAction() == MotionEvent.ACTION_UP ||
event.getAction() == MotionEvent.ACTION_CANCEL;
if (upOrCancel && !mExpandedVisible) {
setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
} else {
setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true); setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);
} }
}
return false; return false;
} }