diff options
Diffstat (limited to 'res/layout/op_progress.xml')
| -rw-r--r-- | res/layout/op_progress.xml | 150 |
1 files changed, 73 insertions, 77 deletions
diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml index e2125622..1c2cef53 100644 --- a/res/layout/op_progress.xml +++ b/res/layout/op_progress.xml @@ -14,103 +14,99 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - - <include layout="@layout/app_details" - android:id="@+id/app_snippet" /> - - <LinearLayout android:id="@+id/center_view" + <!-- Launch and close buttons. --> + <LinearLayout android:id="@+id/buttons_panel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" + android:layout_alignParentBottom="true" android:orientation="vertical" - android:paddingLeft="16dip" - android:paddingRight="16dip"> - - <ImageView android:id="@+id/center_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="12dp" - android:src="@drawable/ic_android_92" - android:contentDescription="@null" /> + android:divider="?android:attr/dividerHorizontal" + android:showDividers="beginning" + android:paddingTop="16dip"> - <ProgressBar android:id="@+id/progress_bar" - android:layout_width="250dp" + <LinearLayout + style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:indeterminate="true" - style="?android:attr/progressBarStyleHorizontal"> - </ProgressBar> + android:orientation="horizontal" + android:measureWithLargestChild="true"> - <TextView android:id="@+id/center_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:text="@string/installing" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - </LinearLayout> - - <!-- This explanation text is shown only after the progress bar below goes away. --> - <ScrollView android:id="@+id/explanation_view" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:visibility="gone" - android:paddingLeft="16dip" - android:paddingRight="16dip"> - - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView android:id="@+id/explanation_status" - android:layout_width="wrap_content" + <LinearLayout android:id="@+id/leftSpacer" + android:layout_weight="0.25" + android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:orientation="horizontal" + android:visibility="gone" /> - <TextView android:id="@+id/explanation" - android:layout_width="match_parent" + <Button android:id="@+id/done_button" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="start" + android:layout_weight="1" + android:text="@string/done" + android:maxLines="2" + style="?android:attr/buttonBarButtonStyle" /> + + <Button android:id="@+id/launch_button" + android:layout_width="0dip" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:layout_gravity="end" + android:layout_weight="1" + android:text="@string/launch" + android:maxLines="2" + style="?android:attr/buttonBarButtonStyle" /> + + <LinearLayout android:id="@+id/rightSpacer" + android:layout_width="0dip" + android:layout_weight="0.25" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:visibility="gone" /> </LinearLayout> + </LinearLayout> - </ScrollView> - - <LinearLayout android:id="@+id/buttons_panel" - style="?android:attr/buttonBarStyle" + <include + layout="@layout/app_details" + android:id="@+id/app_snippet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:measureWithLargestChild="true" - android:padding="8dip"> - - <!-- spacer to push buttons to the right --> - <View android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1" /> + android:layout_alignParentTop="true" /> - <Button android:id="@+id/done_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/done" - android:maxLines="2" - style="?android:attr/buttonBarButtonStyle" /> + <TextView + android:id="@+id/center_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/app_snippet" + android:gravity="start" + android:text="@string/installing" + android:paddingTop="16dip" + android:paddingStart="32dip" + android:paddingEnd="32dip" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <Button android:id="@+id/launch_button" - android:layout_width="wrap_content" + <!-- This explanation text is shown only after the progress bar below goes away. --> + <ScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@id/buttons_panel" + android:layout_below="@id/center_text" + android:paddingTop="8dip" + android:paddingStart="16dip" + android:paddingBottom="16dip"> + <TextView + android:id="@+id/center_explanation" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/launch" - android:maxLines="2" - style="?android:attr/buttonBarButtonStyle" /> - - </LinearLayout> + android:gravity="center_horizontal" + android:visibility="gone" + android:textAppearance="?android:attr/textAppearanceSmall"/> + </ScrollView> -</LinearLayout> +</RelativeLayout> |