Modified Revert of "Adding ViewCaptureAwareWindowManager to MirrorControlWindow."

This reverts commit 841f68cb1955fd9e944778dda274c62707de8b0c.

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: I51783f7acc188114e9b1ea710dbe2febfbdc387f

3 files changed, 18 insertions, 15 deletions

diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MirrorWindowControlTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MirrorWindowControlTest.java
index 12c866f0adb2..463bfe5ae73f 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MirrorWindowControlTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MirrorWindowControlTest.java
@@ -27,14 +27,15 @@ import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.graphics.Point;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 
-import com.android.app.viewcapture.ViewCaptureAwareWindowManager;
 import com.android.systemui.SysuiTestCase;
 
 import org.junit.Before;
@@ -48,7 +49,7 @@ import org.mockito.MockitoAnnotations;
 @RunWith(AndroidJUnit4.class)
 public class MirrorWindowControlTest extends SysuiTestCase {
 
-    @Mock ViewCaptureAwareWindowManager mWindowManager;
+    @Mock WindowManager mWindowManager;
     View mView;
     int mViewWidth;
     int mViewHeight;
@@ -69,8 +70,12 @@ public class MirrorWindowControlTest extends SysuiTestCase {
             return null;
         }).when(mWindowManager).addView(any(View.class), any(LayoutParams.class));
 
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
         mStubMirrorWindowControl = new StubMirrorWindowControl(getContext(), mView, mViewWidth,
-                mViewHeight);
+                mViewHeight, mWindowManager);
     }
 
     @Test
@@ -122,8 +127,9 @@ public class MirrorWindowControlTest extends SysuiTestCase {
 
         boolean mInvokeOnCreateView = false;
 
-        StubMirrorWindowControl(Context context, View view, int width, int height) {
-            super(context);
+        StubMirrorWindowControl(Context context, View view, int width, int height,
+                WindowManager windowManager) {
+            super(context, windowManager);
             mView = view;
             mWidth = width;
             mHeight = height;
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MirrorWindowControl.java b/packages/SystemUI/src/com/android/systemui/accessibility/MirrorWindowControl.java
index eb4de6837d41..7f3a869d8222 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/MirrorWindowControl.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/MirrorWindowControl.java
@@ -18,9 +18,6 @@ package com.android.systemui.accessibility;
 
 import static android.view.WindowManager.LayoutParams;
 
-import static com.android.app.viewcapture.ViewCaptureFactory.getViewCaptureAwareWindowManagerInstance;
-import static com.android.systemui.Flags.enableViewCaptureTracing;
-
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.content.Context;
@@ -32,8 +29,8 @@ import android.util.MathUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 
-import com.android.app.viewcapture.ViewCaptureAwareWindowManager;
 import com.android.systemui.res.R;
 
 /**
@@ -73,12 +70,11 @@ public abstract class MirrorWindowControl {
      * @see #setDefaultPosition(LayoutParams)
      */
     private final Point mControlPosition = new Point();
-    private final ViewCaptureAwareWindowManager mWindowManager;
+    private final WindowManager mWindowManager;
 
-    MirrorWindowControl(Context context) {
+    MirrorWindowControl(Context context, WindowManager windowManager) {
         mContext = context;
-        mWindowManager = getViewCaptureAwareWindowManagerInstance(mContext,
-                enableViewCaptureTracing());
+        mWindowManager = windowManager;
     }
 
     public void setWindowDelegate(@Nullable MirrorWindowDelegate windowDelegate) {
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/SimpleMirrorWindowControl.java b/packages/SystemUI/src/com/android/systemui/accessibility/SimpleMirrorWindowControl.java
index bc469eed7359..3cde033bf56a 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/SimpleMirrorWindowControl.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/SimpleMirrorWindowControl.java
@@ -27,6 +27,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.android.systemui.res.R;
 
@@ -48,8 +49,8 @@ class SimpleMirrorWindowControl extends MirrorWindowControl implements View.OnCl
     private final PointF mLastDrag = new PointF();
     private final Handler mHandler;
 
-    SimpleMirrorWindowControl(Context context, Handler handler) {
-        super(context);
+    SimpleMirrorWindowControl(Context context, Handler handler, WindowManager windowManager) {
+        super(context, windowManager);
         mHandler = handler;
         final Resources resource = context.getResources();
         mMoveFrameAmountShort = resource.getDimensionPixelSize(