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

Commit 09b7a8ab authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Remove LegacyScreenshotController 

Bug: 354711957
Test: manual, atest
Flag: EXEMPT removing flag
Change-Id: I5c6c0daa9d1f47446bd1fbf38b3487d8ac7f19c0
parent 8abd55d5

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -763,13 +763,6 @@ flag { 
    }

}



flag {

    name: "screenshot_ui_controller_refactor"

    namespace: "systemui"

    description: "Simplify and refactor ScreenshotController"

    bug: "354711957"

}



flag {

    name: "screenshot_multidisplay_focus_change"

    namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/TakeScreenshotExecutorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import org.mockito.Mockito.verifyNoMoreInteractions 
@SmallTest

class TakeScreenshotExecutorTest : SysuiTestCase() {



    private val controller = mock<LegacyScreenshotController>()

    private val controller = mock<ScreenshotController>()

    private val notificationsController0 = mock<ScreenshotNotificationsController>()

    private val notificationsController1 = mock<ScreenshotNotificationsController>()

    private val controllerFactory = mock<InteractiveScreenshotHandler.Factory>()

packages/SystemUI/src/com/android/systemui/screenshot/LegacyScreenshotController.java

deleted100644 → 0
+0 −762

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java

+1 −9
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.screenshot.dagger;



import static com.android.systemui.Flags.screenshotUiControllerRefactor;



import android.app.Service;

import android.view.accessibility.AccessibilityManager;
@@ -25,7 +23,6 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.screenshot.ImageCapture;

import com.android.systemui.screenshot.ImageCaptureImpl;

import com.android.systemui.screenshot.InteractiveScreenshotHandler;

import com.android.systemui.screenshot.LegacyScreenshotController;

import com.android.systemui.screenshot.ScreenshotController;

import com.android.systemui.screenshot.ScreenshotSoundController;

import com.android.systemui.screenshot.ScreenshotSoundControllerImpl;
@@ -93,12 +90,7 @@ public abstract class ScreenshotModule { 


    @Provides

    static InteractiveScreenshotHandler.Factory providesScreenshotController(

            LegacyScreenshotController.Factory legacyScreenshotController,

            ScreenshotController.Factory screenshotController) {

        if (screenshotUiControllerRefactor()) {

        return screenshotController;

        } else {

            return legacyScreenshotController;

        }

    }

}