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/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/a_provider_list.xml')
| -rw-r--r-- | app/src/main/res/layout/a_provider_list.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml index aa8cdfbb..2e2573eb 100644 --- a/app/src/main/res/layout/a_provider_list.xml +++ b/app/src/main/res/layout/a_provider_list.xml @@ -15,7 +15,10 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/v_provider_header" /> + <se.leap.bitmaskclient.views.ProviderHeaderView + android:id="@+id/header" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> <ListView android:id="@+id/provider_list" |