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

Make unfocused windows in pinned mode unable to receive touch input

Browse Source 
Make unfocused ActivityStacks in pinned windowing mode ignore input on
Leanback devices (TVs).

Bug: 144032975
Bug: 153050065
Test: atest atest CtsWindowManagerDeviceTestCases:PinnedStackTests
Change-Id: Id9049c543ed6493a840b7a34a68f4e7bc1010262
This commit is contained in:
Sergey Nikolaienkov
2020-04-15 19:55:48 +02:00
parent 64fb27fcdc
commit 30c947df37
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -3610,7 +3610,15 @@ class ActivityStack extends Task {
}
boolean shouldIgnoreInput() {
return inSplitScreenPrimaryWindowingMode() && !isFocusable();
if (inSplitScreenPrimaryWindowingMode() && !isFocusable()) {
return true;
}
if (mAtmService.mHasLeanbackFeature && inPinnedWindowingMode()
&& !isFocusedStackOnDisplay()) {
// Preventing Picture-in-Picture stack from receiving input on TVs.
return true;
}
return false;
}
@Override

8
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -42,7 +42,9 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.content.pm.ApplicationInfo.FLAG_FACTORY_TEST;
import static android.content.pm.ConfigurationInfo.GL_ES_VERSION_UNDEFINED;
import static android.content.pm.PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
import static android.content.pm.PackageManager.FEATURE_CANT_SAVE_STATE;
import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
import static android.content.pm.PackageManager.FEATURE_LEANBACK;
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.FactoryTest.FACTORY_TEST_HIGH_LEVEL;
@@ -393,6 +395,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
/** The currently running heavy-weight process, if any. */
WindowProcessController mHeavyWeightProcess = null;
boolean mHasHeavyWeightFeature;
boolean mHasLeanbackFeature;
/**
* This is the process holding the activity the user last visited that is in a different process
* from the one they are currently in.
@@ -734,8 +737,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
public void onSystemReady() {
synchronized (mGlobalLock) {
mHasHeavyWeightFeature = mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_CANT_SAVE_STATE);
final PackageManager pm = mContext.getPackageManager();
mHasHeavyWeightFeature = pm.hasSystemFeature(FEATURE_CANT_SAVE_STATE);
mHasLeanbackFeature = pm.hasSystemFeature(FEATURE_LEANBACK);
mAssistUtils = new AssistUtils(mContext);
mVrController.onSystemReady();
mRecentTasks.onSystemReadyLocked();