From df62ee6e1676b59ce6551d73a187529cfc0729cb Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Fri, 10 Jan 2020 18:21:44 -0500 Subject: Add flag for scrolling screenshots Adds a flag to control whether scrolling is enabled, separately from the new UI flow. Currently this just controls whether the 'Extend' chip is shown. Bug: 147424031 Test: tested with flag on and off to ensure expected behavior Change-Id: I6fba301b058e783083d40f28366dfb4a6af4495b --- .../config/sysui/SystemUiDeviceConfigFlags.java | 7 ++++++- .../systemui/screenshot/GlobalScreenshot.java | 20 +++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index 9e23c28a0711..9fbc1b74c9ae 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -350,7 +350,12 @@ public final class SystemUiDeviceConfigFlags { * (boolean) Whether screenshot flow going to the corner (instead of shown in a notification) * is enabled. */ - public static final String SCREENSHOT_CORNER_FLOW = "screenshot_corner_flow"; + 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"; private SystemUiDeviceConfigFlags() { } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index 91d5457c790c..9f2bbc680897 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -16,9 +16,11 @@ package com.android.systemui.screenshot; +import static android.provider.DeviceConfig.NAMESPACE_SYSTEMUI; import static android.view.View.VISIBLE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; +import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.SCREENSHOT_SCROLLING_ENABLED; import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_SCREENSHOT; import android.animation.Animator; @@ -48,6 +50,7 @@ import android.os.Looper; import android.os.Message; import android.os.PowerManager; import android.os.UserHandle; +import android.provider.DeviceConfig; import android.util.DisplayMetrics; import android.util.Log; import android.util.Slog; @@ -540,13 +543,16 @@ public class GlobalScreenshot { }); mActionsView.addView(actionChip); } - TextView scrollChip = (TextView) inflater.inflate( - R.layout.global_screenshot_action_chip, mActionsView, false); - Toast scrollNotImplemented = Toast.makeText( - mContext, "Not implemented", Toast.LENGTH_SHORT); - scrollChip.setText("Scroll"); // TODO (mkephart): add resource and translate - scrollChip.setOnClickListener(v -> scrollNotImplemented.show()); - mActionsView.addView(scrollChip); + + if (DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI, SCREENSHOT_SCROLLING_ENABLED, false)) { + TextView scrollChip = (TextView) inflater.inflate( + R.layout.global_screenshot_action_chip, mActionsView, false); + Toast scrollNotImplemented = Toast.makeText( + mContext, "Not implemented", Toast.LENGTH_SHORT); + scrollChip.setText("Scroll"); // TODO (mkephart): add resource and translate + scrollChip.setOnClickListener(v -> scrollNotImplemented.show()); + mActionsView.addView(scrollChip); + } ValueAnimator animator = ValueAnimator.ofFloat(0, 1); mActionsView.setY(mDisplayMetrics.heightPixels); -- cgit v1.2.3-59-g8ed1b