From 81ab12f11cb772f714d0bbbf19dc7f3a0923b73e Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Sat, 20 Mar 2021 17:16:30 -0400 Subject: [PATCH] Remove long screenshot flag It's been default true for a while but some users seem to have a false value on their phones. We intend for everyone to have it right now. Bug: 183277962 Test: Builds, long screenshot functionality shows up. Change-Id: I1a7bb3eddc2f613943b8c1c78a2ac43aa07466a6 --- .../sysui/SystemUiDeviceConfigFlags.java | 5 --- .../screenshot/ScreenshotController.java | 34 ++++++------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index 52801faf9c364..aa938419c877a 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -380,11 +380,6 @@ public final class SystemUiDeviceConfigFlags { */ public static final String SCREENSHOT_CORNER_FLOW = "enable_screenshot_corner_flow"; - /** - * (boolean) Whether scrolling screenshots are enabled. - */ - public static final String SCREENSHOT_SCROLLING_ENABLED = "enable_screenshot_scrolling"; - // Flags related to Nav Bar /** diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index c1ae29230e616..6d019d2aa6f5a 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -25,7 +25,6 @@ import static com.android.systemui.screenshot.LogConfig.DEBUG_ANIM; import static com.android.systemui.screenshot.LogConfig.DEBUG_CALLBACK; import static com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS; import static com.android.systemui.screenshot.LogConfig.DEBUG_INPUT; -import static com.android.systemui.screenshot.LogConfig.DEBUG_SCROLL; import static com.android.systemui.screenshot.LogConfig.DEBUG_UI; import static com.android.systemui.screenshot.LogConfig.DEBUG_WINDOW; import static com.android.systemui.screenshot.LogConfig.logTag; @@ -56,7 +55,6 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Message; -import android.provider.DeviceConfig; import android.provider.Settings; import android.util.DisplayMetrics; import android.util.Log; @@ -78,7 +76,6 @@ import android.view.accessibility.AccessibilityManager; import android.widget.Toast; import com.android.internal.app.ChooserActivity; -import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.internal.logging.UiEventLogger; import com.android.internal.policy.PhoneWindow; import com.android.settingslib.applications.InterestingConfigChanges; @@ -86,7 +83,6 @@ import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ActionTransition; import com.android.systemui.screenshot.TakeScreenshotService.RequestCallback; -import com.android.systemui.util.DeviceConfigProxy; import com.google.common.util.concurrent.ListenableFuture; @@ -193,7 +189,6 @@ public class ScreenshotController { private final AccessibilityManager mAccessibilityManager; private final MediaActionSound mCameraSound; private final ScrollCaptureClient mScrollCaptureClient; - private final DeviceConfigProxy mConfigProxy; private final PhoneWindow mWindow; private final DisplayManager mDisplayManager; @@ -237,7 +232,6 @@ public class ScreenshotController { ScreenshotNotificationsController screenshotNotificationsController, ScrollCaptureClient scrollCaptureClient, UiEventLogger uiEventLogger, - DeviceConfigProxy configProxy, ImageExporter imageExporter, @Main Executor mainExecutor) { mScreenshotSmartActions = screenshotSmartActions; @@ -254,7 +248,6 @@ public class ScreenshotController { mWindowManager = mContext.getSystemService(WindowManager.class); mAccessibilityManager = AccessibilityManager.getInstance(mContext); - mConfigProxy = configProxy; // Setup the window that we are going to use mWindowLayoutParams = new WindowManager.LayoutParams( @@ -525,22 +518,17 @@ public class ScreenshotController { // The window is focusable by default setWindowFocusable(true); - if (mConfigProxy.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, - SystemUiDeviceConfigFlags.SCREENSHOT_SCROLLING_ENABLED, true)) { - View decorView = mWindow.getDecorView(); - - // Wait until this window is attached to request because it is - // the reference used to locate the target window (below). - withWindowAttached(() -> { - mScrollCaptureClient.setHostWindowToken(decorView.getWindowToken()); - if (mLastScrollCaptureRequest != null) { - mLastScrollCaptureRequest.cancel(true); - } - mLastScrollCaptureRequest = mScrollCaptureClient.request(DEFAULT_DISPLAY); - mLastScrollCaptureRequest.addListener(() -> - onScrollCaptureResponseReady(mLastScrollCaptureRequest), mMainExecutor); - }); - } + // Wait until this window is attached to request because it is + // the reference used to locate the target window (below). + withWindowAttached(() -> { + mScrollCaptureClient.setHostWindowToken(mWindow.getDecorView().getWindowToken()); + if (mLastScrollCaptureRequest != null) { + mLastScrollCaptureRequest.cancel(true); + } + mLastScrollCaptureRequest = mScrollCaptureClient.request(DEFAULT_DISPLAY); + mLastScrollCaptureRequest.addListener(() -> + onScrollCaptureResponseReady(mLastScrollCaptureRequest), mMainExecutor); + }); attachWindow(); mScreenshotView.getViewTreeObserver().addOnPreDrawListener(