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

Commit d1f90110 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Enable view capture for the bubbles window" into main

parents 59638ad7 96d48a39

libs/WindowManager/Shell/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ android_library { 
        "//frameworks/base/packages/SystemUI/aconfig:com_android_systemui_flags_lib",

        "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib",

        "//frameworks/libs/systemui:iconloader_base",

        "//frameworks/libs/systemui:view_capture",

        "PlatformAnimationLib",

        "WindowManager-Shell-lite-proto",

        "WindowManager-Shell-proto",

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+7 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_PO 
import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT;

import static android.window.DesktopModeFlags.ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS;



import static com.android.systemui.Flags.enableViewCaptureTracing;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.IActivityTaskManager;
@@ -40,6 +42,7 @@ import android.window.DesktopModeFlags; 


import androidx.annotation.OptIn;



import com.android.app.viewcapture.ViewCaptureAwareWindowManagerFactory;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.statusbar.IStatusBarService;
@@ -300,6 +303,9 @@ public abstract class WMShellModule { 
            SyncTransactionQueue syncQueue,

            IWindowManager wmService,

            HomeIntentProvider homeIntentProvider) {

        final WindowManager wm = enableViewCaptureTracing()

                ? ViewCaptureAwareWindowManagerFactory.getInstance(context)

                : windowManager;

        return new BubbleController(

                context,

                shellInit,
@@ -315,7 +321,7 @@ public abstract class WMShellModule { 
                        new BubblePersistentRepository(context)),

                bubbleTransitions,

                statusBarService,

                windowManager,

                wm,

                displayInsetsController,

                displayImeController,

                userManager,