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

Merge "Remove screenshot dismiss button in non-accessibility mode"

Browse Source
This commit is contained in:
Miranda Kephart
2021-01-15 16:15:52 +00:00
committed by Android (Google) Code Review
parent 3bed69c6c0 ac9856dc05
commit 5de1afc42f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
View File

@@ -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);
mDismissButton.setAlpha(0);
mDismissButton.setVisibility(View.VISIBLE);
if (mAccessibilityManager.isEnabled()) {
mDismissButton.setAlpha(0);
mDismissButton.setVisibility(View.VISIBLE);
}
AnimatorSet dropInAnimation = new AnimatorSet();
ValueAnimator flashInAnimator = ValueAnimator.ofFloat(0, 1);