diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-07-09 17:35:59 +0200 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-11-15 23:14:47 +0100 |
| commit | ea05c4bc15c8b1e96782706340412160364ebdc9 (patch) | |
| tree | d5cadfd0a2c5ee413c3465ba98d84abfabfe963f /res | |
| parent | 60e56246f95adca94e9dce02e193e5217e372d5a (diff) | |
Dashboard progressbar lives below the status line.
I've renamed configuration wizard progressbar, because both had the same
name and that provoked a conflict.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/client_dashboard.xml | 14 | ||||
| -rw-r--r-- | res/layout/configuration_wizard_activity.xml | 11 |
2 files changed, 18 insertions, 7 deletions
diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml index 9f05cfbc..21008b45 100644 --- a/res/layout/client_dashboard.xml +++ b/res/layout/client_dashboard.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="40dp" android:background="?android:attr/selectableItemBackground" > - + <LinearLayout android:id="@+id/providerLabelWrapper" android:layout_width="wrap_content" @@ -65,6 +65,16 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="0.11" - android:orientation="vertical" /> + android:orientation="vertical" > + + <ProgressBar + android:id="@+id/progressbar_dashboard" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:visibility="gone" /> + + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/configuration_wizard_activity.xml b/res/layout/configuration_wizard_activity.xml index 4bc4a8e1..ac994c59 100644 --- a/res/layout/configuration_wizard_activity.xml +++ b/res/layout/configuration_wizard_activity.xml @@ -6,14 +6,15 @@ tools:context=".ConfigurationWizard" > <ProgressBar - android:id="@+id/progressbar" + android:id="@+id/progressbar_configuration_wizard" style="?android:attr/progressBarStyleHorizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:background="@android:color/transparent" android:max="3" - android:maxHeight="20dip" - android:minHeight="20dip" - android:progress="0" - android:background="@android:color/transparent"/> + android:maxHeight="10dip" + android:minHeight="10dip" + android:progress="0" + android:progressDrawable="@android:drawable/progress_horizontal" /> </RelativeLayout>
\ No newline at end of file |