merge heads

MyTracks/res/menu/track_list.xml

@@ -0,0 +1,54 @@
+<?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:icon="@drawable/menu_record_track"
+    android:id="@+id/menu_record_track"
+    android:showAsAction="always"
+    android:title="@string/menu_record_track"/>
+  <item
+    android:icon="@drawable/menu_stop_recording"
+    android:id="@+id/menu_stop_recording"
+    android:showAsAction="always"
+    android:title="@string/menu_stop_recording"/>
+  <item
+    android:actionViewClass="android.widget.SearchView"
+    android:icon="@drawable/menu_search"
+    android:id="@+id/menu_search"
+    android:showAsAction="always|collapseActionView"
+    android:title="@string/menu_search"/>
+  <item
+    android:id="@+id/menu_import_all"
+    android:title="@string/menu_import_all"/>
+  <item
+    android:id="@+id/menu_export_all"
+    android:title="@string/menu_export_all"/>
+  <item
+    android:id="@+id/menu_delete_all"
+    android:title="@string/menu_delete_all"/>
+  <item
+    android:id="@+id/menu_aggregated_statistics"
+    android:title="@string/menu_aggregated_statistics"/>
+  <item
+    android:icon="@drawable/menu_settings"
+    android:id="@+id/menu_settings"
+    android:title="@string/menu_settings"/>
+  <item
+    android:icon="@drawable/menu_help"
+    android:id="@+id/menu_help"
+    android:title="@string/menu_help"/>
+</menu>