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

Commit 6df01cc2 authored by Ebru Kurnaz's avatar Ebru Kurnaz
Browse files

Use DesktopExperienceFlags for sys decor callback. 

Bug: 420950767
Test: Build next and verified
Flag: com.android.window.flags.enable_sys_decors_callbacks_via_wm
Change-Id: I0f3023b5b240fd475dba4506b1cfea19239ebfcf
parent 5891a5d4

packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayRepository.kt

+4 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package com.android.systemui.display.data.repository



import android.window.DesktopExperienceFlags

import com.android.app.displaylib.DisplayRepository as DisplayRepositoryFromLib

import com.android.app.displaylib.DisplaysWithDecorationsRepository

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.DisplayLib

import com.android.window.flags.Flags.enableSysDecorsCallbacksViaWm

import javax.inject.Inject



/**
@@ -41,7 +41,9 @@ constructor( 
    private val displaysWithDecorationsRepositoryImplFromLib: DisplaysWithDecorationsRepository,

) :

    DisplayRepositoryFromLib by displayRepositoryFromLib,

    DisplaysWithDecorationsRepository by (if (enableSysDecorsCallbacksViaWm()) {

    DisplaysWithDecorationsRepository by (if (

        DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()

    ) {

        displaysWithDecorationsRepositoryImplFromLib

    } else {

        displaysWithDecorationsRepositoryImpl

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler 
import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;

import static com.android.wm.shell.Flags.enableTaskbarNavbarUnification;

import static com.android.wm.shell.Flags.enableTaskbarOnPhones;

import static com.android.window.flags.Flags.enableSysDecorsCallbacksViaWm;



import android.content.Context;

import android.content.pm.ActivityInfo;
@@ -148,7 +147,7 @@ public class NavigationBarControllerImpl implements 
        mDisplayTracker = displayTracker;

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        commandQueue.addCallback(mCommandQueueCallbacks);

        if (enableSysDecorsCallbacksViaWm()) {

        if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()) {

            displaysWithDecorationsRepositoryCompat.registerDisplayDecorationListener(

                    mDisplayDecorationListener, mainCoroutineDispatcher);

        }