Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add flag for scrolling screenshots"

Browse Source
This commit is contained in:
Miranda Kephart
2020-01-13 20:03:55 +00:00
committed by Android (Google) Code Review
parent 5e1aceef9f df62ee6e16
commit d80563874b
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
View File

@@ -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() {
}

20
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -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);