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

Commit d8056387 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Add flag for scrolling screenshots"

parents 5e1aceef df62ee6e

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -350,7 +350,12 @@ public final class SystemUiDeviceConfigFlags { 
     * (boolean) Whether screenshot flow going to the corner (instead of shown in a notification)

     * (boolean) Whether screenshot flow going to the corner (instead of shown in a notification)

     * is enabled.

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

    private SystemUiDeviceConfigFlags() {

    }

    }

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+13 −7
Original line number Original line Diff line number Diff line
@@ -16,9 +16,11 @@ 




package com.android.systemui.screenshot;

package com.android.systemui.screenshot;





import static android.provider.DeviceConfig.NAMESPACE_SYSTEMUI;

import static android.view.View.VISIBLE;

import static android.view.View.VISIBLE;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

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 static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_SCREENSHOT;





import android.animation.Animator;

import android.animation.Animator;
@@ -48,6 +50,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.Message;

import android.os.PowerManager;

import android.os.PowerManager;

import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;
@@ -540,6 +543,8 @@ public class GlobalScreenshot { 
            });

            });

            mActionsView.addView(actionChip);

            mActionsView.addView(actionChip);

        }

        }



        if (DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI, SCREENSHOT_SCROLLING_ENABLED, false)) {

            TextView scrollChip = (TextView) inflater.inflate(

            TextView scrollChip = (TextView) inflater.inflate(

                    R.layout.global_screenshot_action_chip, mActionsView, false);

                    R.layout.global_screenshot_action_chip, mActionsView, false);

            Toast scrollNotImplemented = Toast.makeText(

            Toast scrollNotImplemented = Toast.makeText(
@@ -547,6 +552,7 @@ public class GlobalScreenshot { 
            scrollChip.setText("Scroll"); // TODO (mkephart): add resource and translate

            scrollChip.setText("Scroll"); // TODO (mkephart): add resource and translate

            scrollChip.setOnClickListener(v -> scrollNotImplemented.show());

            scrollChip.setOnClickListener(v -> scrollNotImplemented.show());

            mActionsView.addView(scrollChip);

            mActionsView.addView(scrollChip);

        }





        ValueAnimator animator = ValueAnimator.ofFloat(0, 1);

        ValueAnimator animator = ValueAnimator.ofFloat(0, 1);

        mActionsView.setY(mDisplayMetrics.heightPixels);

        mActionsView.setY(mDisplayMetrics.heightPixels);