From 0410d0b9c6bb502f8467c3f2c62183e9a74e69fc Mon Sep 17 00:00:00 2001
From: sjtufs <sjtu_fs@outlook.com>
Date: Sun, 1 Sep 2013 00:32:38 +0800
Subject: update for 0831. preparing for rc1

---
 client/Piztor/AndroidManifest.xml | 91 ++++++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 40 deletions(-)

(limited to 'client/Piztor/AndroidManifest.xml')

diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml
index f336200..f81ece8 100644
--- a/client/Piztor/AndroidManifest.xml
+++ b/client/Piztor/AndroidManifest.xml
@@ -8,36 +8,38 @@
         android:minSdkVersion="8"
         android:targetSdkVersion="17" />
 
-	<!--使用网络功能所需权限  -->
-<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE">
-</uses-permission>
-<uses-permission android:name="android.permission.INTERNET">
-</uses-permission>
-<uses-permission android:name="android.permission.ACCESS_WIFI_STATE">
-</uses-permission>
-<uses-permission android:name="android.permission.CHANGE_WIFI_STATE">
-</uses-permission>
-<!-- SDK离线地图和cache功能需要读写外部存储器 -->
-<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE">
-</uses-permission>
-<!-- 获取设置信息和详情页直接拨打电话需要以下权限  -->
-<uses-permission android:name="android.permission.READ_PHONE_STATE">
-</uses-permission>
-<!-- 使用定位功能所需权限,demo已集成百度定位SDK,不使用定位功能可去掉以下6项 -->
-<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION">
-</uses-permission>
-<permission android:name="android.permission.BAIDU_LOCATION_SERVICE">
-</permission>
-<uses-permission android:name="android.permission.BAIDU_LOCATION_SERVICE">
-</uses-permission>
-<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION">
-</uses-permission>
-<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION">
-</uses-permission>
-<uses-permission android:name="android.permission.ACCESS_GPS"/>                  
-    
+    <!-- 使用网络功能所需权限 -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" >
+    </uses-permission>
+    <uses-permission android:name="android.permission.INTERNET" >
+    </uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" >
+    </uses-permission>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" >
+    </uses-permission>
+    <!-- SDK离线地图和cache功能需要读写外部存储器 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
+    </uses-permission>
+    <!-- 获取设置信息和详情页直接拨打电话需要以下权限 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" >
+    </uses-permission>
+    <!-- 使用定位功能所需权限,demo已集成百度定位SDK,不使用定位功能可去掉以下6项 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" >
+    </uses-permission>
+
+    <permission android:name="android.permission.BAIDU_LOCATION_SERVICE" >
+    </permission>
+
+    <uses-permission android:name="android.permission.BAIDU_LOCATION_SERVICE" >
+    </uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" >
+    </uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" >
+    </uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_GPS" />
 
     <application
+        android:name=".myApp"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -47,6 +49,7 @@
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -56,27 +59,35 @@
         </activity>
         <activity
             android:name="com.macaroon.piztor.Main"
-            android:label="@string/title_activity_main" 
-            android:screenOrientation="portrait"  
-          	android:configChanges="orientation">
+            android:configChanges="orientation"
+            android:label="@string/title_activity_main"
+            android:screenOrientation="portrait" >
         </activity>
         <activity
             android:name="com.macaroon.piztor.Settings"
-            android:label="@string/title_activity_settings" 
-            android:screenOrientation="portrait"  
-          	android:configChanges="orientation">
+            android:configChanges="orientation"
+            android:label="@string/title_activity_settings"
+            android:screenOrientation="portrait" >
         </activity>
+        <activity
+            android:name="com.macaroon.piztor.SubscribeSettings"
+            android:configChanges="orientation"
+            android:label="@string/title_activity_subscribesettings"
+            android:screenOrientation="portrait" >
+        </activity>
+
         <service
             android:name="com.baidu.location.f"
             android:enabled="true"
             android:process=":remote" >
         </service>
     </application>
-	
-	<supports-screens android:largeScreens="true"  
-            android:normalScreens="true"  
-            android:smallScreens="true"  
-            android:resizeable="true"  
-            android:anyDensity="true"/>  
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:resizeable="true"
+        android:smallScreens="true" />
 
 </manifest>
-- 
cgit v1.2.3


From 49d2e9d74fbf95e5b287dc8e9179e8d3d977a527 Mon Sep 17 00:00:00 2001
From: sjtufs <sjtu_fs@outlook.com>
Date: Sun, 1 Sep 2013 05:57:40 +0800
Subject: stable version

---
 client/Piztor/AndroidManifest.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'client/Piztor/AndroidManifest.xml')

diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml
index f81ece8..8e9973c 100644
--- a/client/Piztor/AndroidManifest.xml
+++ b/client/Piztor/AndroidManifest.xml
@@ -39,7 +39,7 @@
     <uses-permission android:name="android.permission.ACCESS_GPS" />
 
     <application
-        android:name=".myApp"
+        android:name="com.macaroon.piztor.myApp"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -81,6 +81,11 @@
             android:enabled="true"
             android:process=":remote" >
         </service>
+
+        <activity
+            android:name="com.macaroon.piztor.UpdateInfo"
+            android:label="@string/title_activity_update_info" >
+        </activity>
     </application>
 
     <supports-screens
-- 
cgit v1.2.3