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

Merge "Exclude from Recents Assistant in half-screen mode" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-06 23:00:25 +00:00
committed by Android (Google) Code Review
parent b15225cd88 eff42d317b
commit 69598bbef5
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/am/RecentTasks.java
View File

@@ -19,6 +19,7 @@ package com.android.server.am;
import static android.app.ActivityManager.FLAG_AND_UNLOCKED; import static android.app.ActivityManager.FLAG_AND_UNLOCKED;
import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE; import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE;
import static android.app.ActivityManager.RECENT_WITH_EXCLUDED; import static android.app.ActivityManager.RECENT_WITH_EXCLUDED;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
@@ -1099,13 +1100,22 @@ class RecentTasks {
+ " sessionDuration=" + mActiveTasksSessionDurationMs + " sessionDuration=" + mActiveTasksSessionDurationMs
+ " inactiveDuration=" + task.getInactiveDuration() + " inactiveDuration=" + task.getInactiveDuration()
+ " activityType=" + task.getActivityType() + " activityType=" + task.getActivityType()
+ " windowingMode=" + task.getWindowingMode()); + " windowingMode=" + task.getWindowingMode()
+ " intentFlags=" + task.getBaseIntent().getFlags());
// Ignore certain activity types completely
switch (task.getActivityType()) { switch (task.getActivityType()) {
case ACTIVITY_TYPE_HOME: case ACTIVITY_TYPE_HOME:
case ACTIVITY_TYPE_RECENTS: case ACTIVITY_TYPE_RECENTS:
// Ignore certain activity types completely
return false; return false;
case ACTIVITY_TYPE_ASSISTANT:
// Ignore assistant that chose to be excluded from Recents, even if it's a top
// task.
if ((task.getBaseIntent().getFlags()
& Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
== Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) {
return false;
}
} }
// Ignore certain windowing modes // Ignore certain windowing modes