Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ffe8d98 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "CaptionWindowDecor: Don't show for PINNED tasks." into main

parents 7ed5b93a 19059dd1

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.windowdecor; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.content.pm.PackageManager.FEATURE_PC;

import static android.content.pm.PackageManager.FEATURE_PC;

import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;

import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_CHANGE;
@@ -174,6 +175,11 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 




        if (decoration == null) return;

        if (decoration == null) return;





        if (!shouldShowWindowDecor(taskInfo)) {

            destroyWindowDecoration(taskInfo);

            return;

        }



        decoration.relayout(taskInfo);

        decoration.relayout(taskInfo);

        setupCaptionColor(taskInfo, decoration);

        setupCaptionColor(taskInfo, decoration);

    }

    }
@@ -250,6 +256,9 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
        if (taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) {

        if (taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) {

            return true;

            return true;

        }

        }

        if (taskInfo.getWindowingMode() == WINDOWING_MODE_PINNED) {

            return false;

        }

        if (taskInfo.getActivityType() != ACTIVITY_TYPE_STANDARD) {

        if (taskInfo.getActivityType() != ACTIVITY_TYPE_STANDARD) {

            return false;

            return false;

        }

        }