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

Commit 8cdf9583 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Remove LegacyScreenshotController" into main

parents 3c6bc4d5 09b7a8ab

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -759,13 +759,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
@@ -48,7 +48,7 @@ import org.mockito.kotlin.stub 
@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;

        }

    }

}