From 1483f19f10f2df34db3e1b1f2f0fe94ccdd6bfd1 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 23 Apr 2012 10:41:29 -0700
Subject: [PATCH] Clean up activities' manifest.

---
 MyTracks/AndroidManifest.xml | 59 +++++++-----------------------------
 1 file changed, 11 insertions(+), 48 deletions(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 535949c9a..8bf9e507d 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -19,22 +19,18 @@ limitations under the License.
   android:versionCode="39"
   android:versionName="1.1.16"
   package="com.google.android.maps.mytracks" >
-
   <!-- Permission to initialize services -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
   <!-- Permissions to record locations -->
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-
   <!-- Permissions to access sensors -->
   <uses-permission android:name="com.dsi.ant.permission.ANT" />
   <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
   <!-- Permissions to upload tracks -->
   <uses-permission android:name="android.permission.GET_ACCOUNTS" />
   <uses-permission android:name="android.permission.INTERNET" />
@@ -46,18 +42,14 @@ limitations under the License.
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
   <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-
   <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
   <!-- Permission to write to SD card -->
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
   <!-- Permissions to access My Tracks data -->
   <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
   <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
   <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
   <!-- Permission to receive My Tracks internal broadcasts -->
   <permission
     android:description="@string/permission_notification_label"
@@ -86,11 +78,9 @@ limitations under the License.
     android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
     android:permissionGroup="android.permission-group.LOCATION"
     android:protectionLevel="dangerous" />
-
   <uses-sdk
     android:minSdkVersion="7"
     android:targetSdkVersion="15" />
-
   <!-- Required features -->
   <uses-feature
     android:name="android.hardware.location"
@@ -98,7 +88,6 @@ limitations under the License.
   <uses-feature
     android:name="android.hardware.location.gps"
     android:required="true" />
-
   <!-- Optional features -->
   <uses-feature
     android:name="android.hardware.bluetooth"
@@ -124,46 +113,38 @@ limitations under the License.
   <uses-feature
     android:name="android.hardware.touchscreen.multitouch"
     android:required="false" />
-
   <supports-screens
     android:anyDensity="true"
     android:largeScreens="true"
     android:normalScreens="true"
     android:smallScreens="true"
     android:xlargeScreens="true" />
-
   <application
     android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
     android:icon="@drawable/arrow_icon"
     android:label="@string/my_tracks_app_name"
     android:name="com.google.android.apps.mytracks.MyTracksApplication"
     android:theme="@style/ThemeSelector" >
-
     <!-- For data backup -->
     <meta-data
       android:name="com.google.android.backup.api_key"
       android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
-
+    <!-- Activities -->
     <activity
       android:label="@string/menu_aggregated_statistics"
       android:name="com.google.android.apps.mytracks.AggregatedStatsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.ExportActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.ExportActivity" />
     <activity
       android:label="@string/menu_help"
       android:name="com.google.android.apps.mytracks.HelpActivity" />
     <activity
       android:label="@string/my_tracks_importer"
-      android:name="com.google.android.apps.mytracks.ImportActivity"
-      android:noHistory="true"
-      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+      android:name="com.google.android.apps.mytracks.ImportActivity" >
       <intent-filter>
-
         <action android:name="android.intent.action.ATTACH_DATA" />
         <action android:name="android.intent.action.VIEW" />
-
         <category android:name="android.intent.category.BROWSABLE" />
         <category android:name="android.intent.category.DEFAULT" />
-
         <data android:mimeType="application/gpx" />
         <data android:mimeType="application/gpx+xml" />
         <data android:mimeType="application/vnd.google-earth.gpx" />
@@ -186,7 +167,6 @@ limitations under the License.
       <intent-filter>
         <action android:name="android.intent.action.SEARCH" />
       </intent-filter>
-
       <meta-data
         android:name="android.app.searchable"
         android:resource="@xml/search" />
@@ -196,37 +176,23 @@ limitations under the License.
       android:name="com.google.android.apps.mytracks.SensorStateActivity" />
     <activity
       android:label="@string/settings_title"
-      android:name="com.google.android.apps.mytracks.SettingsActivity" >
-      <intent-filter>
-        <category android:name="android.intent.category.PREFERENCE" />
-      </intent-filter>
-    </activity>
+      android:name="com.google.android.apps.mytracks.SettingsActivity" />
     <activity android:name="com.google.android.apps.mytracks.TrackDetailActivity" />
     <activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
     <activity android:name="com.google.android.apps.mytracks.TrackListActivity" >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
-
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
       <meta-data
         android:name="android.app.default_searchable"
         android:value="com.google.android.apps.mytracks.SearchListActivity" />
     </activity>
-    <activity android:name="com.google.android.apps.mytracks.io.backup.BackupActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.backup.BackupActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity" />
-    <activity
-      android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
-      android:noHistory="true"
-      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
-      <intent-filter>
-        <action android:name="android.intent.action.SAVE" />
-
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
+    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity" />
     <activity
       android:label="@string/maps_list_title"
@@ -235,7 +201,7 @@ limitations under the License.
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity" />
-                
+    <!-- Services -->
     <service
       android:exported="false"
       android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />
@@ -247,7 +213,7 @@ limitations under the License.
       android:label="@string/my_tracks_recording_service"
       android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
       android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
+    <!-- Receivers -->
     <receiver android:name="com.google.android.apps.mytracks.BootReceiver" >
       <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -259,12 +225,11 @@ limitations under the License.
         <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
         <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
       </intent-filter>
-
       <meta-data
         android:name="android.appwidget.provider"
         android:resource="@xml/track_widget_info" />
     </receiver>
-
+    <!-- Providers -->
     <!-- My Tracks data provider -->
     <provider
       android:authorities="com.google.android.maps.mytracks"
@@ -277,8 +242,6 @@ limitations under the License.
       android:authorities="com.google.android.maps.mytracks.search"
       android:exported="false"
       android:name="com.google.android.apps.mytracks.content.SearchEngineProvider" />
-
     <uses-library android:name="com.google.android.maps" />
   </application>
-
 </manifest>
\ No newline at end of file