summaryrefslogtreecommitdiffstats
path: root/samples/browseable/SwipeRefreshMultipleViews
diff options
context:
space:
mode:
Diffstat (limited to 'samples/browseable/SwipeRefreshMultipleViews')
-rw-r--r--samples/browseable/SwipeRefreshMultipleViews/AndroidManifest.xml2
-rw-r--r--samples/browseable/SwipeRefreshMultipleViews/_index.jd16
-rw-r--r--samples/browseable/SwipeRefreshMultipleViews/res/values-v21/template-styles.xml22
-rw-r--r--samples/browseable/SwipeRefreshMultipleViews/res/values/base-strings.xml3
-rw-r--r--[-rwxr-xr-x]samples/browseable/SwipeRefreshMultipleViews/res/values/strings.xml0
-rw-r--r--samples/browseable/SwipeRefreshMultipleViews/src/com.example.android.swiperefreshmultipleviews/MainActivity.java13
6 files changed, 37 insertions, 19 deletions
diff --git a/samples/browseable/SwipeRefreshMultipleViews/AndroidManifest.xml b/samples/browseable/SwipeRefreshMultipleViews/AndroidManifest.xml
index aba15e066..b987db446 100644
--- a/samples/browseable/SwipeRefreshMultipleViews/AndroidManifest.xml
+++ b/samples/browseable/SwipeRefreshMultipleViews/AndroidManifest.xml
@@ -22,7 +22,7 @@
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17" />
+ <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
<application android:allowBackup="true"
android:label="@string/app_name"
diff --git a/samples/browseable/SwipeRefreshMultipleViews/_index.jd b/samples/browseable/SwipeRefreshMultipleViews/_index.jd
index 70ff8ea89..0cc246bb2 100644
--- a/samples/browseable/SwipeRefreshMultipleViews/_index.jd
+++ b/samples/browseable/SwipeRefreshMultipleViews/_index.jd
@@ -1,12 +1,12 @@
-
-
-
page.tags="SwipeRefreshMultipleViews"
sample.group=UI
@jd:body
-<p>This sample demonstrates how to use {@link android.support.v4.widget.SwipeRefreshLayout} to add
-the <em>swipe-to-refresh</em> gesture to a layout with multiple children, which enables you to
-trigger a refresh by swiping down on the view. In this sample
-{@link android.support.v4.widget.SwipeRefreshLayout} contains a scrollable
-{@link android.widget.GridView} with an empty {@link android.widget.TextView}.</p>
+<p>
+
+ A sample which shows how to use SwipeRefreshLayout to add the \'swipe-to-refresh\'
+ gesture to a layout with multiple children, enabling the ability to trigger a
+ refresh from swiping down on the visible view. In this sample, SwipeRefreshLayout
+ contains a scrollable GridView, along with a TextView empty view.
+
+ </p>
diff --git a/samples/browseable/SwipeRefreshMultipleViews/res/values-v21/template-styles.xml b/samples/browseable/SwipeRefreshMultipleViews/res/values-v21/template-styles.xml
new file mode 100644
index 000000000..134fcd9d3
--- /dev/null
+++ b/samples/browseable/SwipeRefreshMultipleViews/res/values-v21/template-styles.xml
@@ -0,0 +1,22 @@
+<!--
+ Copyright 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources>
+
+ <!-- Activity themes -->
+ <style name="Theme.Base" parent="android:Theme.Material.Light" />
+
+</resources>
diff --git a/samples/browseable/SwipeRefreshMultipleViews/res/values/base-strings.xml b/samples/browseable/SwipeRefreshMultipleViews/res/values/base-strings.xml
index d7c1c9eb3..f7d434123 100644
--- a/samples/browseable/SwipeRefreshMultipleViews/res/values/base-strings.xml
+++ b/samples/browseable/SwipeRefreshMultipleViews/res/values/base-strings.xml
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<resources>
<string name="app_name">SwipeRefreshMultipleViews</string>
<string name="intro_message">
diff --git a/samples/browseable/SwipeRefreshMultipleViews/res/values/strings.xml b/samples/browseable/SwipeRefreshMultipleViews/res/values/strings.xml
index 991f0e8bd..991f0e8bd 100755..100644
--- a/samples/browseable/SwipeRefreshMultipleViews/res/values/strings.xml
+++ b/samples/browseable/SwipeRefreshMultipleViews/res/values/strings.xml
diff --git a/samples/browseable/SwipeRefreshMultipleViews/src/com.example.android.swiperefreshmultipleviews/MainActivity.java b/samples/browseable/SwipeRefreshMultipleViews/src/com.example.android.swiperefreshmultipleviews/MainActivity.java
index 0191d87de..a8bbf4dda 100644
--- a/samples/browseable/SwipeRefreshMultipleViews/src/com.example.android.swiperefreshmultipleviews/MainActivity.java
+++ b/samples/browseable/SwipeRefreshMultipleViews/src/com.example.android.swiperefreshmultipleviews/MainActivity.java
@@ -14,9 +14,6 @@
* limitations under the License.
*/
-
-
-
package com.example.android.swiperefreshmultipleviews;
import android.os.Bundle;
@@ -50,10 +47,12 @@ public class MainActivity extends SampleActivityBase {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- SwipeRefreshMultipleViewsFragment fragment = new SwipeRefreshMultipleViewsFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ SwipeRefreshMultipleViewsFragment fragment = new SwipeRefreshMultipleViewsFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override