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

Merge "Set task and activity types when adding to task."

Browse Source
This commit is contained in:
Craig Mautner
2013-07-23 22:48:52 +00:00
committed by Android (Google) Code Review
parent 7ea1ab60b0 2c1faed412
commit 7aee681b6b
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityRecord.java
View File

@@ -80,7 +80,7 @@ final class ActivityRecord {
static final int APPLICATION_ACTIVITY_TYPE = 0;
static final int HOME_ACTIVITY_TYPE = 1;
static final int RECENTS_ACTIVITY_TYPE = 2;
final int mActivityType;
int mActivityType;
final String baseDir; // where activity source (resources etc) located
final String resDir; // where public activity source (public resources etc) located

14
services/java/com/android/server/am/TaskRecord.java
View File

@@ -57,7 +57,8 @@ final class TaskRecord extends ThumbnailHolder {
/** Current stack */
ActivityStack stack;
private boolean mApplicationTask = true;
/** Takes on same set of values as ActivityRecord.mActivityType */
private int mTaskType;
TaskRecord(int _taskId, ActivityInfo info, Intent _intent) {
taskId = _taskId;
@@ -163,9 +164,12 @@ final class TaskRecord extends ThumbnailHolder {
// Was not previously in list.
numFullscreen++;
}
// Only set this to be an application task if it has not already been set as home task.
if (mApplicationTask) {
mApplicationTask = r.isApplicationActivity();
// Only set this based on the first activity
if (mActivities.isEmpty()) {
mTaskType = r.mActivityType;
} else {
// Otherwise make all added activities match this one.
r.mActivityType = mTaskType;
}
mActivities.add(index, r);
}
@@ -319,7 +323,7 @@ final class TaskRecord extends ThumbnailHolder {
}
boolean isApplicationTask() {
return mApplicationTask;
return mTaskType == ActivityRecord.APPLICATION_ACTIVITY_TYPE;
}
public TaskAccessInfo getTaskAccessInfoLocked(boolean inclThumbs) {