diff --git a/extras/PullToRefreshViewPager/project.properties b/extras/PullToRefreshViewPager/project.properties index 927fba41c..f8231ba8e 100644 --- a/extras/PullToRefreshViewPager/project.properties +++ b/extras/PullToRefreshViewPager/project.properties @@ -12,5 +12,5 @@ android.library=true # Project target. -target=android-16 +target=android-19 android.library.reference.1=../../library diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index c3db5673d..780e594b4 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="2.1.3" > diff --git a/library/pom.xml b/library/pom.xml index 6b48e0adb..cf02da978 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -10,7 +10,7 @@ com.github.chrisbanes.pulltorefresh parent - 2.1.2-SNAPSHOT + 2.1.3 diff --git a/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java b/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java index e76b234f3..63d795919 100644 --- a/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java +++ b/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java @@ -46,7 +46,7 @@ public abstract class PullToRefreshBase extends LinearLayout imp // Constants // =========================================================== - static final boolean DEBUG = true; + static final boolean DEBUG = false; static final boolean USE_HW_LAYERS = false; @@ -82,7 +82,7 @@ public abstract class PullToRefreshBase extends LinearLayout imp private FrameLayout mRefreshableViewWrapper; private boolean mShowViewWhileRefreshing = true; - private boolean mScrollingWhileRefreshingEnabled = false; + private boolean mScrollingWhileRefreshingEnabled = true; private boolean mFilterTouchEvents = true; private boolean mOverScrollEnabled = true; private boolean mLayoutVisibilityChangesEnabled = true; @@ -1130,7 +1130,7 @@ private void init(Context context, AttributeSet attrs) { if (a.hasValue(R.styleable.PullToRefresh_ptrScrollingWhileRefreshingEnabled)) { mScrollingWhileRefreshingEnabled = a.getBoolean( - R.styleable.PullToRefresh_ptrScrollingWhileRefreshingEnabled, false); + R.styleable.PullToRefresh_ptrScrollingWhileRefreshingEnabled, true); } // Let the derivative classes have a go at handling attributes, then @@ -1143,6 +1143,9 @@ private void init(Context context, AttributeSet attrs) { } private boolean isReadyForPull() { + if (isRefreshing()) { + return false; + } switch (mMode) { case PULL_FROM_START: return isReadyForPullStart(); diff --git a/pom.xml b/pom.xml index 1a755fea7..2f6e06e5d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.chrisbanes.pulltorefresh parent pom - 2.1.2-SNAPSHOT + 2.1.3 Android-PullToRefresh Project Implementation of the Pull-to-Refresh UI Pattern for Android. https://github.com/chrisbanes/Android-PullToRefresh @@ -45,7 +45,7 @@ 1.6 4.1.1.4 16 - 3.2.0 + 3.6.1 @@ -113,8 +113,9 @@ com.android.ide.eclipse.adt.ApkBuilder - - + + + src