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

Commit f69d7c8f authored by Matt Casey's avatar Matt Casey
Browse files

Honor accessibility timeout for screenshots 

Bug: 152586199
Test: Ensure 6-second behavior remains by default, change timeout
      setting and obseve that it is honored.
Change-Id: I40b5919031bdde0174abd52b4cc3260a44d70c70
parent 1de67aa2

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

+9 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.view.ViewGroup; 
import android.view.ViewOutlineProvider;

import android.view.ViewTreeObserver;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;

import android.view.animation.AccelerateInterpolator;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;
@@ -169,7 +170,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset 
    private static final long SCREENSHOT_DISMISS_ALPHA_OFFSET_MS = 50; // delay before starting fade

    private static final float SCREENSHOT_ACTIONS_START_SCALE_X = .7f;

    private static final float ROUNDED_CORNER_RADIUS = .05f;

    private static final long SCREENSHOT_CORNER_TIMEOUT_MILLIS = 6000;

    private static final int SCREENSHOT_CORNER_DEFAULT_TIMEOUT_MILLIS = 6000;

    private static final int MESSAGE_CORNER_TIMEOUT = 2;



    private final Interpolator mAccelerateInterpolator = new AccelerateInterpolator();
@@ -588,10 +589,16 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset 
                        } else {

                            createScreenshotActionsShadeAnimation(imageData).start();

                        }

                        AccessibilityManager accessibilityManager = (AccessibilityManager)

                                mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);

                        long timeoutMs = accessibilityManager.getRecommendedTimeoutMillis(

                                SCREENSHOT_CORNER_DEFAULT_TIMEOUT_MILLIS,

                                AccessibilityManager.FLAG_CONTENT_CONTROLS);



                        mScreenshotHandler.removeMessages(MESSAGE_CORNER_TIMEOUT);

                        mScreenshotHandler.sendMessageDelayed(

                                mScreenshotHandler.obtainMessage(MESSAGE_CORNER_TIMEOUT),

                                SCREENSHOT_CORNER_TIMEOUT_MILLIS);

                                timeoutMs);

                    });

                }

            }