summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout/settingslist.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/settingslist.xml b/res/layout/settingslist.xml
index 114a789..1f2128b 100644
--- a/res/layout/settingslist.xml
+++ b/res/layout/settingslist.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android">
+ <merge xmlns:android="http://schemas.android.com/apk/res/android">
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
@@ -29,4 +29,4 @@
android:layout_gravity="center"
/>
-</FrameLayout>
+</merge>