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

Commit 1d25c1be authored by Archisha Baranwal's avatar Archisha Baranwal
Browse files

Modified Revert of "Using ViewCaptureAwareWindowManager to enable view traci..." 

Revert submission 27456336-viewCaptureWindow

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

Reverted changes: /q/submissionid:27456336-viewCaptureWindow

Flag: com.android.systemui.enable_view_capture_tracing

Change-Id: I9702068ca96452f1a13cb51de782e2a52a478e97
parent c9e4e829

packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java

+4 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.view.WindowManager; 
import android.view.animation.PathInterpolator;

import android.widget.FrameLayout;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.systemui.assist.AssistLogger;
@@ -67,7 +66,7 @@ public class DefaultUiController implements AssistManager.UiController { 
    protected InvocationLightsView mInvocationLightsView;

    protected final AssistLogger mAssistLogger;



    private final ViewCaptureAwareWindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final MetricsLogger mMetricsLogger;

    private final Lazy<AssistManager> mAssistManagerLazy;

    private final WindowManager.LayoutParams mLayoutParams;
@@ -81,12 +80,12 @@ public class DefaultUiController implements AssistManager.UiController { 


    @Inject

    public DefaultUiController(Context context, AssistLogger assistLogger,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager,

            MetricsLogger metricsLogger, Lazy<AssistManager> assistManagerLazy,

            WindowManager windowManager, MetricsLogger metricsLogger,

            Lazy<AssistManager> assistManagerLazy,

            NavigationBarController navigationBarController) {

        mAssistLogger = assistLogger;

        mRoot = new FrameLayout(context);

        mWindowManager = viewCaptureAwareWindowManager;

        mWindowManager = windowManager;

        mMetricsLogger = metricsLogger;

        mAssistManagerLazy = assistManagerLazy;

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/SideFpsProgressBar.kt

+2 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT 
import android.view.WindowManager

import android.widget.ProgressBar

import androidx.core.view.isGone

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.res.R

import javax.inject.Inject
@@ -38,7 +37,7 @@ class SideFpsProgressBar 
@Inject

constructor(

    private val layoutInflater: LayoutInflater,

    private val windowManager: ViewCaptureAwareWindowManager,

    private val windowManager: WindowManager,

) {

    private var overlayView: View? = null
@@ -91,7 +90,7 @@ constructor( 
    ) {

        if (overlayView == null) {

            overlayView = layoutInflater.inflate(R.layout.sidefps_progress_bar, null, false)

            windowManager.addView(requireNotNull(overlayView), overlayViewParams)

            windowManager.addView(overlayView, overlayViewParams)

            progressBar?.pivotX = 0.0f

            progressBar?.pivotY = 0.0f

        }

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt

+1 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import androidx.annotation.VisibleForTesting 
import androidx.core.os.postDelayed

import androidx.core.view.isVisible

import androidx.dynamicanimation.animation.DynamicAnimation

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.internal.jank.Cuj

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.util.LatencyTracker
@@ -85,7 +84,7 @@ class BackPanelController 
@AssistedInject

constructor(

    @Assisted context: Context,

    private val windowManager: ViewCaptureAwareWindowManager,

    private val windowManager: WindowManager,

    private val viewConfiguration: ViewConfiguration,

    @Assisted private val mainHandler: Handler,

    private val systemClock: SystemClock,

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java

+3 −4
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import androidx.annotation.Nullable; 
import androidx.annotation.VisibleForTesting;

import androidx.annotation.WorkerThread;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.logging.UiEventLogger;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;
@@ -186,7 +185,7 @@ public class InternetDetailsContentController implements AccessPointController.A 
    private GlobalSettings mGlobalSettings;

    private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private ConnectivityManager.NetworkCallback mConnectivityManagerNetworkCallback;

    private ViewCaptureAwareWindowManager mWindowManager;

    private WindowManager mWindowManager;

    private ToastFactory mToastFactory;

    private SignalDrawable mSignalDrawable;

    private SignalDrawable mSecondarySignalDrawable; // For the secondary mobile data sub in DSDS
@@ -252,7 +251,7 @@ public class InternetDetailsContentController implements AccessPointController.A 
            @Main Handler handler, @Main Executor mainExecutor,

            BroadcastDispatcher broadcastDispatcher, KeyguardUpdateMonitor keyguardUpdateMonitor,

            GlobalSettings globalSettings, KeyguardStateController keyguardStateController,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager, ToastFactory toastFactory,

            @ShadeDisplayAware WindowManager windowManager, ToastFactory toastFactory,

            @Background Handler workerHandler,

            CarrierConfigTracker carrierConfigTracker,

            LocationController locationController,
@@ -284,7 +283,7 @@ public class InternetDetailsContentController implements AccessPointController.A 
        mAccessPointController = accessPointController;

        mWifiIconInjector = new WifiUtils.InternetIconInjector(mContext);

        mConnectivityManagerNetworkCallback = new DataConnectivityListener();

        mWindowManager = viewCaptureAwareWindowManager;

        mWindowManager = windowManager;

        mToastFactory = toastFactory;

        mSignalDrawable = new SignalDrawable(mContext);

        mSecondarySignalDrawable = new SignalDrawable(mContext);

packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.view.ViewConfiguration 
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.internal.jank.Cuj

import com.android.internal.util.LatencyTracker

import com.android.systemui.SysuiTestCase
@@ -64,7 +63,7 @@ class BackPanelControllerTest : SysuiTestCase() { 
    private var triggerThreshold: Float = 0.0f

    private val touchSlop = ViewConfiguration.get(context).scaledEdgeSlop

    @Mock private lateinit var vibratorHelper: VibratorHelper

    @Mock private lateinit var viewCaptureAwareWindowManager: ViewCaptureAwareWindowManager

    @Mock private lateinit var windowManager: WindowManager

    @Mock private lateinit var configurationController: ConfigurationController

    @Mock private lateinit var latencyTracker: LatencyTracker

    private val interactionJankMonitor by lazy { kosmos.interactionJankMonitor }
@@ -79,7 +78,7 @@ class BackPanelControllerTest : SysuiTestCase() { 
        mBackPanelController =

            BackPanelController(

                context,

                viewCaptureAwareWindowManager,

                windowManager,

                ViewConfiguration.get(context),

                Handler.createAsync(testableLooper.looper),

                systemClock,