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

Merge changes Ic927170c,I562d3e93

Browse Source 
* changes:
  Define an @IntDef for the screenshot type constants
  Correctly identify screenshot from a11y service
This commit is contained in:
TreeHugger Robot
2021-01-16 01:31:16 +00:00
committed by Android (Google) Code Review
parent 79c111ec66 e91f47b1fd
commit 97c5538229
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/WindowManager.java
View File

@@ -663,23 +663,33 @@ public interface WindowManager extends ViewManager {
}
/**
* Message for taking fullscreen screenshot
* Invoke screenshot flow to capture a full-screen image.
* @hide
*/
int TAKE_SCREENSHOT_FULLSCREEN = 1;
/**
* Message for taking screenshot of selected region.
* Invoke screenshot flow allowing the user to select a region.
* @hide
*/
int TAKE_SCREENSHOT_SELECTED_REGION = 2;
/**
* Message for handling a screenshot flow with an image provided by the caller.
* Invoke screenshot flow with an image provided by the caller.
* @hide
*/
int TAKE_SCREENSHOT_PROVIDED_IMAGE = 3;
/**
* Enum listing the types of screenshot requests available.
*
* @hide
*/
@IntDef({TAKE_SCREENSHOT_FULLSCREEN,
TAKE_SCREENSHOT_SELECTED_REGION,
TAKE_SCREENSHOT_PROVIDED_IMAGE})
@interface ScreenshotType {}
/**
* Enum listing the possible sources from which a screenshot was originated. Used for logging.
*

4
packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java
View File

@@ -16,7 +16,7 @@
package com.android.systemui.accessibility;
import static android.view.WindowManager.ScreenshotSource.SCREENSHOT_GLOBAL_ACTIONS;
import static android.view.WindowManager.ScreenshotSource.SCREENSHOT_ACCESSIBILITY_ACTIONS;
import static com.android.internal.accessibility.common.ShortcutConstants.CHOOSER_PACKAGE_NAME;
@@ -349,7 +349,7 @@ public class SystemActions extends SystemUI {
private void handleTakeScreenshot() {
ScreenshotHelper screenshotHelper = new ScreenshotHelper(mContext);
screenshotHelper.takeScreenshot(WindowManager.TAKE_SCREENSHOT_FULLSCREEN, true, true,
SCREENSHOT_GLOBAL_ACTIONS, new Handler(Looper.getMainLooper()), null);
SCREENSHOT_ACCESSIBILITY_ACTIONS, new Handler(Looper.getMainLooper()), null);
}
private void handleAccessibilityButton() {