merge heads

MyTracks/res/menu/main.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:id="@+id/menu_record_track"
     android:icon="@drawable/ic_menu_recordtrack"
@@ -16,20 +31,24 @@
     android:icon="@drawable/ic_menu_waypoints"
     android:title="@string/menu_markers"/>
 
+  <item android:id="@+id/menu_search"
+    android:icon="@android:drawable/ic_menu_search"
+    android:title="@string/menu_search"/>
+
   <item android:id="@+id/menu_sensor_state"
     android:icon="@drawable/ic_menu_sensorstatus"
     android:orderInCategory="1000"
     android:title="@string/menu_sensor_state"/>
-  
+
   <item android:id="@+id/menu_settings"
     android:icon="@android:drawable/ic_menu_preferences"
     android:orderInCategory="1001"
     android:title="@string/menu_settings"/>
-    
+
   <item android:id="@+id/menu_aggregated_statistics"
     android:orderInCategory="1002"
     android:title="@string/menu_aggregated_statistics"/>
-    
+
   <item android:id="@+id/menu_help"
     android:icon="@android:drawable/ic_menu_info_details"
     android:orderInCategory="1003"

MyTracks/res/menu/search_only.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:id="@+id/menu_search"
+    android:icon="@android:drawable/ic_menu_search"
+    android:title="@string/menu_search"
+    android:onClick="onSearch"
+    android:showAsAction="always" />
+</menu>