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

Merge "Fix a bug in maximize buttons in legacy captions" into tm-qpr-dev

Browse Source
This commit is contained in:
Garfield Tan
2022-06-10 21:53:56 +00:00
committed by Android (Google) Code Review
parent d6004823d5 6be9f83cb0
commit 8aaccc88e5
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java
View File

@@ -106,8 +106,6 @@ public class FreeformTaskListener<T extends AutoCloseable>
taskInfo.taskId); taskInfo.taskId);
state.mTaskInfo = taskInfo; state.mTaskInfo = taskInfo;
mWindowDecorationViewModel.onTaskInfoChanged(state.mTaskInfo, state.mWindowDecoration); mWindowDecorationViewModel.onTaskInfoChanged(state.mTaskInfo, state.mWindowDecoration);
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TASK_ORG, "Freeform Task Info Changed: #%d",
taskInfo.taskId);
} }
@Override @Override

15
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java
View File

@@ -30,6 +30,7 @@ import android.view.LayoutInflater;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.SurfaceControlViewHost; import android.view.SurfaceControlViewHost;
import android.view.View; import android.view.View;
import android.view.ViewRootImpl;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.WindowlessWindowManager; import android.view.WindowlessWindowManager;
import android.window.WindowContainerTransaction; import android.window.WindowContainerTransaction;
@@ -201,12 +202,16 @@ public class WindowDecoration<T extends View & TaskFocusStateConsumer> implement
mViewHost.relayout(lp); mViewHost.relayout(lp);
} }
outResult.mRootView.setTaskFocusState(mTaskInfo.isFocused); if (ViewRootImpl.CAPTION_ON_SHELL) {
outResult.mRootView.setTaskFocusState(mTaskInfo.isFocused);
// Caption insets // Caption insets
mCaptionInsetsRect.set(taskBounds); mCaptionInsetsRect.set(taskBounds);
mCaptionInsetsRect.bottom = mCaptionInsetsRect.top + captionHeight; mCaptionInsetsRect.bottom = mCaptionInsetsRect.top + captionHeight;
wct.addRectInsetsProvider(mTaskInfo.token, mCaptionInsetsRect, CAPTION_INSETS_TYPES); wct.addRectInsetsProvider(mTaskInfo.token, mCaptionInsetsRect, CAPTION_INSETS_TYPES);
} else {
outResult.mRootView.setVisibility(View.GONE);
}
// Task surface itself // Task surface itself
Point taskPosition = mTaskInfo.positionInParent; Point taskPosition = mTaskInfo.positionInParent;

1
services/core/java/com/android/server/wm/ActivityClientController.java
View File

@@ -949,6 +949,7 @@ class ActivityClientController extends IActivityClientController.Stub {
if (rootTask.inFreeformWindowingMode()) { if (rootTask.inFreeformWindowingMode()) {
rootTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN); rootTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
rootTask.setBounds(null);
} else if (!r.supportsFreeform()) { } else if (!r.supportsFreeform()) {
throw new IllegalStateException( throw new IllegalStateException(
"This activity is currently not freeform-enabled"); "This activity is currently not freeform-enabled");