Bug 1321981 - [RTL] ViewPager Support - part 4. Switch to RtlViewPager, r=sebastian
MozReview-Commit-ID: 2s695og8Umo
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java
@@ -4,38 +4,39 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.firstrun;
import android.content.Context;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import android.animation.Animator;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
+import com.booking.rtlviewpager.RtlViewPager;
+
import org.mozilla.gecko.Telemetry;
import org.mozilla.gecko.TelemetryContract;
import org.mozilla.gecko.home.HomePager.Decor;
import org.mozilla.gecko.home.TabMenuStrip;
import org.mozilla.gecko.restrictions.Restrictions;
import java.util.List;
/**
* ViewPager containing for our first run pages.
*
* @see FirstrunPanel for the first run pages that are used in this pager.
*/
-public class FirstrunPager extends ViewPager {
+public class FirstrunPager extends RtlViewPager {
private Context context;
protected FirstrunPanel.PagerNavigation pagerNavigation;
private Decor mDecor;
public FirstrunPager(Context context) {
this(context, null);
}
@@ -43,17 +44,17 @@ public class FirstrunPager extends ViewP
public FirstrunPager(Context context, AttributeSet attrs) {
super(context, attrs);
this.context = context;
}
@Override
public void addView(View child, int index, ViewGroup.LayoutParams params) {
if (child instanceof Decor) {
- ((ViewPager.LayoutParams) params).isDecor = true;
+ ((RtlViewPager.LayoutParams) params).isDecor = true;
mDecor = (Decor) child;
mDecor.setOnTitleClickListener(new TabMenuStrip.OnTitleClickListener() {
@Override
public void onTitleClicked(int index) {
setCurrentItem(index, true);
}
});
}
--- a/mobile/android/base/java/org/mozilla/gecko/home/HomePager.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/HomePager.java
@@ -23,23 +23,24 @@ import org.mozilla.gecko.util.ThreadUtil
import android.content.Context;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.LoaderManager;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.Loader;
-import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-public class HomePager extends ViewPager implements HomeScreen {
+import com.booking.rtlviewpager.RtlViewPager;
+
+public class HomePager extends RtlViewPager implements HomeScreen {
@Override
public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
return super.requestFocus(direction, previouslyFocusedRect);
}
private static final int LOADER_ID_CONFIG = 0;
@@ -167,25 +168,25 @@ public class HomePager extends ViewPager
// We can call HomePager.requestFocus to steal focus from the URL bar and drop the soft
// keyboard. However, if there are no focusable views (e.g. an empty reading list), the
// URL bar will be refocused. Therefore, we make the HomePager container focusable to
// ensure there is always a focusable view. This would ordinarily be done via an XML
// attribute, but it is not working properly.
setFocusableInTouchMode(true);
mOriginalBackground = getBackground();
- setOnPageChangeListener(new PageChangeListener());
+ addOnPageChangeListener(new PageChangeListener());
mLoadState = LoadState.UNLOADED;
}
@Override
public void addView(View child, int index, ViewGroup.LayoutParams params) {
if (child instanceof Decor) {
- ((ViewPager.LayoutParams) params).isDecor = true;
+ ((RtlViewPager.LayoutParams) params).isDecor = true;
mDecor = (Decor) child;
mTabStrip = child;
mDecor.setOnTitleClickListener(new TabMenuStrip.OnTitleClickListener() {
@Override
public void onTitleClicked(int index) {
setCurrentItem(index, true);
}
@@ -514,17 +515,17 @@ public class HomePager extends ViewPager
}
@Override
public void onLoaderReset(Loader<HomeConfig.State> loader) {
mLoadState = LoadState.UNLOADED;
}
}
- private class PageChangeListener implements ViewPager.OnPageChangeListener {
+ private class PageChangeListener implements RtlViewPager.OnPageChangeListener {
@Override
public void onPageSelected(int position) {
notifyPanelSelected(position);
if (mHomeBanner != null) {
mHomeBanner.setActive(position == mDefaultPageIndex);
}
--- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/CirclePageIndicator.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/CirclePageIndicator.java
@@ -381,23 +381,23 @@ public class CirclePageIndicator
return true;
}
public void setViewPager(ViewPager view) {
if (mViewPager == view) {
return;
}
if (mViewPager != null) {
- mViewPager.setOnPageChangeListener(null);
+ mViewPager.removeOnPageChangeListener(this);
}
if (view.getAdapter() == null) {
throw new IllegalStateException("ViewPager does not have adapter instance.");
}
mViewPager = view;
- mViewPager.setOnPageChangeListener(this);
+ mViewPager.addOnPageChangeListener(this);
invalidate();
}
public void setViewPager(ViewPager view, int initialPosition) {
setViewPager(view);
setCurrentItem(initialPosition);
}
--- a/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
+++ b/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
- <android.support.v4.view.ViewPager
+ <com.booking.rtlviewpager.RtlViewPager
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/topsites_pager"
android:contentDescription="@string/activity_stream_topsites" />
<org.mozilla.gecko.home.activitystream.topsites.CirclePageIndicator
android:id="@+id/topsites_indicator"