PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Always use the locked input consumer when showing activity over lockscreen" into ub-launcher3-qt-dev

Browse Source
This commit is contained in:
Winson Chung
2019-06-14 17:18:07 +00:00
committed by Android (Google) Code Review
parent 0d5bd65e6e 4c59ddae35
commit dfbb964dcc
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+2 -9
View File
@@ -37,7 +37,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_S
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityManager.RunningTaskInfo;
import android.app.KeyguardManager;
import android.app.Service; import android.app.Service;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
@@ -234,7 +233,6 @@ public class TouchInteractionService extends Service implements
private final InputConsumer mResetGestureInputConsumer = private final InputConsumer mResetGestureInputConsumer =
new ResetGestureInputConsumer(mSwipeSharedState); new ResetGestureInputConsumer(mSwipeSharedState);
private KeyguardManager mKM;
private ActivityManagerWrapper mAM; private ActivityManagerWrapper mAM;
private RecentsModel mRecentsModel; private RecentsModel mRecentsModel;
private ISystemUiProxy mISystemUiProxy; private ISystemUiProxy mISystemUiProxy;
@@ -280,7 +278,6 @@ public class TouchInteractionService extends Service implements
// Initialize anything here that is needed in direct boot mode. // Initialize anything here that is needed in direct boot mode.
// Everything else should be initialized in initWhenUserUnlocked() below. // Everything else should be initialized in initWhenUserUnlocked() below.
mKM = getSystemService(KeyguardManager.class);
mMainChoreographer = Choreographer.getInstance(); mMainChoreographer = Choreographer.getInstance();
mAM = ActivityManagerWrapper.getInstance(); mAM = ActivityManagerWrapper.getInstance();
@@ -560,11 +557,8 @@ public class TouchInteractionService extends Service implements
if (!useSharedState) { if (!useSharedState) {
mSwipeSharedState.clearAllState(); mSwipeSharedState.clearAllState();
} }
if ((mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0 if ((mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0) {
|| mKM.isDeviceLocked()) { // This handles apps showing over the lockscreen (e.g. camera)
// This handles apps launched in direct boot mode (e.g. dialer) as well as apps launched
// while device is locked after exiting direct boot mode (e.g. camera), or if the
// app is showing over the lockscreen (even if not locked)
return createDeviceLockedInputConsumer(runningTaskInfo); return createDeviceLockedInputConsumer(runningTaskInfo);
} }
@@ -669,7 +663,6 @@ public class TouchInteractionService extends Service implements
pw.println(" systemUiFlags=" + mSystemUiStateFlags); pw.println(" systemUiFlags=" + mSystemUiStateFlags);
pw.println(" systemUiFlagsDesc=" pw.println(" systemUiFlagsDesc="
+ QuickStepContract.getSystemUiStateString(mSystemUiStateFlags)); + QuickStepContract.getSystemUiStateString(mSystemUiStateFlags));
pw.println(" isDeviceLocked=" + mKM.isDeviceLocked());
pw.println(" assistantAvailable=" + mAssistantAvailable); pw.println(" assistantAvailable=" + mAssistantAvailable);
pw.println(" assistantDisabled=" pw.println(" assistantDisabled="
+ QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)); + QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags));