Merge heads

2012-05-04 17:04:45 +08:00
parent a12f4bcbe8
commit fd90dcffa6
189 changed files with 3288 additions and 3323 deletions
@@ -18,12 +18,12 @@ limitations under the License.
  <item
    android:icon="@drawable/menu_show_on_map"
    android:id="@+id/marker_detail_show_on_map"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
    android:title="@string/menu_show_on_map"/>
  <item
    android:icon="@drawable/menu_edit"
    android:id="@+id/marker_detail_edit"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
    android:title="@string/menu_edit"/>
  <item
    android:icon="@drawable/menu_delete"