diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
| commit | 3d827e7295d37ecb25332b39057338496f6f970d (patch) | |
| tree | f8c5272e125ed9abae72fb3598d25b1c09f06f89 /app/src/main/res/layout-xlarge | |
| parent | 646e2ec7b868920f71c29243d2bbeb13deb811e3 (diff) | |
| parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) | |
Merge branch 'origin_0.9.8' into 8823_cw_tablet_layout
Diffstat (limited to 'app/src/main/res/layout-xlarge')
| -rw-r--r-- | app/src/main/res/layout-xlarge/about.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/configuration_wizard_activity.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/eip_service_fragment.xml | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/about.xml index 227da8b0..fdf823a9 100644 --- a/app/src/main/res/layout-xlarge/about.xml +++ b/app/src/main/res/layout-xlarge/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-xlarge/configuration_wizard_activity.xml b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml index ba2b7ce4..df82d5de 100644 --- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml +++ b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml @@ -2,10 +2,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/configuration_wizard_layout" - style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ConfigurationWizard"> + tools:context=".ProviderListActivity" + style="@style/BitmaskActivity" > <android.support.v7.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index 28ac3b9a..c99d83bc 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -4,7 +4,9 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginLeft="20dp" - android:layout_marginStart="20dp"> + android:layout_marginStart="20dp" + android:id="@+id/eipServiceFragment" + > <TextView android:id="@+id/eipLabel" |