drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '43c70b0ccface3e7e0730d9bc0a46b90f16c4b17':
  Status bar interaction veto revoked on ups/cancels.
This commit is contained in:
John Spurlock
2013-09-12 09:17:05 -07:00
committed by Android Git Automerger
parent c3414dc4ba 43c70b0ccf
commit 932c1251e4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1737,7 +1737,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
}
if (mStatusBarWindowState == WINDOW_STATE_SHOWING) {
setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);
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);
}
}
return false;
}