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

Commit ac9856dc authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Remove screenshot dismiss button in non-accessibility mode 

Bug: 177562516
Bug: 157223526
Fix: 177562516
Test: manual
Change-Id: Ia1352bacc2f5b10746f33a0080eafd8fbe91446d
parent 19d37240

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

+8 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.view.View; 
import android.view.ViewOutlineProvider;

import android.view.ViewTreeObserver;

import android.view.WindowInsets;

import android.view.accessibility.AccessibilityManager;

import android.view.animation.AccelerateInterpolator;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;
@@ -117,6 +118,7 @@ public class ScreenshotView extends FrameLayout implements 
    private final DisplayMetrics mDisplayMetrics;

    private final float mCornerSizeX;

    private final float mDismissDeltaY;

    private final AccessibilityManager mAccessibilityManager;



    private int mNavMode;

    private int mLeftInset;
@@ -178,6 +180,8 @@ public class ScreenshotView extends FrameLayout implements 


        mDisplayMetrics = new DisplayMetrics();

        mContext.getDisplay().getRealMetrics(mDisplayMetrics);



        mAccessibilityManager = AccessibilityManager.getInstance(mContext);

    }



    /**
@@ -331,8 +335,10 @@ public class ScreenshotView extends FrameLayout implements 
        mScreenshotPreview.setScaleX(currentScale);

        mScreenshotPreview.setScaleY(currentScale);



        if (mAccessibilityManager.isEnabled()) {

            mDismissButton.setAlpha(0);

            mDismissButton.setVisibility(View.VISIBLE);

        }



        AnimatorSet dropInAnimation = new AnimatorSet();

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