Adds DotsPageIndicator to the GridViewPager sample
BUG: 18049247
Change-Id: Ie40d7afed3dcd33e742526de0fcf9758f8968b18
diff --git a/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java b/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java
index 20751a3..6abb58b 100644
--- a/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java
+++ b/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java
@@ -19,6 +19,7 @@
import android.app.Activity;
import android.content.res.Resources;
import android.os.Bundle;
+import android.support.wearable.view.DotsPageIndicator;
import android.support.wearable.view.GridViewPager;
import android.view.View;
import android.view.View.OnApplyWindowInsetsListener;
@@ -52,5 +53,7 @@
}
});
pager.setAdapter(new SampleGridPagerAdapter(this, getFragmentManager()));
+ DotsPageIndicator dotsPageIndicator = (DotsPageIndicator) findViewById(R.id.page_indicator);
+ dotsPageIndicator.setPager(pager);
}
}
diff --git a/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/SampleGridPagerAdapter.java b/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/SampleGridPagerAdapter.java
index 4d329c5..b56cc6a 100644
--- a/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/SampleGridPagerAdapter.java
+++ b/wearable/wear/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/SampleGridPagerAdapter.java
@@ -116,7 +116,12 @@
private Fragment cardFragment(int titleRes, int textRes) {
Resources res = mContext.getResources();
- return CardFragment.create(res.getText(titleRes), res.getText(textRes));
+ CardFragment fragment =
+ CardFragment.create(res.getText(titleRes), res.getText(textRes));
+ // Add some extra bottom margin to leave room for the page indicator
+ fragment.setCardMarginBottom(
+ res.getDimensionPixelSize(R.dimen.card_margin_bottom));
+ return fragment;
}
static final int[] BG_IMAGES = new int[] {
diff --git a/wearable/wear/GridViewPager/Wearable/src/main/res/layout/activity_main.xml b/wearable/wear/GridViewPager/Wearable/src/main/res/layout/activity_main.xml
index abc3b30..8da1474 100644
--- a/wearable/wear/GridViewPager/Wearable/src/main/res/layout/activity_main.xml
+++ b/wearable/wear/GridViewPager/Wearable/src/main/res/layout/activity_main.xml
@@ -13,10 +13,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<android.support.wearable.view.GridViewPager
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/pager"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.example.android.wearable.gridviewpager"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:keepScreenOn="true" />
+ android:layout_height="match_parent" >
+
+ <android.support.wearable.view.GridViewPager
+ android:id="@+id/pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:keepScreenOn="true" />
+
+ <android.support.wearable.view.DotsPageIndicator
+ android:id="@+id/page_indicator"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal|bottom">
+ </android.support.wearable.view.DotsPageIndicator>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/wearable/wear/GridViewPager/Wearable/src/main/res/values/dimens.xml b/wearable/wear/GridViewPager/Wearable/src/main/res/values/dimens.xml
index 47ab217..dd6ad2d 100644
--- a/wearable/wear/GridViewPager/Wearable/src/main/res/values/dimens.xml
+++ b/wearable/wear/GridViewPager/Wearable/src/main/res/values/dimens.xml
@@ -18,4 +18,5 @@
<dimen name="page_row_margin">100dp</dimen>
<dimen name="page_column_margin">10dp</dimen>
<dimen name="page_column_margin_round">50dp</dimen>
+ <dimen name="card_margin_bottom">3dp</dimen>
</resources>