Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97c55382 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ic927170c,I562d3e93 

* changes:
  Define an @IntDef for the screenshot type constants
  Correctly identify screenshot from a11y service
parents 79c111ec e91f47b1

core/java/android/view/WindowManager.java

+13 −3
Original line number Original line Diff line number Diff line
@@ -663,23 +663,33 @@ public interface WindowManager extends ViewManager { 
    }

    }





    /**

    /**

     * Message for taking fullscreen screenshot

     * Invoke screenshot flow to capture a full-screen image.

     * @hide

     * @hide

     */

     */

    int TAKE_SCREENSHOT_FULLSCREEN = 1;

    int TAKE_SCREENSHOT_FULLSCREEN = 1;





    /**

    /**

     * Message for taking screenshot of selected region.

     * Invoke screenshot flow allowing the user to select a region.

     * @hide

     * @hide

     */

     */

    int TAKE_SCREENSHOT_SELECTED_REGION = 2;

    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

     * @hide

     */

     */

    int TAKE_SCREENSHOT_PROVIDED_IMAGE = 3;

    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.

     * Enum listing the possible sources from which a screenshot was originated. Used for logging.

     *

     *

packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




package com.android.systemui.accessibility;

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;

import static com.android.internal.accessibility.common.ShortcutConstants.CHOOSER_PACKAGE_NAME;
@@ -349,7 +349,7 @@ public class SystemActions extends SystemUI { 
    private void handleTakeScreenshot() {

    private void handleTakeScreenshot() {

        ScreenshotHelper screenshotHelper = new ScreenshotHelper(mContext);

        ScreenshotHelper screenshotHelper = new ScreenshotHelper(mContext);

        screenshotHelper.takeScreenshot(WindowManager.TAKE_SCREENSHOT_FULLSCREEN, true, true,

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

    private void handleAccessibilityButton() {