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

Commit 8c464154 authored by Ben Lin's avatar Ben Lin
Browse files

Flags.enableBugFixesForSecondaryDisplay ... -> DesktopExperienceFlags. 

Bug: 407921246
Test: Build
Flag: EXEMPT Flag update
Change-Id: I47813d826934b952a2d73fce2fc18bc25c3f4aad
parent 5255398e

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+3 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import android.view.WindowManager.TRANSIT_PIP 
import android.view.WindowManager.TRANSIT_TO_FRONT

import android.widget.Toast

import android.window.DesktopExperienceFlags

import android.window.DesktopExperienceFlags.ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY

import android.window.DesktopExperienceFlags.ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY

import android.window.DesktopModeFlags

import android.window.DesktopModeFlags.DISABLE_NON_RESIZABLE_APP_SNAP_RESIZE
@@ -130,7 +131,6 @@ import com.android.wm.shell.recents.RecentsTransitionHandler 
import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.recents.RecentsTransitionStateListener.RecentsTransitionState

import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_NOT_RUNNING

import com.android.wm.shell.shared.R as SharedR

import com.android.wm.shell.shared.TransitionUtil

import com.android.wm.shell.shared.annotations.ExternalThread

import com.android.wm.shell.shared.annotations.ShellDesktopThread
@@ -169,6 +169,7 @@ import java.util.concurrent.TimeUnit 
import java.util.function.Consumer

import kotlin.coroutines.suspendCoroutine

import kotlin.jvm.optionals.getOrNull

import com.android.wm.shell.shared.R as SharedR



/**

 * A callback to be invoked when a transition is started via |Transitions.startTransition| with the
@@ -3611,7 +3612,7 @@ class DesktopTasksController( 
                    syncQueue,

                    taskInfo,

                    displayController,

                    if (Flags.enableBugFixesForSecondaryDisplay()) {

                    if (ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY.isTrue) {

                        displayController.getDisplayContext(taskInfo.displayId)

                    } else {

                        context

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/VisualIndicatorViewContainer.kt

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import android.view.WindowManager 
import android.view.WindowlessWindowManager

import android.view.animation.DecelerateInterpolator

import android.widget.FrameLayout

import android.window.DesktopExperienceFlags

import androidx.core.animation.doOnEnd

import com.android.internal.annotations.VisibleForTesting

import com.android.window.flags.Flags

import com.android.wm.shell.R

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.DisplayLayout
@@ -92,7 +92,7 @@ constructor( 
            val metrics = resources.displayMetrics

            val screenWidth: Int

            val screenHeight: Int

            if (Flags.enableBugFixesForSecondaryDisplay()) {

            if (DesktopExperienceFlags.ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY.isTrue) {

                screenWidth = layout.width()

                screenHeight = layout.height()

            } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -1829,7 +1829,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 
        }

        final DesktopModeWindowDecoration windowDecoration =

                mDesktopModeWindowDecorFactory.create(

                        Flags.enableBugFixesForSecondaryDisplay()

                        DesktopExperienceFlags.ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY.isTrue()

                                ? mDisplayController.getDisplayContext(taskInfo.displayId)

                                : mContext,

                        mContext.createContextAsUser(UserHandle.of(taskInfo.userId), 0 /* flags */),