diff options
3 files changed, 8 insertions, 8 deletions
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 8e7337941823..ae10bef45586 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -415,7 +415,7 @@ flag { } flag { - name: "screenshot_shelf_ui" + name: "screenshot_shelf_ui2" namespace: "systemui" description: "Use new shelf UI flow for screenshots" bug: "329659738" diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index 3207db9fa230..0217fc2b56e8 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -19,7 +19,7 @@ package com.android.systemui.screenshot; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; -import static com.android.systemui.Flags.screenshotShelfUi; +import static com.android.systemui.Flags.screenshotShelfUi2; 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_INPUT; @@ -403,7 +403,7 @@ public class ScreenshotController { return; } - if (screenshotShelfUi()) { + if (screenshotShelfUi2()) { final UUID requestId = UUID.randomUUID(); final String screenshotId = String.format("Screenshot_%s", requestId); mActionsProvider = mActionsProviderFactory.create( @@ -454,7 +454,7 @@ public class ScreenshotController { // ignore system bar insets for the purpose of window layout mWindow.getDecorView().setOnApplyWindowInsetsListener( (v, insets) -> WindowInsets.CONSUMED); - if (!screenshotShelfUi()) { + if (!screenshotShelfUi2()) { mScreenshotHandler.cancelTimeout(); // restarted after animation } } @@ -503,7 +503,7 @@ public class ScreenshotController { } boolean isPendingSharedTransition() { - if (screenshotShelfUi()) { + if (screenshotShelfUi2()) { return mActionExecutor.isPendingSharedTransition(); } else { return mViewProxy.isPendingSharedTransition(); @@ -624,7 +624,7 @@ public class ScreenshotController { (response) -> { mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_IMPRESSION, 0, response.getPackageName()); - if (screenshotShelfUi() && mActionsProvider != null) { + if (screenshotShelfUi2() && mActionsProvider != null) { mActionsProvider.onScrollChipReady( () -> onScrollButtonClicked(owner, response)); } else { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java index b3eaa91b8dff..dbb3cb698e45 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java @@ -16,7 +16,7 @@ package com.android.systemui.screenshot.dagger; -import static com.android.systemui.Flags.screenshotShelfUi; +import static com.android.systemui.Flags.screenshotShelfUi2; import android.app.Service; import android.view.accessibility.AccessibilityManager; @@ -102,7 +102,7 @@ public abstract class ScreenshotModule { static ScreenshotViewProxy.Factory providesScreenshotViewProxyFactory( ScreenshotShelfViewProxy.Factory shelfScreenshotViewProxyFactory, LegacyScreenshotViewProxy.Factory legacyScreenshotViewProxyFactory) { - if (screenshotShelfUi()) { + if (screenshotShelfUi2()) { return shelfScreenshotViewProxyFactory; } else { return legacyScreenshotViewProxyFactory; |