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

Commit 99edc2fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show window captions only on standard activities" into tm-qpr-dev am: b3fe3948 

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



Change-Id: I11edbf3231eaad2cddc7033e4ec209e489aa14e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54c1a919 b3fe3948

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.windowdecor;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -240,6 +241,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel<Caption 
    private boolean shouldShowWindowDecor(RunningTaskInfo taskInfo) {

        if (taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) return true;

        return DesktopModeStatus.IS_SUPPORTED

                && taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD

                && mDisplayController.getDisplayContext(taskInfo.displayId)

                .getResources().getConfiguration().smallestScreenWidthDp >= 600;

    }