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 am: 3bea7df55b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17482725

Change-Id: I7ceb12933e2c5be6aa3ba2f44654850892020f25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Garfield Tan
2022-03-31 00:21:45 +00:00
committed by Automerger Merge Worker
parent 5116b59993 3bea7df55b
commit 7e88ab1c19
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
final WindowConfiguration winConfig = getResources().getConfiguration().windowConfiguration;
// 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
// dark or the light button frame.
if (decorCaptionView == null) {