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

Merge "Hide CaptionDecorView behind CAPTION_ON_SHELL flag" into tm-dev

Browse Source
This commit is contained in:
Garfield Tan
2022-03-31 00:03:59 +00:00
committed by Android (Google) Code Review
parent 91da83b715 47acf93da2
commit 3bea7df55b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/ViewRootImpl.java
View File

@@ -278,7 +278,8 @@ public final class ViewRootImpl implements ViewParent,
* Whether the caption is drawn by the shell. * Whether the caption is drawn by the shell.
* @hide * @hide
*/ */
public static final boolean CAPTION_ON_SHELL = false; public static final boolean CAPTION_ON_SHELL =
SystemProperties.getBoolean("persist.debug.caption_on_shell", false);
/** /**
* Whether the client should compute the window frame on its own. * Whether the client should compute the window frame on its own.

3
core/java/com/android/internal/policy/DecorView.java
View File

@@ -2259,7 +2259,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
attrs.type == TYPE_APPLICATION || attrs.type == TYPE_DRAWN_APPLICATION; attrs.type == TYPE_APPLICATION || attrs.type == TYPE_DRAWN_APPLICATION;
final WindowConfiguration winConfig = getResources().getConfiguration().windowConfiguration; final WindowConfiguration winConfig = getResources().getConfiguration().windowConfiguration;
// Only a non floating application window on one of the allowed workspaces can get a caption // Only a non floating application window on one of the allowed workspaces can get a caption
if (!mWindow.isFloating() && isApplication && winConfig.hasWindowDecorCaption()) { if (!mWindow.isFloating() && isApplication && winConfig.hasWindowDecorCaption()
&& !CAPTION_ON_SHELL) {
// Dependent on the brightness of the used title we either use the // Dependent on the brightness of the used title we either use the
// dark or the light button frame. // dark or the light button frame.
if (decorCaptionView == null) { if (decorCaptionView == null) {