summaryrefslogtreecommitdiffhomepage
path: root/app/src/main/res
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2017-08-22 01:27:29 -0500
committerSamuel Holland <samuel@sholland.org>2017-08-22 01:27:29 -0500
commit5d04714eeae71e2404a3dd61b67a5348cbbc62a2 (patch)
tree43e108abc0f81593356f707e71e445a479445dcc /app/src/main/res
parent90cd59c86686d4b9cb4d2cc4fca625843ccb3131 (diff)
ConfigAddActivity: Rename to AddActivity
Not everything needs to start with Config Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/add_activity.xml (renamed from app/src/main/res/layout/config_add_activity.xml)4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/res/layout/config_add_activity.xml b/app/src/main/res/layout/add_activity.xml
index d67e64bc..0f21e2e8 100644
--- a/app/src/main/res/layout/config_add_activity.xml
+++ b/app/src/main/res/layout/add_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" />