summaryrefslogtreecommitdiffhomepage
path: root/app/src/main/res/layout/config_activity.xml
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2017-08-22 23:09:55 -0500
committerSamuel Holland <samuel@sholland.org>2017-08-22 23:10:41 -0500
commitc1cdea42b6261008596d6924dcc488aef289b0d2 (patch)
treec7da715b0a02ad993e588f535259d99a896fde1b /app/src/main/res/layout/config_activity.xml
parent3a264f7020005383bf98e4d3f4d39c1b10477bf1 (diff)
Finish first pass of config editor fields
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res/layout/config_activity.xml')
-rw-r--r--app/src/main/res/layout/config_activity.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/res/layout/config_activity.xml b/app/src/main/res/layout/config_activity.xml
index d67e64bc..0f21e2e8 100644
--- a/app/src/main/res/layout/config_activity.xml
+++ b/app/src/main/res/layout/config_activity.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/master_fragment"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ tools:ignore="MergeRootFrame" />