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

Merge "Check if the activity translucency was converted before converted back." into cw-f-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-09 22:59:50 +00:00
committed by Android (Google) Code Review
parent b08db484c2 39dd370d8e
commit 6d7dc11e01
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/widget/SwipeDismissLayout.java
View File

@@ -79,6 +79,7 @@ public class SwipeDismissLayout extends FrameLayout {
private VelocityTracker mVelocityTracker; private VelocityTracker mVelocityTracker;
private float mTranslationX; private float mTranslationX;
private boolean mBlockGesture = false; private boolean mBlockGesture = false;
private boolean mActivityTranslucencyConverted = false;
private final DismissAnimator mDismissAnimator = new DismissAnimator(); private final DismissAnimator mDismissAnimator = new DismissAnimator();
@@ -277,8 +278,9 @@ public class SwipeDismissLayout extends FrameLayout {
protected void cancel() { protected void cancel() {
if (!mIsWindowNativelyTranslucent) { if (!mIsWindowNativelyTranslucent) {
Activity activity = findActivity(); Activity activity = findActivity();
if (activity != null) { if (activity != null && mActivityTranslucencyConverted) {
activity.convertFromTranslucent(); activity.convertFromTranslucent();
mActivityTranslucencyConverted = false;
} }
} }
if (mProgressListener != null) { if (mProgressListener != null) {
@@ -319,7 +321,7 @@ public class SwipeDismissLayout extends FrameLayout {
if (!mIsWindowNativelyTranslucent) { if (!mIsWindowNativelyTranslucent) {
Activity activity = findActivity(); Activity activity = findActivity();
if (activity != null) { if (activity != null) {
activity.convertToTranslucent(null, null); mActivityTranslucencyConverted = activity.convertToTranslucent(null, null);
} }
} }
} }