diff options
| author | Evan Rosky <erosky@google.com> | 2020-02-19 18:43:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-19 18:43:36 +0000 |
| commit | 2d88183bded7df73f25cf606739e3179784fdc30 (patch) | |
| tree | 5970de852ff7d87a332163eccd3843d28b977216 /core/java/android | |
| parent | 520fa831ceb657c6a186a36b2ac2378879b0f1d6 (diff) | |
| parent | af9f27cdc24017437349a46be4c820506dec2a6e (diff) | |
Merge "SystemUI Split via TaskOrganizer"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/IActivityTaskManager.aidl | 5 | ||||
| -rw-r--r-- | core/java/android/view/WindowlessWindowManager.java | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl index 180507cd7e9c..3c475c1a8083 100644 --- a/core/java/android/app/IActivityTaskManager.aidl +++ b/core/java/android/app/IActivityTaskManager.aidl @@ -315,11 +315,6 @@ interface IActivityTaskManager { void positionTaskInStack(int taskId, int stackId, int position); void reportSizeConfigurations(in IBinder token, in int[] horizontalSizeConfiguration, in int[] verticalSizeConfigurations, in int[] smallestWidthConfigurations); - /** - * Dismisses split-screen multi-window mode. - * {@param toTop} If true the current primary split-screen stack will be placed or left on top. - */ - void dismissSplitScreenMode(boolean toTop); /** * Dismisses PiP diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java index 62f3fa4f6ed4..87dcba0490ee 100644 --- a/core/java/android/view/WindowlessWindowManager.java +++ b/core/java/android/view/WindowlessWindowManager.java @@ -163,6 +163,15 @@ public class WindowlessWindowManager implements IWindowSession { return !PixelFormat.formatHasAlpha(attrs.format); } + /** @hide */ + protected SurfaceControl getSurfaceControl(View rootView) { + final State s = mStateForWindow.get(rootView.getViewRootImpl().mWindow.asBinder()); + if (s == null) { + return null; + } + return s.mSurfaceControl; + } + @Override public int relayout(IWindow window, int seq, WindowManager.LayoutParams inAttrs, int requestedWidth, int requestedHeight, int viewFlags, int flags, long frameNumber, |