summaryrefslogtreecommitdiffstats
path: root/res/layout/gestures_settings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout/gestures_settings.xml')
-rw-r--r--res/layout/gestures_settings.xml6
1 files changed, 2 insertions, 4 deletions
diff --git a/res/layout/gestures_settings.xml b/res/layout/gestures_settings.xml
index 4b1976f5c..d32b3ec84 100644
--- a/res/layout/gestures_settings.xml
+++ b/res/layout/gestures_settings.xml
@@ -14,9 +14,7 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ListView
android:id="@android:id/list"
@@ -34,4 +32,4 @@
android:text="@string/gestures_loading"
android:textAppearance="?android:attr/textAppearanceMedium" />
-</FrameLayout>
+</merge>