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

Commit 8d35fff2 authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Do not attach tiny taskbar to app during transition." into main

parents 3d7c06c1 b68ec9b6

services/core/java/com/android/server/wm/DisplayPolicy.java

+3 −1
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ import com.android.server.policy.WindowManagerPolicy.ScreenOnListener; 
import com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs;

import com.android.server.statusbar.StatusBarManagerInternal;

import com.android.server.wallpaper.WallpaperManagerInternal;

import com.android.wm.shell.Flags;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -1805,7 +1806,8 @@ public class DisplayPolicy { 
        updateConfigurationAndScreenSizeDependentBehaviors();



        final boolean shouldAttach =

                res.getBoolean(R.bool.config_attachNavBarToAppDuringTransition);

                res.getBoolean(R.bool.config_attachNavBarToAppDuringTransition)

                        && !Flags.enableTinyTaskbar();

        if (mShouldAttachNavBarToAppDuringTransition != shouldAttach) {

            mShouldAttachNavBarToAppDuringTransition = shouldAttach;

        }