Merge heads

This commit is contained in:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
+12 -14
View File
@@ -17,47 +17,45 @@ limitations under the License.
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:actionViewClass="android.widget.SearchView"
android:icon="@drawable/menu_search"
android:icon="@drawable/ic_menu_search"
android:id="@+id/track_list_search"
android:showAsAction="ifRoom|collapseActionView"
android:title="@string/menu_search"/>
<item
android:icon="@drawable/menu_start_gps"
android:icon="@drawable/ic_menu_start_gps"
android:id="@+id/track_list_start_gps"
android:showAsAction="ifRoom"
android:title="@string/menu_start_gps"/>
<item
android:icon="@drawable/menu_refresh"
android:icon="@drawable/ic_menu_refresh"
android:id="@+id/track_list_refresh"
android:title="@string/menu_refresh"/>
<item
android:icon="@drawable/menu_aggregated_statistics"
android:icon="@drawable/ic_menu_aggregated_statistics"
android:id="@+id/track_list_aggregated_statistics"
android:title="@string/menu_aggregated_statistics"/>
<item
android:icon="@drawable/menu_export"
android:icon="@drawable/ic_menu_export"
android:id="@+id/track_list_export_all"
android:title="@string/menu_export_all">
</item>
android:title="@string/menu_export_all"/>
<item
android:icon="@drawable/menu_import"
android:icon="@drawable/ic_menu_import"
android:id="@+id/track_list_import_all"
android:title="@string/menu_import_all">
</item>
android:title="@string/menu_import_all"/>
<item
android:icon="@drawable/menu_delete"
android:icon="@drawable/ic_menu_delete"
android:id="@+id/track_list_delete_all"
android:title="@string/menu_delete_all"/>
<item
android:icon="@drawable/menu_settings"
android:icon="@drawable/ic_menu_settings"
android:id="@+id/track_list_settings"
android:title="@string/menu_settings"/>
<item
android:icon="@drawable/menu_feedback"
android:icon="@drawable/ic_menu_feedback"
android:id="@+id/track_list_feedback"
android:title="@string/menu_feedback"/>
<item
android:icon="@drawable/menu_help"
android:icon="@drawable/ic_menu_help"
android:id="@+id/track_list_help"
android:title="@string/menu_help"/>
</menu>