diff options
| author | fupduck <fupduck@riseup.net> | 2018-02-06 05:53:09 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-02-06 05:53:09 -0800 |
| commit | edd34192484f4eb618fdcc2a68b18168c155d63c (patch) | |
| tree | d884f63e74911d2ea2cf7bc864414a623e15a2b3 /app/src/main/res/layout | |
| parent | c0848bac7ac44f4b09f9e5d66ab71f079cb0f514 (diff) | |
| parent | d2d61a16fd2a3ea0fd42073de98d1311b184444d (diff) | |
Merge branch '#8832_update_ics-openvpn' into '0.9.8'
#8832 update ics openvpn
See merge request leap/bitmask_android!33
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/about.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_main.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/f_log.xml | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 62e858cb..e26629ab 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -1,6 +1,6 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/dashboardLayout" + android:id="@+id/aboutLayout" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index 20d826b3..41498617 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -24,12 +24,7 @@ android:id="@+id/mask" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerInParent="true" - android:layout_centerVertical="true" app:srcCompat="@drawable/mask" /> - - </FrameLayout> <RelativeLayout diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index aa7ba514..497d2c0b 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -2,9 +2,10 @@ <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/relativeLayout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:id="@+id/eipServiceFragment" + > <android.support.constraint.Guideline android:id="@+id/guideline_horizontal_top" diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml index 41c72d99..47a80e50 100644 --- a/app/src/main/res/layout/f_log.xml +++ b/app/src/main/res/layout/f_log.xml @@ -9,7 +9,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp"> + android:padding="16dp" + android:id="@+id/log_layout" + > <LinearLayout android:elevation="1dp" |