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

Commit 61cc6b05 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 ac31abc6.

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: I682cd30079d8ccd2f8a6bed936d07231144a0fdf
parent 28ca6242

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerControllerTest.java

+2 −11
Original line number Diff line number Diff line
@@ -39,15 +39,11 @@ import android.view.accessibility.AccessibilityManager; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.app.viewcapture.ViewCapture;

import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.settingslib.bluetooth.HearingAidDeviceManager;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.util.settings.SecureSettings;



import kotlin.Lazy;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -78,16 +74,11 @@ public class MenuViewLayerControllerTest extends SysuiTestCase { 
    @Mock

    private WindowMetrics mWindowMetrics;



    @Mock

    private Lazy<ViewCapture> mLazyViewCapture;



    private MenuViewLayerController mMenuViewLayerController;



    @Before

    public void setUp() throws Exception {

        final WindowManager wm = mContext.getSystemService(WindowManager.class);

        final ViewCaptureAwareWindowManager viewCaptureAwareWm = new ViewCaptureAwareWindowManager(

                mWindowManager, mLazyViewCapture, /* isViewCaptureEnabled= */ false);

        doAnswer(invocation -> wm.getMaximumWindowMetrics()).when(

                mWindowManager).getMaximumWindowMetrics();

        mContext.addMockSystemService(Context.WINDOW_SERVICE, mWindowManager);
@@ -95,8 +86,8 @@ public class MenuViewLayerControllerTest extends SysuiTestCase { 
        when(mWindowMetrics.getBounds()).thenReturn(new Rect(0, 0, 1080, 2340));

        when(mWindowMetrics.getWindowInsets()).thenReturn(stubDisplayInsets());

        mMenuViewLayerController = new MenuViewLayerController(mContext, mWindowManager,

                viewCaptureAwareWm, mAccessibilityManager, mSecureSettings,

                mock(NavigationModeController.class), mHearingAidDeviceManager);

                mAccessibilityManager, mSecureSettings, mock(NavigationModeController.class),

                mHearingAidDeviceManager);

    }



    @Test

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java

+2 −6
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.accessibility.IUserInitializationCompleteCallback; 


import androidx.annotation.MainThread;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;
@@ -60,7 +59,6 @@ public class AccessibilityFloatingMenuController implements 


    private final Context mContext;

    private final WindowManager mWindowManager;

    private final ViewCaptureAwareWindowManager mViewCaptureAwareWindowManager;

    private final DisplayManager mDisplayManager;

    private final AccessibilityManager mAccessibilityManager;

    private final HearingAidDeviceManager mHearingAidDeviceManager;
@@ -105,7 +103,6 @@ public class AccessibilityFloatingMenuController implements 
    @Inject

    public AccessibilityFloatingMenuController(Context context,

            WindowManager windowManager,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager,

            DisplayManager displayManager,

            AccessibilityManager accessibilityManager,

            AccessibilityButtonTargetsObserver accessibilityButtonTargetsObserver,
@@ -118,7 +115,6 @@ public class AccessibilityFloatingMenuController implements 
            @Main Handler handler) {

        mContext = context;

        mWindowManager = windowManager;

        mViewCaptureAwareWindowManager = viewCaptureAwareWindowManager;

        mDisplayManager = displayManager;

        mAccessibilityManager = accessibilityManager;

        mAccessibilityButtonTargetsObserver = accessibilityButtonTargetsObserver;
@@ -205,8 +201,8 @@ public class AccessibilityFloatingMenuController implements 
            final Context windowContext = mContext.createWindowContext(defaultDisplay,

                    TYPE_NAVIGATION_BAR_PANEL, /* options= */ null);

            mFloatingMenu = new MenuViewLayerController(windowContext, mWindowManager,

                    mViewCaptureAwareWindowManager, mAccessibilityManager, mSecureSettings,

                    mNavigationModeController, mHearingAidDeviceManager);

                    mAccessibilityManager, mSecureSettings, mNavigationModeController,

                    mHearingAidDeviceManager);

        }



        mFloatingMenu.show();

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerController.java

