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

Commit b3fe3948 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 2dff081f 4958d4f5

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;

    }