diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
commit | 7434a53d0c2545375ff9844a510c9fc8b09948f0 (patch) | |
tree | bdf7b4a2ee6043c3c63cce265fa7c52e5eb92273 /app/src/main/res/layout-sw600dp-port/a_provider_list.xml | |
parent | ce6f1c9c9b402bc2e92462353bb56cadfb9b2f35 (diff) | |
parent | 9b50dcae236f9f93d24f7991df4d7acf64219b73 (diff) |
Merge branch '#8886_add_provider' into 'master'
#8886 add provider
See merge request leap/bitmask_android!79
Diffstat (limited to 'app/src/main/res/layout-sw600dp-port/a_provider_list.xml')
-rw-r--r-- | app/src/main/res/layout-sw600dp-port/a_provider_list.xml | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_list.xml b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml index 818ce864..fbfba403 100644 --- a/app/src/main/res/layout-sw600dp-port/a_provider_list.xml +++ b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml @@ -43,41 +43,5 @@ android:orientation="horizontal" app:layout_constraintGuide_percent="0.725" /> - <LinearLayout - android:orientation="vertical" - android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="@dimen/stdpadding" - android:background="@color/colorBackground" - app:layout_constraintBottom_toTopOf="@+id/guideline_bottom" - app:layout_constraintEnd_toStartOf="@+id/guideline_right" - app:layout_constraintHeight_min="411dp" - app:layout_constraintStart_toStartOf="@+id/guideline_left" - app:layout_constraintTop_toTopOf="@+id/guideline_top" - app:layout_constraintWidth_min="731dp"> - - <include layout="@layout/v_loading_screen" /> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <include layout="@layout/v_provider_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <ListView - android:id="@+id/provider_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:drawSelectorOnTop="false" - android:layout_marginTop="@dimen/list_view_margin_top" - /> - - </LinearLayout> - </LinearLayout> + <include layout="@layout/a_provider_list_tablet_linear_layout" /> </android.support.constraint.ConstraintLayout> |