merge heads

MyTracks/AndroidManifest.xml

@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="36"
-          android:versionName="1.1.13">
+          android:versionCode="37"
+          android:versionName="1.1.14">
 
   <!-- Permissions to initialize service -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -48,6 +48,7 @@ limitations under the License.
 
   <!-- Permissions for misc services -->
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
   <!-- Exported permissions (for other apps to use our features) -->
   <!-- Permission to get track start/end broadcasts -->
@@ -112,12 +113,19 @@ limitations under the License.
     <meta-data android:name="com.google.android.backup.api_key"
                android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
 
+    <!-- Main track data provider -->
     <provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
               android:authorities="com.google.android.maps.mytracks"
               android:exported="true"
               android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
               android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
 
+    <!-- Provider for search suggestions -->
+    <provider android:name="com.google.android.apps.mytracks.content.SearchEngineProvider"
+              android:authorities="com.google.android.maps.mytracks.search"
+              android:exported="false" />
+
+    <!-- Main activity -->
     <activity android:name="com.google.android.apps.mytracks.MyTracks"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
       <intent-filter>
@@ -129,7 +137,12 @@ limitations under the License.
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
         <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
       </intent-filter>
+
+      <!-- Enable searches via SearchActivity. -->
+      <meta-data android:name="android.app.default_searchable"
+                 android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.MapActivity"
@@ -137,18 +150,26 @@ limitations under the License.
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
       </intent-filter>
+
+      <!-- Enable searches via SearchActivity. -->
+      <meta-data android:name="android.app.default_searchable"
+                 android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
 
-    <activity android:name="com.google.android.apps.mytracks.MapsList"
-              android:label="@string/maps_list_title"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
-              android:exported="false" />
 
-    <!-- TODO: VIEW and PICK for track cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.TrackList" />
+    <!-- TODO: Merge TrackList, WaypointsLIst and SearchActivity, then implement VIEW and PICK for track and waypoint cursor dir -->
+    <activity android:name="com.google.android.apps.mytracks.TrackList">
+      <!-- Enable searches via SearchActivity. -->
+      <meta-data android:name="android.app.default_searchable"
+                 android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
 
     <!-- TODO: VIEW and PICK for waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.WaypointsList" />
+    <activity android:name="com.google.android.apps.mytracks.WaypointsList">
+      <!-- Enable searches via SearchActivity. -->
+      <meta-data android:name="android.app.default_searchable"
+                 android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
 
     <activity android:name="com.google.android.apps.mytracks.TrackDetail"
               android:label="@string/track_detail_title">
@@ -173,7 +194,6 @@ limitations under the License.
     <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
               android:label="@string/marker_detail_title">
       <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
         <action android:name="android.intent.action.EDIT" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
@@ -196,6 +216,10 @@ limitations under the License.
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
       </intent-filter>
+
+      <!-- Enable searches via SearchActivity. -->
+      <meta-data android:name="android.app.default_searchable"
+                 android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.SensorStateActivity"
@@ -206,14 +230,10 @@ limitations under the License.
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
       </intent-filter>
-    </activity>
 
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.SendActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar">
-      <intent-filter>
-        <action android:name="android.intent.action.SEND" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
+      <!-- Enable searches via SearchActivity. -->
+      <meta-data android:name="android.app.default_searchable"
+                 android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
@@ -246,9 +266,24 @@ limitations under the License.
               android:label="@string/welcome_title"
               android:exported="false" />
 
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.SearchActivity"
+              android:launchMode="singleTop">
+      <intent-filter>
+        <action android:name="android.intent.action.SEARCH" />
+      </intent-filter>
+      <meta-data android:name="android.app.searchable"
+                 android:resource="@xml/search"/>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.maps.ChooseMapActivity"
+                            android:label="@string/maps_list_title"/>
+    <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity"/>
     <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"/>
+
     <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
              android:label="@string/my_tracks_recording_service"
              android:icon="@drawable/arrow_320"
@@ -258,7 +293,7 @@ limitations under the License.
 
     <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
              android:exported="false" />
-             
+
     <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
       <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />