Merge changes I96fdf9b4,Ia85d9d89,I1fd23114
* changes: Added isDockable field to RunningTaskInfo Display warning toast when we try to launch unresizeable app in split-screen Don't allow non-dockable activities/tasks in docked stack.
This commit is contained in:
committed by
Android (Google) Code Review
commit
76d159fdcb
@@ -1195,6 +1195,12 @@ public class ActivityManager {
|
||||
*/
|
||||
public Rect bounds;
|
||||
|
||||
/**
|
||||
* True if the task can go in the docked stack.
|
||||
* @hide
|
||||
*/
|
||||
public boolean isDockable;
|
||||
|
||||
public RecentTaskInfo() {
|
||||
}
|
||||
|
||||
@@ -1238,6 +1244,7 @@ public class ActivityManager {
|
||||
} else {
|
||||
dest.writeInt(0);
|
||||
}
|
||||
dest.writeInt(isDockable ? 1 : 0);
|
||||
}
|
||||
|
||||
public void readFromParcel(Parcel source) {
|
||||
@@ -1260,6 +1267,7 @@ public class ActivityManager {
|
||||
numActivities = source.readInt();
|
||||
bounds = source.readInt() > 0 ?
|
||||
Rect.CREATOR.createFromParcel(source) : null;
|
||||
isDockable = source.readInt() == 1;
|
||||
}
|
||||
|
||||
public static final Creator<RecentTaskInfo> CREATOR
|
||||
@@ -1444,6 +1452,12 @@ public class ActivityManager {
|
||||
*/
|
||||
public long lastActiveTime;
|
||||
|
||||
/**
|
||||
* True if the task can go in the docked stack.
|
||||
* @hide
|
||||
*/
|
||||
public boolean isDockable;
|
||||
|
||||
public RunningTaskInfo() {
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user