From 7bbcb704e7d0be402e0644b6b36438ac26f64cac Mon Sep 17 00:00:00 2001
From: Trinea <jsjwgx_1989@126.com>
Date: Sun, 27 Apr 2014 15:54:48 +0800
Subject: [PATCH] Add tips for autoScrollViewPagerDemo

---
 AndroidManifest.xml                           | 291 +++++++++---------
 res/values-zh-rCN/strings.xml                 |   2 +
 res/values-zh-rTW/strings.xml                 |   2 +
 res/values/strings.xml                        |   2 +
 .../android/demo/ImagePagerFragment.java      |   2 +-
 .../trinea/android/demo/utils/AppUtils.java   |   8 +
 6 files changed, 160 insertions(+), 147 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3792706..c59f23a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,147 +1,146 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.trinea.android.demo"
-    android:versionCode="46"
-    android:versionName="3.1.4" >
-
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="14" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/icon"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <service android:name=".MyService" />
-        <service android:name=".MyIntentService" />
-        <service android:name=".MyAIDLService" >
-            <intent-filter>
-                <action android:name="cn.trinea.android.demo.remote.MyAIDLServiceAction" />
-            </intent-filter>
-        </service>
-
-        <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="demo.android"
-                    android:scheme="trinea" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".DownloadManagerDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/download_manager_demo_activity_title"
-            android:theme="@style/AppTheme" >
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="application/cn.trinea.download.file" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ImageSDCardCacheDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/imagesdcardcache_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".HttpCacheDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/httpcache_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".ImageCacheDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/imagecache_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".DropDownListViewDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/dropdownlistview_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".AutoScrollViewPagerDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/auto_scroll_view_pager_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".AutoScrollViewPagerInnerDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/auto_scroll_view_pager_inner_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".BorderScrollViewDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/borderscrollview_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".SearchViewDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/search_view_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".ViewPagerMulTiFragmentDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/view_pager_multi_fragment_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".SlideOnePageGalleryDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/slide_one_page_gallery_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".ViewPagerDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/view_pager_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".BroadcastReceiverDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/broadcastreceiver_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name=".ServiceDemo"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/service_demo_activity_title"
-            android:theme="@style/AppTheme" >
-        </activity>
-        <activity
-            android:name="com.google.ads.AdActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cn.trinea.android.demo"
+    android:versionCode="47"
+    android:versionName="3.1.5" >
+
+    <uses-sdk
+        android:minSdkVersion="9"
+        android:targetSdkVersion="14" />
+
    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <service android:name=".MyService" />
+        <service android:name=".MyIntentService" />
+        <service android:name=".MyAIDLService" >
+            <intent-filter>
+                <action android:name="cn.trinea.android.demo.remote.MyAIDLServiceAction" />
+            </intent-filter>
+        </service>
+
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="demo.android"
+                    android:scheme="trinea" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".DownloadManagerDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/download_manager_demo_activity_title"
+            android:theme="@style/AppTheme" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="application/cn.trinea.download.file" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ImageSDCardCacheDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/imagesdcardcache_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".HttpCacheDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/httpcache_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".ImageCacheDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/imagecache_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".DropDownListViewDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/dropdownlistview_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".AutoScrollViewPagerDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/auto_scroll_view_pager_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".AutoScrollViewPagerInnerDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/auto_scroll_view_pager_inner_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".BorderScrollViewDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/borderscrollview_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".SearchViewDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/search_view_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".ViewPagerMulTiFragmentDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/view_pager_multi_fragment_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".SlideOnePageGalleryDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/slide_one_page_gallery_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".ViewPagerDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/view_pager_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".BroadcastReceiverDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/broadcastreceiver_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name=".ServiceDemo"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/service_demo_activity_title"
+            android:theme="@style/AppTheme" >
+        </activity>
+        <activity
+            android:name="com.google.ads.AdActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b52526d..50ece24 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -64,5 +64,7 @@
     <string name="desc_image_cache">ImageCache使用</string>
     <string name="desc_image_sdcard_cache">ImageSDCardCache使用</string>
     <string name="desc_http_cache">HttpCache使用</string>
+    <string name="desc_auto_scroll_view_pager_inner">自动滚动ViewPager嵌套使用</string>
+    <string name="desc_auto_scroll_view_pager">自动滚动ViewPager使用</string>
     <string name="desc_default">Trinea</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5ee49bb..fa234ec 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -64,5 +64,7 @@
     <string name="desc_image_cache">ImageCache使用</string>
     <string name="desc_image_sdcard_cache">ImageSDCardCache使用</string>
     <string name="desc_http_cache">HttpCache使用</string>
+    <string name="desc_auto_scroll_view_pager_inner">自動滾動ViewPager嵌套使用</string>
+    <string name="desc_auto_scroll_view_pager">自動滾動ViewPager使用</string>
     <string name="desc_default">Trinea</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index be15b1a..9dea0de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -85,5 +85,7 @@
     <string name="desc_image_cache">ImageCache Usage</string>
     <string name="desc_image_sdcard_cache">ImageSDCardCache Usage</string>
     <string name="desc_http_cache">HttpCache Usage</string>
+    <string name="desc_auto_scroll_view_pager_inner">Autoscroll ViewPager in ViewPager Usage</string>
+    <string name="desc_auto_scroll_view_pager">Autoscroll ViewPager Usage</string>
     <string name="desc_default">Trinea</string>
 </resources>
diff --git a/src/cn/trinea/android/demo/ImagePagerFragment.java b/src/cn/trinea/android/demo/ImagePagerFragment.java
index 3f1d861..4e09aec 100644
--- a/src/cn/trinea/android/demo/ImagePagerFragment.java
+++ b/src/cn/trinea/android/demo/ImagePagerFragment.java
@@ -81,7 +81,7 @@ public void onStop() {
     /**
      * ScrollControlReceiver
      * 
-     * @author <a href="http://www.trinea.cn" target="_blank">Trinea</a> 2014年4月26日
+     * @author <a href="http://www.trinea.cn" target="_blank">Trinea</a> 2014-4-26
      */
     private class ScrollControlReceiver extends BroadcastReceiver {
 
diff --git a/src/cn/trinea/android/demo/utils/AppUtils.java b/src/cn/trinea/android/demo/utils/AppUtils.java
index d37e259..05bf736 100644
--- a/src/cn/trinea/android/demo/utils/AppUtils.java
+++ b/src/cn/trinea/android/demo/utils/AppUtils.java
@@ -10,6 +10,8 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import cn.trinea.android.demo.AutoScrollViewPagerDemo;
+import cn.trinea.android.demo.AutoScrollViewPagerInnerDemo;
 import cn.trinea.android.demo.BorderScrollViewDemo;
 import cn.trinea.android.demo.BroadcastReceiverDemo;
 import cn.trinea.android.demo.DownloadManagerDemo;
@@ -125,6 +127,12 @@ private static String[] getText(Activity activity) {
         } else if (sourClass == HttpCacheDemo.class) {
             url = "http://www.trinea.cn/android/android-http-cache/";
             contentSrcId = R.string.desc_http_cache;
+        } else if (sourClass == AutoScrollViewPagerInnerDemo.class) {
+            url = "http://www.trinea.cn/android/auto-scroll-view-pager/";
+            contentSrcId = R.string.desc_auto_scroll_view_pager_inner;
+        } else if (sourClass == AutoScrollViewPagerDemo.class) {
+            url = "http://www.trinea.cn/android/auto-scroll-view-pager/";
+            contentSrcId = R.string.desc_auto_scroll_view_pager;
         } else {
             prefixSrcId = R.string.profile;
             url = "http://www.trinea.cn";