From 8d3349a080d2a18ee76400fc86dccb1efb7e1650 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Mon, 24 Aug 2015 15:41:17 -0400 Subject: [PATCH] Add sample activity for ViewPager in Support4Demos Bug: 23467280 Change-Id: I20453e15e5fb7b235da910d0c290641bd1c3d4c8 --- samples/Support4Demos/AndroidManifest.xml | 16 +- ...ew_pager_tab.xml => view_pager_layout.xml} | 17 +- .../res/layout/view_pager_sample.xml | 57 ------- samples/Support4Demos/res/values/strings.xml | 8 +- .../supportv4/view/ViewPagerActivity.java | 148 +++++++++--------- 5 files changed, 97 insertions(+), 149 deletions(-) rename samples/Support4Demos/res/layout/{view_pager_tab.xml => view_pager_layout.xml} (63%) delete mode 100644 samples/Support4Demos/res/layout/view_pager_sample.xml diff --git a/samples/Support4Demos/AndroidManifest.xml b/samples/Support4Demos/AndroidManifest.xml index f1899ad4e..da5dcaf24 100644 --- a/samples/Support4Demos/AndroidManifest.xml +++ b/samples/Support4Demos/AndroidManifest.xml @@ -297,6 +297,14 @@ + + + + + + + @@ -351,14 +359,6 @@ - - - - - - - diff --git a/samples/Support4Demos/res/layout/view_pager_tab.xml b/samples/Support4Demos/res/layout/view_pager_layout.xml similarity index 63% rename from samples/Support4Demos/res/layout/view_pager_tab.xml rename to samples/Support4Demos/res/layout/view_pager_layout.xml index 1d0bf31ae..de248dff1 100644 --- a/samples/Support4Demos/res/layout/view_pager_tab.xml +++ b/samples/Support4Demos/res/layout/view_pager_layout.xml @@ -14,8 +14,17 @@ limitations under the License. --> - + android:layout_height="match_parent"> + + + + + diff --git a/samples/Support4Demos/res/layout/view_pager_sample.xml b/samples/Support4Demos/res/layout/view_pager_sample.xml deleted file mode 100644 index 1c6d23829..000000000 --- a/samples/Support4Demos/res/layout/view_pager_sample.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - -