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

Made the drag down anywhere on lockscreen go to the shade locked am: 5f1fb46ed9

Browse Source 
am: 92f3111d3f

Change-Id: I22ff0f44d0d548a46d4d54f7c7cb0987e272f9cc
This commit is contained in:
Selim Cinek
2019-07-30 17:58:13 -07:00
committed by android-build-merger
parent 5567fc42b7 92f3111d3f
commit d933d55dd6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1967,7 +1967,8 @@ public class NotificationPanelView extends PanelView implements
* @return Whether we should intercept a gesture to open Quick Settings.
*/
private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) {
if (!mQsExpansionEnabled || mCollapsedOnDown) {
if (!mQsExpansionEnabled || mCollapsedOnDown
|| (mKeyguardShowing && mKeyguardBypassController.getBypassEnabled())) {
return false;
}
View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader();

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
View File

@@ -419,7 +419,7 @@ public class StatusBarWindowView extends FrameLayout {
if (mNotificationPanel.isFullyExpanded()
&& mStatusBarStateController.getState() == StatusBarState.KEYGUARD
&& !mService.isBouncerShowing()
&& (!mBypassController.getBypassEnabled() || mNotificationPanel.isQsExpanded())
&& !mBypassController.getBypassEnabled()
&& !mService.isDozing()) {
intercept = mDragDownHelper.onInterceptTouchEvent(ev);
}