diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-12-01 10:39:54 +0000 |
|---|---|---|
| committer | Sander Alewijnse <salewijnse@google.com> | 2014-12-01 16:18:51 +0000 |
| commit | 057866f296b7e786945cf31c804a2951b56b4425 (patch) | |
| tree | f2133105fbeddc64693a2eb51ac26c713d1c0f6d /res/layout/progress.xml | |
| parent | af821528292eeb53f077b5fd49682d21193c357d (diff) | |
| download | android_packages_apps_ManagedProvisioning-057866f296b7e786945cf31c804a2951b56b4425.tar.gz android_packages_apps_ManagedProvisioning-057866f296b7e786945cf31c804a2951b56b4425.tar.bz2 android_packages_apps_ManagedProvisioning-057866f296b7e786945cf31c804a2951b56b4425.zip | |
Replace spinners with SUW-style indeterminate progress bars.
Bug:18528107
Change-Id: I405bbc3293c9d4f8ba756489a5318fd560bfcbb2
Diffstat (limited to 'res/layout/progress.xml')
| -rw-r--r-- | res/layout/progress.xml | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/res/layout/progress.xml b/res/layout/progress.xml index 34d25e3e..9cfae10a 100644 --- a/res/layout/progress.xml +++ b/res/layout/progress.xml @@ -21,12 +21,26 @@ style="@style/Container" > <include layout="@layout/header_and_title"/> <LinearLayout - style="@style/MainTextContainer"> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:layout_marginLeft="@dimen/main_text_margins_left_right" + android:layout_marginRight="@dimen/main_text_margins_left_right"> <ProgressBar - style="@style/ProgressBar"/> - <TextView - android:id="@+id/prog_text" - android:gravity="center_horizontal" - style="@style/MainText"/> + style="?android:attr/progressBarStyleHorizontal" + android:background="@color/white" + android:indeterminate="true" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/progress_bar_margin_top" + android:layout_weight="0" + android:layout_width="match_parent"/> + <LinearLayout + android:layout_weight="1" + style="@style/MainTextContainerNoHorizontalMargin"> + <TextView + android:id="@+id/prog_text" + android:gravity="center_horizontal" + style="@style/MainText"/> + </LinearLayout> </LinearLayout> </LinearLayout> |