am 5f10f73d: (-s ours) Revert 0794d29b: Fix docs build. Do not merge.
* commit '5f10f73d0803aa906a93b630beaeeb9b1ab5f35e':
Revert 0794d29b: Fix docs build. Do not merge.
diff --git a/v13/java/android/support/v13/app/RemoteViewsCompat.java b/v13/java/android/support/v13/app/RemoteViewsCompat.java
index c8162ba..3c7c04a 100644
--- a/v13/java/android/support/v13/app/RemoteViewsCompat.java
+++ b/v13/java/android/support/v13/app/RemoteViewsCompat.java
@@ -26,14 +26,15 @@
/**
* This is a compatibility version of RemoteViews which simplifies the creation of basic collection
- * widgets (ie. widgets containing {@link ListView}, {@link GridView}, {@link StackView} or
- * {@link AdapterViewAnimator}). This class provides a compatibility version of the method
- * {@link RemoteViews#setRemoteAdapter(int, ArrayList)}, introduced in API level 18. For platform
- * versions supporting the new API, this class will act as a simple pass-through, and for prior
- * versions will emulate the new API's behavior.
+ * widgets (ie. widgets containing {@link android.widget.ListView}, {@link android.widget.GridView},
+ * {@link android.widget.StackView} or {@link android.widget.AdapterViewAnimator}). This class
+ * provides a compatibility version of the method RemoteViews#setRemoteAdapter(int, ArrayList),
+ * introduced in API level 18. For platform versions supporting the new API, this class will act as
+ * a simple pass-through, and for prior versions will emulate the new API's behavior.
*
* Be sure to include declare {@link RemoteViewsServiceCompat} in your manifest, as specified in
- * the doc for {@link RemoteViews#setRemoteAdapter(int, ArrayList)}.
+ * the doc for
+ * {@link RemoteViewsCompat#setRemoteAdapter(RemoteViews, Context, int, int, ArrayList)}.
*
*/
public class RemoteViewsCompat {
@@ -56,7 +57,7 @@
}
/**
- * Compatibility version of {@link RemoteViews#setRemoteAdapter(int, ArrayList).
+ * Compatibility version of RemoteViews#setRemoteAdapter(int, ArrayList).
*
* When using this method, it is required that include {@link RemoteViewsServiceCompat}
* in your manifest:
diff --git a/v4/java/android/support/v4/view/ViewPager.java b/v4/java/android/support/v4/view/ViewPager.java
index 440a813..d522e7e 100644
--- a/v4/java/android/support/v4/view/ViewPager.java
+++ b/v4/java/android/support/v4/view/ViewPager.java
@@ -1674,9 +1674,8 @@
if (mSeenPositionMin < 0 || position < mSeenPositionMin) {
mSeenPositionMin = position;
}
- final int pageOffsetCeil = (int) FloatMath.ceil(position + offset);
- if (mSeenPositionMax < 0 || pageOffsetCeil > mSeenPositionMax) {
- mSeenPositionMax = pageOffsetCeil;
+ if (mSeenPositionMax < 0 || FloatMath.ceil(position + offset) > mSeenPositionMax) {
+ mSeenPositionMax = position + 1;
}
if (mOnPageChangeListener != null) {