+2 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.PixelFormat; 
import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.settingslib.bluetooth.HearingAidDeviceManager;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.util.settings.SecureSettings;
@@ -35,16 +34,15 @@ import com.android.systemui.util.settings.SecureSettings; 
 * of {@link IAccessibilityFloatingMenu}.

 */

class MenuViewLayerController implements IAccessibilityFloatingMenu {

    private final ViewCaptureAwareWindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final MenuViewLayer mMenuViewLayer;

    private boolean mIsShowing;



    MenuViewLayerController(Context context, WindowManager windowManager,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager,

            AccessibilityManager accessibilityManager, SecureSettings secureSettings,

            NavigationModeController navigationModeController,

            HearingAidDeviceManager hearingAidDeviceManager) {

        mWindowManager = viewCaptureAwareWindowManager;

        mWindowManager = windowManager;



        MenuViewModel menuViewModel = new MenuViewModel(

                context, accessibilityManager, secureSettings, hearingAidDeviceManager);

packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt

+4 −6
Original line number Diff line number Diff line
@@ -23,20 +23,19 @@ import android.os.SystemProperties 
import android.view.Surface

import android.view.View

import android.view.WindowManager

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.internal.annotations.VisibleForTesting

import com.android.internal.logging.UiEvent

import com.android.internal.logging.UiEventLogger

import com.android.settingslib.Utils

import com.android.systemui.res.R

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.res.R

import com.android.systemui.surfaceeffects.ripple.RippleView

import com.android.systemui.statusbar.commandline.Command

import com.android.systemui.statusbar.commandline.CommandRegistry

import com.android.systemui.statusbar.policy.BatteryController

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.surfaceeffects.ripple.RippleView

import com.android.systemui.util.time.SystemClock

import java.io.PrintWriter

import javax.inject.Inject
@@ -58,7 +57,6 @@ class WiredChargingRippleController @Inject constructor( 
    featureFlags: FeatureFlags,

    private val context: Context,

    private val windowManager: WindowManager,

    private val viewCaptureAwareWindowManager: ViewCaptureAwareWindowManager,

    private val systemClock: SystemClock,

    private val uiEventLogger: UiEventLogger

) {
@@ -163,12 +161,12 @@ class WiredChargingRippleController @Inject constructor( 
            override fun onViewAttachedToWindow(view: View) {

                layoutRipple()

                rippleView.startRipple(Runnable {

                    viewCaptureAwareWindowManager.removeView(rippleView)

                    windowManager.removeView(rippleView)

                })

                rippleView.removeOnAttachStateChangeListener(this)

            }

        })

        viewCaptureAwareWindowManager.addView(rippleView, windowLayoutParams)

        windowManager.addView(rippleView, windowLayoutParams)

        uiEventLogger.log(WiredChargingRippleEvent.CHARGING_RIPPLE_PLAYED)

    }

packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt

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

import android.view.accessibility.AccessibilityManager

import com.android.app.animation.Interpolators

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.internal.logging.InstanceId

import com.android.internal.widget.CachingIconView

import com.android.systemui.common.shared.model.ContentDescription
@@ -73,7 +72,7 @@ constructor( 
    private val commandQueue: CommandQueue,

    context: Context,

    logger: MediaTttReceiverLogger,

    viewCaptureAwareWindowManager: ViewCaptureAwareWindowManager,

    windowManager: WindowManager,

    @Main private val mainExecutor: DelayableExecutor,

    accessibilityManager: AccessibilityManager,

    configurationController: ConfigurationController,
@@ -90,7 +89,7 @@ constructor( 
    TemporaryViewDisplayController<ChipReceiverInfo, MediaTttReceiverLogger>(

        context,

        logger,

        viewCaptureAwareWindowManager,

        windowManager,

        mainExecutor,

        accessibilityManager,

        configurationController,