diff options
author | pacien | 2018-08-21 20:05:17 +0200 |
---|---|---|
committer | pacien | 2018-08-21 20:05:17 +0200 |
commit | 9846c5ff85e6eb02c4599045d28798569ed8c5c8 (patch) | |
tree | 3e3b0d41a3732360f5d63611722b3142c8aa815c | |
parent | 5249552bd31793c3ca502a4540d6c81ded35638f (diff) | |
download | tincapp-9846c5ff85e6eb02c4599045d28798569ed8c5c8.tar.gz |
Merge view
-rw-r--r-- | app/src/main/res/layout/start_activity.xml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/app/src/main/res/layout/start_activity.xml b/app/src/main/res/layout/start_activity.xml index 97283cb..a5f22ad 100644 --- a/app/src/main/res/layout/start_activity.xml +++ b/app/src/main/res/layout/start_activity.xml | |||
@@ -18,15 +18,9 @@ | |||
18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | 18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. |
19 | --> | 19 | --> |
20 | 20 | ||
21 | <FrameLayout | 21 | <fragment |
22 | xmlns:android="http://schemas.android.com/apk/res/android" | 22 | xmlns:android="http://schemas.android.com/apk/res/android" |
23 | android:id="@+id/start_activity_network_list_fragment" | ||
24 | android:name="org.pacien.tincapp.activities.start.NetworkListFragment" | ||
23 | android:layout_width="match_parent" | 25 | android:layout_width="match_parent" |
24 | android:layout_height="match_parent"> | 26 | android:layout_height="match_parent"/> |
25 | |||
26 | <fragment | ||
27 | android:id="@+id/start_activity_network_list_fragment" | ||
28 | android:name="org.pacien.tincapp.activities.start.NetworkListFragment" | ||
29 | android:layout_width="match_parent" | ||
30 | android:layout_height="match_parent"/> | ||
31 | |||
32 | </FrameLayout> | ||