diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-01-12 19:19:34 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-01-12 19:19:34 +0100 |
| commit | 05ad5f226aa7a1504c756b0d77ab03e6add9fea9 (patch) | |
| tree | a8f68d5b09d7293ceb35211d2f26f48d4312fcf3 /app/src/main | |
| parent | d80ceac5edb5e63e06201b22f77026714db1ffe0 (diff) | |
| parent | 32998b046977da5d272a948ad0668bf653d598f4 (diff) | |
Merge branch 'bug/ButterKnife-doesn't-find-provider_list_view-#6581' into develop
Diffstat (limited to 'app/src/main')
3 files changed, 13 insertions, 7 deletions
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 bb169e00..50bb5d0b 100644 --- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml +++ b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml @@ -5,6 +5,12 @@ android:layout_height="match_parent" tools:context=".ConfigurationWizard" > + <ListView + android:id="@+id/provider_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:drawSelectorOnTop="false" /> + <ProgressBar android:id="@+id/progressbar_configuration_wizard" style="?android:attr/progressBarStyleHorizontal" @@ -24,4 +30,4 @@ android:layout_centerHorizontal="true" android:textColor="@android:color/holo_blue_bright" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/app/src/main/res/layout-xlarge/provider_list_item.xml b/app/src/main/res/layout-xlarge/provider_list_item.xml index ec5db117..728a61be 100644 --- a/app/src/main/res/layout-xlarge/provider_list_item.xml +++ b/app/src/main/res/layout-xlarge/provider_list_item.xml @@ -24,7 +24,7 @@ android:mode="twoLine" > - <TextView android:id="@android:id/text1" + <TextView android:id="@+id/provider_domain" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" @@ -33,11 +33,11 @@ android:textAppearance="?android:attr/textAppearanceListItem" /> - <TextView android:id="@android:id/text2" + <TextView android:id="@+id/provider_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@android:id/text1" - android:layout_alignLeft="@android:id/text1" + android:layout_below="@id/provider_domain" + android:layout_alignLeft="@id/provider_domain" android:textSize = "24sp" /> diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml index a5bca1e9..71cd5314 100644 --- a/app/src/main/res/layout/configuration_wizard_activity.xml +++ b/app/src/main/res/layout/configuration_wizard_activity.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" tools:context=".ConfigurationWizard" > - <ListView + <ListView android:id="@+id/provider_list" android:layout_width="match_parent" android:layout_height="match_parent" @@ -28,4 +28,4 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_centerHorizontal="true" android:textColor="@android:color/holo_blue_bright" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> |