merge heads

2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:hint="@string/search_hint"
+    android:includeInGlobalSearch="true"
+    android:label="@string/my_tracks_app_name"
+    android:searchSettingsDescription="@string/search_global_description"
+    android:voicePromptText="@string/search_voice_prompt"
+    android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
+    android:searchSuggestAuthority="com.google.android.maps.mytracks.search"
+    android:searchSuggestThreshold="2"
+    android:searchSuggestSelection=" ? " />