Fix #4247, No action bar on map activities on Android 3.x

Enable 2.x implementation for 3.x. as well.
Additionally fix options menu for 3.x

2 files changed, 57 insertions, 4 deletions

diff --git a/main/res/layout-v11/actionbar_maps.xml b/main/res/layout-v11/actionbar_maps.xml
index 3e72717..ee77673 100644
--- a/main/res/layout-v11/actionbar_maps.xml
+++ b/main/res/layout-v11/actionbar_maps.xml
@@ -1,7 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/action_bar" >
 
- <!-- Empty layout, on 11+ we have a real action bar -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
+    <!-- Add the up chevron to the icon -->
 
-</merge>
\ No newline at end of file
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:src="@drawable/abc_ic_ab_back_holo_dark" />
+
+    <ImageView
+        style="@style/action_bar_action"
+        android:layout_marginLeft="-13dp"
+        android:onClick="navigateUp" />
+
+    <View style="@style/action_bar_separator" />
+
+    <TextView
+        android:id="@+id/actionbar_title"
+        style="@style/action_bar_title"
+        tools:ignore="InconsistentLayout" />
+
+    <ProgressBar
+        android:id="@+id/actionbar_progress"
+        style="@style/action_bar_progress"
+        android:visibility="gone"
+        tools:ignore="InconsistentLayout" />
+
+    <View style="@style/action_bar_separator" />
+
+    <FrameLayout style="@style/action_bar_action" >
+
+        <CheckBox
+            android:id="@+id/my_position"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:button="@drawable/ic_menu_myposition"
+            android:checked="false"
+            tools:ignore="InconsistentLayout" />
+    </FrameLayout>
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        android:id="@+id/overflowActionBar"
+        style="@style/action_bar_action"
+        android:longClickable="true"
+        android:src="@drawable/abc_ic_menu_moreoverflow_normal_holo_dark" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout-v14/actionbar_maps.xml b/main/res/layout-v14/actionbar_maps.xml
new file mode 100644
index 0000000..7ee9b51
--- /dev/null
+++ b/main/res/layout-v14/actionbar_maps.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+ <!-- Empty layout, on 14+ we have a real and working action bar -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+</merge>
\ No newline at end of file