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

Commit 652e59bb authored by Archisha Baranwal's avatar Archisha Baranwal
Browse files

Modified Revert of "Adding ViewCaptureAwareWindowManager to system ui windows." 

Revert submission 28141359-viewCaptureAware

Reason for revert: Reverting change due to the restructure of ViewCaptureAwareWindowManager ( go/wm-for-viewcapture )

Reverted changes: /q/submissionid:28141359-viewCaptureAware

Flag: com.android.systemui.enable_view_capture_tracing

Change-Id: Ib431936e2a8c56e10d16d78b4da408d6d2653220
parent 9cea0863

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt

+1 −10
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.lifecycle.Lifecycle 
import androidx.lifecycle.LifecycleOwner

import androidx.lifecycle.LifecycleRegistry

import androidx.test.filters.SmallTest

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.app.viewcapture.ViewCaptureFactory

import com.android.compose.animation.scene.ObservableTransitionState

import com.android.internal.logging.UiEventLogger
@@ -143,7 +142,6 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() { 
        mock<ScrimManager> { on { currentController }.thenReturn(mScrimController) }

    private val mSystemDialogsCloser = mock<SystemDialogsCloser>()

    private val mDreamOverlayCallbackController = mock<DreamOverlayCallbackController>()

    private val mLazyViewCapture = lazy { viewCaptureSpy }



    private val mViewCaptor = argumentCaptor<View>()

    private val mTouchHandlersCaptor = argumentCaptor<Set<TouchHandler>>()
@@ -156,7 +154,6 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() { 
    private val gestureInteractor = spy(kosmos.gestureInteractor)



    private lateinit var mCommunalInteractor: CommunalInteractor

    private lateinit var mViewCaptureAwareWindowManager: ViewCaptureAwareWindowManager

    private lateinit var environmentComponents: EnvironmentComponents



    private lateinit var mService: DreamOverlayService
@@ -244,18 +241,12 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() { 
                mComplicationComponentFactory,

                mAmbientTouchComponentFactory,

            )

        mViewCaptureAwareWindowManager =

            ViewCaptureAwareWindowManager(

                mWindowManager,

                mLazyViewCapture,

                isViewCaptureEnabled = false,

            )

        mService =

            DreamOverlayService(

                mContext,

                mLifecycleOwner,

                mMainExecutor,

                mViewCaptureAwareWindowManager,

                mWindowManager,

                mComplicationComponentFactory,

                mDreamComplicationComponentFactory,

                mDreamOverlayComponentFactory,

packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java

+11 −39
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.systemui.dagger;



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

import static com.android.systemui.util.ConvenienceExtensionsKt.toKotlinLazy;



import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.app.ActivityManager;
@@ -103,7 +100,6 @@ import android.telephony.CarrierConfigManager; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.satellite.SatelliteManager;

import android.view.Choreographer;

import android.view.CrossWindowBlurListeners;

import android.view.IWindowManager;

import android.view.LayoutInflater;
@@ -115,13 +111,9 @@ import android.view.accessibility.CaptioningManager; 
import android.view.inputmethod.InputMethodManager;

import android.view.textclassifier.TextClassificationManager;



import androidx.annotation.NonNull;

import androidx.asynclayoutinflater.view.AsyncLayoutInflater;

import androidx.core.app.NotificationManagerCompat;



import com.android.app.viewcapture.ViewCapture;

import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.app.viewcapture.ViewCaptureFactory;

import com.android.internal.app.IBatteryStats;

import com.android.internal.appwidget.IAppWidgetService;

import com.android.internal.jank.InteractionJankMonitor;
@@ -135,8 +127,9 @@ import com.android.systemui.dagger.qualifiers.TestHarness; 
import com.android.systemui.shared.system.PackageManagerWrapper;

import com.android.systemui.user.utils.UserScopedService;

import com.android.systemui.user.utils.UserScopedServiceImpl;

import com.android.systemui.utils.windowmanager.WindowManagerProvider;

import com.android.systemui.utils.windowmanager.WindowManagerProviderImpl;



import dagger.Lazy;

import dagger.Module;

import dagger.Provides;
@@ -713,38 +706,23 @@ public class FrameworkServicesModule { 


    @Provides

    @Singleton

    static WindowManager provideWindowManager(Context context) {

        return context.getSystemService(WindowManager.class);

    }



    /** A window manager working for the default display only. */

    @Provides

    @Singleton

    @Main

    static WindowManager provideMainWindowManager(WindowManager windowManager) {

        return windowManager;

    static WindowManagerProvider provideWindowManagerProvider() {

        return new WindowManagerProviderImpl();

    }



    @Provides

    @Singleton

    static ViewCaptureAwareWindowManager provideViewCaptureAwareWindowManager(

            WindowManager windowManager, Lazy<ViewCapture> daggerLazyViewCapture) {

        return new ViewCaptureAwareWindowManager(windowManager,

                /* lazyViewCapture= */ toKotlinLazy(daggerLazyViewCapture),

                /* isViewCaptureEnabled= */ enableViewCaptureTracing());

    static WindowManager provideWindowManager(Context context,

            WindowManagerProvider windowManagerProvider) {

        return windowManagerProvider.getWindowManager(context);

    }



    /** A window manager working for the default display only. */

    @Provides

    @Singleton

    static ViewCaptureAwareWindowManager.Factory viewCaptureAwareWindowManagerFactory(

            Lazy<ViewCapture> daggerLazyViewCapture) {

        return new ViewCaptureAwareWindowManager.Factory() {

            @NonNull

            @Override

            public ViewCaptureAwareWindowManager create(@NonNull WindowManager windowManager) {

                return provideViewCaptureAwareWindowManager(windowManager, daggerLazyViewCapture);

            }

        };

    @Main

    static WindowManager provideMainWindowManager(WindowManager windowManager) {

        return windowManager;

    }



    @Provides
@@ -833,12 +811,6 @@ public class FrameworkServicesModule { 
                ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));

    }



    @Provides

    @Singleton

    static ViewCapture provideViewCapture(Context context) {

        return ViewCaptureFactory.getInstance(context);

    }



    @Provides

    @Singleton

    @Nullable

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java

+3 −4
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import androidx.lifecycle.LifecycleService; 
import androidx.lifecycle.ServiceLifecycleDispatcher;

import androidx.lifecycle.ViewModelStore;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.compose.animation.scene.OverlayKey;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;
@@ -117,7 +116,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
    @Nullable

    private final ComponentName mHomeControlPanelDreamComponent;

    private final UiEventLogger mUiEventLogger;

    private final ViewCaptureAwareWindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final String mWindowTitle;



    // A reference to the {@link Window} used to hold the dream overlay.
@@ -378,7 +377,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
            Context context,

            DreamOverlayLifecycleOwner lifecycleOwner,

            @Main DelayableExecutor executor,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager,

            WindowManager windowManager,

            ComplicationComponent.Factory complicationComponentFactory,

            DreamComplicationComponent.Factory dreamComplicationComponentFactory,

            DreamOverlayComponent.Factory dreamOverlayComponentFactory,
@@ -403,7 +402,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
        super(executor);

        mContext = context;

        mExecutor = executor;

        mWindowManager = viewCaptureAwareWindowManager;

        mWindowManager = windowManager;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mScrimManager = scrimManager;

        mLowLightDreamComponent = lowLightDreamComponent;

packages/SystemUI/src/com/android/systemui/util/ConvenienceExtensions.kt

+0 −6
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.graphics.Rect 
import android.util.IndentingPrintWriter

import android.view.View

import android.view.ViewGroup

import dagger.Lazy

import java.io.PrintWriter



/** [Sequence] that yields all of the direct children of this [ViewGroup] */
@@ -56,11 +55,6 @@ val View.boundsOnScreen: Rect 
        return bounds

    }



/** Extension method to convert [dagger.Lazy] to [kotlin.Lazy] for object of any class [T]. */

fun <T> Lazy<T>.toKotlinLazy(): kotlin.Lazy<T> {

    return lazy { this.get() }

}



/**

 * Returns whether this [Collection] contains exactly all [elements].

 *