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

Merge "Expose the source component which launched this task." into pi-dev am: b4e4fc3a1e

Browse Source 
am: 2e6f1a0475

Change-Id: I6b73ad07fc6090788149031ccd33c7077845bbdf
This commit is contained in:
Winson Chung
2018-06-06 08:48:24 -07:00
committed by android-build-merger
parent 0ba3c0ba6c 2e6f1a0475
commit 4b250f34d9
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/RecentsTaskLoadPlan.java
View File

@@ -20,6 +20,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import android.app.ActivityManager;
import android.app.KeyguardManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
@@ -102,9 +103,14 @@ public class RecentsTaskLoadPlan {
ActivityManager.RecentTaskInfo t = mRawTasks.get(i);
// Compose the task key
final ComponentName sourceComponent = t.origActivity != null
// Activity alias if there is one
? t.origActivity
// The real activity if there is no alias (or the target if there is one)
: t.realActivity;
final int windowingMode = t.configuration.windowConfiguration.getWindowingMode();
TaskKey taskKey = new TaskKey(t.persistentId, windowingMode, t.baseIntent,
t.userId, t.lastActiveTime);
sourceComponent, t.userId, t.lastActiveTime);
boolean isFreeformTask = windowingMode == WINDOWING_MODE_FREEFORM;
boolean isStackTask = !isFreeformTask;

7
packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java
View File

@@ -60,12 +60,17 @@ public class Task {
@ViewDebug.ExportedProperty(category="recents")
public long lastActiveTime;
// The source component name which started this task
public final ComponentName sourceComponent;
private int mHashCode;
public TaskKey(int id, int windowingMode, Intent intent, int userId, long lastActiveTime) {
public TaskKey(int id, int windowingMode, Intent intent,
ComponentName sourceComponent, int userId, long lastActiveTime) {
this.id = id;
this.windowingMode = windowingMode;
this.baseIntent = intent;
this.sourceComponent = sourceComponent;
this.userId = userId;
this.lastActiveTime = lastActiveTime;
updateHashCode();

3
packages/SystemUI/shared/tests/src/com/android/systemui/shared/recents/model/HighResThumbnailLoaderTest.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ComponentName;
import android.os.Looper;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
@@ -61,7 +62,7 @@ public class HighResThumbnailLoaderTest extends SysuiSharedLibTestCase {
MockitoAnnotations.initMocks(this);
mLoader = new HighResThumbnailLoader(mMockActivityManagerWrapper, Looper.getMainLooper(),
false /* reducedResolution */);
mTask.key = new TaskKey(0, WINDOWING_MODE_UNDEFINED, null, 0, 0);
mTask.key = new TaskKey(0, WINDOWING_MODE_UNDEFINED, null, null, 0, 0);
when(mMockActivityManagerWrapper.getTaskThumbnail(anyInt(), anyBoolean()))
.thenReturn(mThumbnailData);
mLoader.setVisible(true);