Skip to content

Fix Huawei device bug #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mLisao wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −17
Open

Fix Huawei device bug #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 31 additions & 17 deletions appbarspring/src/main/java/android/support/design/widget/AppBarLayoutSpringBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.support.annotation.VisibleForTesting;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
Expand All @@ -16,7 +17,7 @@
public class AppBarLayoutSpringBehavior extends AppBarLayout.Behavior {
private static final int MAX_OFFSET_ANIMATION_DURATION = 600; // ms

public interface SpringOffsetCallback{
public interface SpringOffsetCallback {
void springCallback(int offset);
}

Expand Down Expand Up @@ -84,7 +85,7 @@ public boolean onNestedFling(final CoordinatorLayout coordinatorLayout,
} else {
if (velocityY < 0) {
final int targetScroll =
+ child.getDownNestedPreScrollRange();
+child.getDownNestedPreScrollRange();
animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY);
flung = true;
} else {
Expand Down Expand Up @@ -114,24 +115,37 @@ private void checkShouldSpringRecover(CoordinatorLayout coordinatorLayout, AppBa
if (mOffsetSpring > 0) animateRecoverBySpring(coordinatorLayout, abl);
}

@Override
public boolean onTouchEvent(CoordinatorLayout parent, AppBarLayout child, MotionEvent ev) {
switch (ev.getAction()) {
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
checkShouldSpringRecover(parent, child);
break;
}
return super.onTouchEvent(parent, child, ev);
}


private void animateRecoverBySpring(final CoordinatorLayout coordinatorLayout, final AppBarLayout abl) {
if (mSpringRecoverAnimator == null) {
mSpringRecoverAnimator = new ValueAnimator();
mSpringRecoverAnimator.setDuration(200);
mSpringRecoverAnimator.setInterpolator(new DecelerateInterpolator());
mSpringRecoverAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
updateSpringHeaderHeight(coordinatorLayout, abl, (int) animation.getAnimatedValue());
}
});
} else {
if (mSpringRecoverAnimator.isRunning()) {
mSpringRecoverAnimator.cancel();
// if (mSpringRecoverAnimator == null) {
mSpringRecoverAnimator = ValueAnimator.ofInt(mOffsetSpring, 0);
mSpringRecoverAnimator.setDuration(200);
mSpringRecoverAnimator.setInterpolator(new DecelerateInterpolator());
mSpringRecoverAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
updateSpringHeaderHeight(coordinatorLayout, abl, (int) animation.getAnimatedValue());
}
}
mSpringRecoverAnimator.setIntValues(mOffsetSpring, 0);
});
mSpringRecoverAnimator.start();
// } else {
// if (mSpringRecoverAnimator.isRunning()) {
// mSpringRecoverAnimator.cancel();
// }
// }
// mSpringRecoverAnimator.setIntValues(mOffsetSpring, 0);

}

private static boolean checkFlag(final int flags, final int check) {
Expand Down