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

Merge "Send task description changed though task org taskInfoChanged" into rvc-dev

Browse Source
This commit is contained in:
Winson Chung
2020-04-13 16:58:07 +00:00
committed by Android (Google) Code Review
parent 83e0ddc69b 1df39e2cf6
commit 3908fb22b6
13 changed files with 119 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/java/android/app/ActivityManager.java
View File

@@ -69,6 +69,7 @@ import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.WorkSource;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.DisplayMetrics;
import android.util.Singleton;
@@ -1597,6 +1598,39 @@ public class ActivityManager {
+ " resizeMode: " + ActivityInfo.resizeModeToString(mResizeMode)
+ " minWidth: " + mMinWidth + " minHeight: " + mMinHeight;
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof TaskDescription)) {
return false;
}
TaskDescription other = (TaskDescription) obj;
return TextUtils.equals(mLabel, other.mLabel)
&& TextUtils.equals(mIconFilename, other.mIconFilename)
&& mIcon == other.mIcon
&& mColorPrimary == other.mColorPrimary
&& mColorBackground == other.mColorBackground
&& mStatusBarColor == other.mStatusBarColor
&& mNavigationBarColor == other.mNavigationBarColor
&& mEnsureStatusBarContrastWhenTransparent
== other.mEnsureStatusBarContrastWhenTransparent
&& mEnsureNavigationBarContrastWhenTransparent
== other.mEnsureNavigationBarContrastWhenTransparent
&& mResizeMode == other.mResizeMode
&& mMinWidth == other.mMinWidth
&& mMinHeight == other.mMinHeight;
}
/** @hide */
public static boolean equals(TaskDescription td1, TaskDescription td2) {
if (td1 == null && td2 == null) {
return true;
} else if (td1 != null && td2 != null) {
return td1.equals(td2);
}
return false;
}
}
/**

24
core/java/android/window/TaskEmbedder.java
View File

@@ -26,7 +26,6 @@ import android.app.ActivityTaskManager;
import android.app.ActivityView;
import android.app.IActivityTaskManager;
import android.app.PendingIntent;
import android.app.TaskStackListener;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -129,7 +128,6 @@ public abstract class TaskEmbedder {
protected SurfaceControl.Transaction mTransaction;
protected SurfaceControl mSurfaceControl;
protected TaskStackListener mTaskStackListener;
protected Listener mListener;
protected boolean mOpened; // Protected by mGuard.
@@ -170,13 +168,6 @@ public abstract class TaskEmbedder {
if (!onInitialize()) {
return false;
}
mTaskStackListener = createTaskStackListener();
try {
mActivityTaskManager.registerTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
Log.e(TAG, "Failed to register task stack listener", e);
}
if (mListener != null && isInitialized()) {
mListener.onInitialized();
}
@@ -186,11 +177,6 @@ public abstract class TaskEmbedder {
return true;
}
/**
* @return the task stack listener for this embedder
*/
public abstract TaskStackListener createTaskStackListener();
/**
* Whether this container has been initialized.
*
@@ -420,16 +406,6 @@ public abstract class TaskEmbedder {
mSurfaceControl.release();
boolean reportReleased = onRelease();
if (mTaskStackListener != null) {
try {
mActivityTaskManager.unregisterTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
Log.e(TAG, "Failed to unregister task stack listener", e);
}
mTaskStackListener = null;
}
if (mListener != null && reportReleased) {
mListener.onReleased();
}

13
core/java/android/window/TaskOrganizer.java
View File

@@ -16,6 +16,7 @@
package android.window;
import android.annotation.BinderThread;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -39,7 +40,7 @@ public class TaskOrganizer extends WindowOrganizer {
* and receive taskVanished callbacks in the process.
*/
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
public void registerOrganizer(int windowingMode) {
public final void registerOrganizer(int windowingMode) {
try {
getController().registerTaskOrganizer(mInterface, windowingMode);
} catch (RemoteException e) {
@@ -49,7 +50,7 @@ public class TaskOrganizer extends WindowOrganizer {
/** Unregisters a previously registered task organizer. */
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
public void unregisterOrganizer() {
public final void unregisterOrganizer() {
try {
getController().unregisterTaskOrganizer(mInterface);
} catch (RemoteException e) {
@@ -57,13 +58,17 @@ public class TaskOrganizer extends WindowOrganizer {
}
}
@BinderThread
public void onTaskAppeared(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
@BinderThread
public void onTaskVanished(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
public void onTaskInfoChanged(@NonNull ActivityManager.RunningTaskInfo info) {}
@BinderThread
public void onTaskInfoChanged(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
public void onBackPressedOnTaskRoot(@NonNull ActivityManager.RunningTaskInfo info) {}
@BinderThread
public void onBackPressedOnTaskRoot(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
/** Creates a persistent root task in WM for a particular windowing-mode. */
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

37
core/java/android/window/TaskOrganizerTaskEmbedder.java
View File

@@ -21,7 +21,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.ActivityView;
import android.app.TaskStackListener;
import android.content.Context;
import android.graphics.Rect;
@@ -55,11 +54,6 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
super(context, host);
}
@Override
public TaskStackListener createTaskStackListener() {
return new TaskStackListenerImpl();
}
/**
* Whether this container has been initialized.
*
@@ -219,29 +213,6 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
Log.d(TAG, "[" + System.identityHashCode(this) + "] " + msg);
}
/**
* A task change listener that detects background color change of the topmost stack on our
* virtual display and updates the background of the surface view. This background will be shown
* when surface view is resized, but the app hasn't drawn its content in new size yet.
* It also calls StateCallback.onTaskMovedToFront to notify interested parties that the stack
* associated with the {@link ActivityView} has had a Task moved to the front. This is useful
* when needing to also bring the host Activity to the foreground at the same time.
*/
private class TaskStackListenerImpl extends TaskStackListener {
@Override
public void onTaskDescriptionChanged(ActivityManager.RunningTaskInfo taskInfo) {
if (!isInitialized()) {
return;
}
if (taskInfo.taskId == mTaskInfo.taskId) {
mTaskInfo.taskDescription = taskInfo.taskDescription;
mHost.onTaskBackgroundColorChanged(TaskOrganizerTaskEmbedder.this,
taskInfo.taskDescription.getBackgroundColor());
}
}
}
private class TaskOrganizerImpl extends TaskOrganizer {
@Override
public void onTaskAppeared(ActivityManager.RunningTaskInfo taskInfo) {
@@ -249,7 +220,6 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
log("taskAppeared: " + taskInfo.taskId);
}
// TODO: Ensure visibility/alpha of the leash in its initial state?
mTaskInfo = taskInfo;
mTaskToken = taskInfo.token;
mTaskLeash = mTaskToken.getLeash();
@@ -269,6 +239,13 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
}
}
@Override
public void onTaskInfoChanged(ActivityManager.RunningTaskInfo taskInfo) {
mTaskInfo.taskDescription = taskInfo.taskDescription;
mHost.post(() -> mHost.onTaskBackgroundColorChanged(TaskOrganizerTaskEmbedder.this,
taskInfo.taskDescription.getBackgroundColor()));
}
@Override
public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) {
if (DEBUG) {

18
core/java/android/window/VirtualDisplayTaskEmbedder.java
View File

@@ -67,6 +67,7 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
private VirtualDisplay mVirtualDisplay;
private Insets mForwardedInsets;
private DisplayMetrics mTmpDisplayMetrics;
private TaskStackListener mTaskStackListener;
/**
* Constructs a new TaskEmbedder.
@@ -82,11 +83,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
mSingleTaskInstance = singleTaskInstance;
}
@Override
public TaskStackListener createTaskStackListener() {
return new TaskStackListenerImpl();
}
/**
* Whether this container has been initialized.
*
@@ -124,6 +120,9 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
.setDisplayToSingleTaskInstance(displayId);
}
setForwardedInsets(mForwardedInsets);
mTaskStackListener = new TaskStackListenerImpl();
mActivityTaskManager.registerTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
e.rethrowAsRuntimeException();
}
@@ -142,6 +141,15 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
// Clear tap-exclude region (if any) for this window.
clearTapExcludeRegion();
if (mTaskStackListener != null) {
try {
mActivityTaskManager.unregisterTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
Log.e(TAG, "Failed to unregister task stack listener", e);
}
mTaskStackListener = null;
}
if (isInitialized()) {
mVirtualDisplay.release();
mVirtualDisplay = null;

13
core/java/android/window/WindowContainerToken.java
View File

@@ -84,4 +84,17 @@ public final class WindowContainerToken implements Parcelable {
public int describeContents() {
return 0;
}
@Override
public int hashCode() {
return mRealToken.asBinder().hashCode();
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof WindowContainerToken)) {
return false;
}
return mRealToken.asBinder() == ((WindowContainerToken) obj).asBinder();
}
}