Merge "Add empty view to avoid hamburger menu getting initial focus"
diff --git a/res/layout/custom_action_bar.xml b/res/layout/custom_action_bar.xml
index 9604849..5b930ea 100644
--- a/res/layout/custom_action_bar.xml
+++ b/res/layout/custom_action_bar.xml
@@ -28,7 +28,7 @@
android:layout_height="1px" >
<requestFocus />
</View>
- <android.support.v7.widget.SearchView
+ <SearchView
android:id="@+id/search_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/menu/search_menu.xml b/res/menu/search_menu.xml
index c890f20..355442e 100644
--- a/res/menu/search_menu.xml
+++ b/res/menu/search_menu.xml
@@ -13,11 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:contacts="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_search"
android:icon="@drawable/ic_ab_search"
android:title="@string/menu_search"
- contacts:showAsAction="always" />
+ android:showAsAction="always" />
</menu>