merge heads

2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 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"