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

Check if context is actually an activity.

Browse Source 
Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
This commit is contained in:
Filip Gruszczynski
2014-10-23 10:56:24 -07:00
parent ce3d72e4ad
commit 625ec48491
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,8 +107,10 @@ public class SwipeDismissLayout extends FrameLayout {
// and temporarily disables translucency when it is fully visible. // and temporarily disables translucency when it is fully visible.
// As soon as the user starts swiping, we will re-enable // As soon as the user starts swiping, we will re-enable
// translucency. // translucency.
if (context instanceof Activity) {
((Activity) context).convertFromTranslucent(); ((Activity) context).convertFromTranslucent();
} }
}
public void setOnDismissedListener(OnDismissedListener listener) { public void setOnDismissedListener(OnDismissedListener listener) {
mDismissedListener = listener; mDismissedListener = listener;
@@ -203,7 +205,9 @@ public class SwipeDismissLayout extends FrameLayout {
mLastX = ev.getRawX(); mLastX = ev.getRawX();
updateSwiping(ev); updateSwiping(ev);
if (mSwiping) { if (mSwiping) {
if (getContext() instanceof Activity) {
((Activity) getContext()).convertToTranslucent(null, null); ((Activity) getContext()).convertToTranslucent(null, null);
}
setProgress(ev.getRawX() - mDownX); setProgress(ev.getRawX() - mDownX);
break; break;
} }
@@ -225,7 +229,9 @@ public class SwipeDismissLayout extends FrameLayout {
} }
protected void cancel() { protected void cancel() {
if (getContext() instanceof Activity) {
((Activity) getContext()).convertFromTranslucent(); ((Activity) getContext()).convertFromTranslucent();
}
if (mProgressListener != null) { if (mProgressListener != null) {
mProgressListener.onSwipeCancelled(this); mProgressListener.onSwipeCancelled(this);
} }