diff options
| author | Samuel Holland <samuel@sholland.org> | 2017-08-16 01:43:15 -0500 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2017-08-16 01:43:15 -0500 |
| commit | 645e263424d6e0064a95103477ddd85dfbb978c9 (patch) | |
| tree | 94d6741d6224234539775ae94a7df38f0f722b3b /app/src/main/res | |
| parent | 9e36e0d9c6bedec3238717fe694fd0bf16480bb9 (diff) | |
ConfigActivity: Inline PlaceholderFragment into the layout
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout-land/config_activity.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/placeholder_fragment.xml | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/app/src/main/res/layout-land/config_activity.xml b/app/src/main/res/layout-land/config_activity.xml index 6b327e01..aa310a43 100644 --- a/app/src/main/res/layout-land/config_activity.xml +++ b/app/src/main/res/layout-land/config_activity.xml @@ -20,5 +20,13 @@ android:background="?android:attr/colorPrimary" android:paddingEnd="0dp" android:paddingStart="4dp" - tools:ignore="InconsistentLayout" /> + tools:ignore="InconsistentLayout"> + + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?android:attr/colorBackground" + android:gravity="center" + android:text="@string/placeholder_text" /> + </FrameLayout> </LinearLayout> diff --git a/app/src/main/res/layout/placeholder_fragment.xml b/app/src/main/res/layout/placeholder_fragment.xml deleted file mode 100644 index c519b994..00000000 --- a/app/src/main/res/layout/placeholder_fragment.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?android:attr/colorBackground" - android:gravity="center" - android:text="@string/placeholder_text" /> |