Merge heads

2012-05-04 17:04:45 +08:00
parent a12f4bcbe8
commit fd90dcffa6
189 changed files with 3288 additions and 3323 deletions
@@ -0,0 +1,33 @@
+<?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_show_on_map"
+    android:id="@+id/list_context_menu_show_on_map"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_show_on_map"/>
+  <item
+    android:icon="@drawable/menu_edit"
+    android:id="@+id/list_context_menu_edit"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_edit"/>
+  <item
+    android:icon="@drawable/menu_delete"
+    android:id="@+id/list_context_menu_delete"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_delete"/>
+</menu>