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

Commit 83cec94c authored by Archisha Baranwal's avatar Archisha Baranwal Committed by Android (Google) Code Review
Browse files

Merge "Adding ViewCaptureAwareWindowManager to MirrorControlWindow." into main

parents 1588c43b 841f68cb
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ import android.graphics.Point;
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 +48,7 @@ import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class MirrorWindowControlTest extends SysuiTestCase {

    @Mock WindowManager mWindowManager;
    @Mock ViewCaptureAwareWindowManager mWindowManager;
    View mView;
    int mViewWidth;
    int mViewHeight;
+7 −3
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 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;
@@ -29,8 +32,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;

/**
@@ -70,11 +73,12 @@ public abstract class MirrorWindowControl {
     * @see #setDefaultPosition(LayoutParams)
     */
    private final Point mControlPosition = new Point();
    private final WindowManager mWindowManager;
    private final ViewCaptureAwareWindowManager mWindowManager;

    MirrorWindowControl(Context context) {
        mContext = context;
        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
        mWindowManager = getViewCaptureAwareWindowManagerInstance(mContext,
                enableViewCaptureTracing());
    }

    public void setWindowDelegate(@Nullable MirrorWindowDelegate windowDelegate) {