Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 33e39362305b (bug 1258450)

Browse Source 
--HG--
extra : rebase_source : 77bfc704c16f79f5a18a17208fbe5a4ddf1f4bd4
This commit is contained in:
Carsten "Tomcat" Book 2016-03-30 14:02:22 +02:00
parent afe732ca62
commit 856dc145c5
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/android/base/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
View File

@ -16,9 +16,6 @@
package org.mozilla.gecko.widget;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.graphics.Rect;
import android.view.MotionEvent;
import android.view.VelocityTracker;
@ -29,6 +26,13 @@ import android.widget.AbsListView;
import android.widget.AbsListView.RecyclerListener;
import android.widget.ListView;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.view.ViewPropertyAnimator;
import org.mozilla.gecko.R;
/**
* This code is based off of Jake Wharton's NOA port (https://github.com/JakeWharton/SwipeToDismissNOA)
* of Roman Nurik's SwipeToDismiss library. It has been modified for better support with async
@ -70,8 +74,6 @@ import android.widget.ListView;
* @see SwipeDismissTouchListener
*/
public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
private static final int TAG_ORIGINAL_HEIGHT = SwipeDismissListViewTouchListener.class.hashCode();
// Cached ViewConfiguration and system-wide constant values
private final int mSlop;
private final int mMinFlingVelocity;
@ -165,7 +167,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
return new AbsListView.RecyclerListener() {
@Override
public void onMovedToScrapHeap(View view) {
final Object tag = view.getTag(TAG_ORIGINAL_HEIGHT);
final Object tag = view.getTag(R.id.original_height);
// To reset the view to the correct height after its animation, the view's height
// is stored in its tag. Reset the view here.
@ -175,7 +177,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
final ViewGroup.LayoutParams lp = view.getLayoutParams();
lp.height = (int) tag;
view.setLayoutParams(lp);
view.setTag(TAG_ORIGINAL_HEIGHT, null);
view.setTag(R.id.original_height, null);
}
}
};
@ -334,7 +336,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
// height in the view's tag to flag it for the recycler. This is racy since the user
// could scroll the dismissed view off the screen, then back on the screen, before
// it's removed from the adapter, causing the dismissed view to briefly reappear.
dismissView.setTag(TAG_ORIGINAL_HEIGHT, originalHeight);
dismissView.setTag(R.id.original_height, originalHeight);
mCallback.onDismiss(mListView, dismissPosition);
mDismissing = false;

1
mobile/android/base/resources/values/ids.xml
View File

@ -8,6 +8,7 @@
<item type="id" name="tabQueueNotification"/>
<item type="id" name="tabQueueSettingsNotification" />
<item type="id" name="guestNotification"/>
<item type="id" name="original_height"/>
<item type="id" name="menu_items"/>
<item type="id" name="menu_margin"/>
<item type="id" name="recycler_view_click_support" />