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

Commit e4a80bb7 authored by Archisha Baranwal's avatar Archisha Baranwal
Browse files

Modified Revert of "Using ViewCaptureAwareWindowManager for adding and... 

Modified Revert of "Using ViewCaptureAwareWindowManager for adding and removing windows in SystemUI instead of"

This reverts commit 764954f0.

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

Flag: com.android.systemui.enable_view_capture_tracing

Change-Id: I22bb2af7973f8da14af7c00f87393c8a9931cca7
parent f66a357b

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ import android.view.LayoutInflater; 
import android.view.Surface;

import android.view.View;

import android.view.ViewRootImpl;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.logging.InstanceIdSequence;

import com.android.internal.util.LatencyTracker;

import com.android.keyguard.KeyguardUpdateMonitor;
@@ -129,7 +129,7 @@ public class UdfpsControllerTest extends SysuiTestCase { 
    @Mock

    private FingerprintManager mFingerprintManager;

    @Mock

    private ViewCaptureAwareWindowManager mWindowManager;

    private WindowManager mWindowManager;

    @Mock

    private StatusBarStateController mStatusBarStateController;

    @Mock

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java

+1 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.view.WindowManager; 


import androidx.test.filters.SmallTest;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.colorextraction.ColorExtractor;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;
@@ -100,7 +99,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
    @Rule public final CheckFlagsRule checkFlagsRule =

        DeviceFlagsValueProvider.createCheckFlagsRule();



    @Mock private ViewCaptureAwareWindowManager mWindowManager;

    @Mock private WindowManager mWindowManager;

    @Mock private DozeParameters mDozeParameters;

    @Spy private final NotificationShadeWindowView mNotificationShadeWindowView = spy(

            new NotificationShadeWindowView(mContext, null));

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+4 −4
Original line number Diff line number Diff line
@@ -57,12 +57,12 @@ import android.view.HapticFeedbackConstants; 
import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.View;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.InstanceId;
@@ -145,7 +145,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
    private final Execution mExecution;

    private final FingerprintManager mFingerprintManager;

    @NonNull private final LayoutInflater mInflater;

    private final ViewCaptureAwareWindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final DelayableExecutor mFgExecutor;

    @NonNull private final Executor mBiometricExecutor;

    @NonNull private final StatusBarStateController mStatusBarStateController;
@@ -659,7 +659,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
            @NonNull Execution execution,

            @NonNull @ShadeDisplayAware LayoutInflater inflater,

            @Nullable FingerprintManager fingerprintManager,

            @NonNull ViewCaptureAwareWindowManager viewCaptureAwareWindowManager,

            @NonNull @Main WindowManager windowManager,

            @NonNull StatusBarStateController statusBarStateController,

            @Main DelayableExecutor fgExecutor,

            @NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,
@@ -705,7 +705,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        // The fingerprint manager is queried for UDFPS before this class is constructed, so the

        // fingerprint manager should never be null.

        mFingerprintManager = checkNotNull(fingerprintManager);

        mWindowManager = viewCaptureAwareWindowManager;

        mWindowManager = windowManager;

        mFgExecutor = fgExecutor;

        mStatusBarStateController = statusBarStateController;

        mKeyguardStateController = keyguardStateController;

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.view.accessibility.AccessibilityManager 
import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener

import androidx.annotation.VisibleForTesting

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.animation.ActivityTransitionAnimator

import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor
@@ -88,7 +87,7 @@ class UdfpsControllerOverlay 
constructor(

    private val context: Context,

    private val inflater: LayoutInflater,

    private val windowManager: ViewCaptureAwareWindowManager,

    private val windowManager: WindowManager,

    private val accessibilityManager: AccessibilityManager,

    private val statusBarStateController: StatusBarStateController,

    private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager,

packages/SystemUI/src/com/android/systemui/keyboard/docking/binder/KeyboardDockingIndicationViewBinder.kt

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context 
import android.graphics.Paint

import android.graphics.PixelFormat

import android.view.WindowManager

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.keyboard.docking.ui.KeyboardDockingIndicationView
@@ -38,7 +37,7 @@ constructor( 
    context: Context,

    @Application private val applicationScope: CoroutineScope,

    private val viewModel: KeyboardDockingIndicationViewModel,

    private val windowManager: ViewCaptureAwareWindowManager,

    private val windowManager: WindowManager

) {



    private val windowLayoutParams =