ref: 4a0afc03477216fd009b893072cd1d6387840615
parent: 7790ec4a17e8236bfe8f3cf3bf43bec377bcc5bb
author: Martin Storsjö <martin@martin.st>
date: Fri May 30 06:34:32 EDT 2014
Fix building the android unittest when targeting older android versions
--- a/test/build/android/res/layout/activity_main.xml
+++ b/test/build/android/res/layout/activity_main.xml
@@ -1,7 +1,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
--- a/test/build/android/res/menu/main.xml
+++ b/test/build/android/res/menu/main.xml
@@ -4,7 +4,6 @@
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:title="@string/action_settings"
- android:showAsAction="never"/>
+ android:title="@string/action_settings" />
</menu>