summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2010-03-16 16:01:29 -0400
committerDaniel Sandler <dsandler@google.com>2010-03-16 16:38:04 -0400
commitc8b7b9f45e0f51138101c509b6d176d35bbf2c78 (patch)
tree527ab227a520d93b329f1b5e9582fecd2f110e91 /core/res
parent0794cd33dd8c3019183cecb44119c56eee3c06f0 (diff)
downloadframeworks_base-c8b7b9f45e0f51138101c509b6d176d35bbf2c78.zip
frameworks_base-c8b7b9f45e0f51138101c509b6d176d35bbf2c78.tar.gz
frameworks_base-c8b7b9f45e0f51138101c509b6d176d35bbf2c78.tar.bz2
Add progress indicator to USB mass storage screen.
When the user taps on the enable button, it's hidden and replaced with an indeterminate ProgressBar; this is in turn hidden and replaced with the disable button in response to broadcasts from the MountService. (Disabling UMS is analogous.) (Requires change Ic53cb370, which moves MountService's operations out of the UI thread.) Bug: 2483340 Change-Id: Ia25d99cd9709ee5a05316e8f05f66ca9da20aa25
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/layout-land/usb_storage_activity.xml13
-rw-r--r--core/res/res/layout/usb_storage_activity.xml11
2 files changed, 19 insertions, 5 deletions
diff --git a/core/res/res/layout-land/usb_storage_activity.xml b/core/res/res/layout-land/usb_storage_activity.xml
index d714479..50ca569 100644
--- a/core/res/res/layout-land/usb_storage_activity.xml
+++ b/core/res/res/layout-land/usb_storage_activity.xml
@@ -24,7 +24,7 @@
<TextView android:id="@+id/banner"
android:layout_centerHorizontal="true"
- android:layout_below="@id/icon"
+ android:layout_alignParentTop="true"
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -45,8 +45,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:layout_below="@id/message"
- android:layout_marginTop="20dip"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="20dip"
>
<Button android:id="@+id/mount_button"
@@ -64,6 +64,13 @@
android:paddingRight="18dip"
android:text="@string/usb_storage_stop_button_mount"
/>
+ <ProgressBar android:id="@+id/progress"
+ android:visibility="gone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ style="?android:attr/progressBarStyle"
+ />
</RelativeLayout>
</RelativeLayout>
diff --git a/core/res/res/layout/usb_storage_activity.xml b/core/res/res/layout/usb_storage_activity.xml
index 86bfadb..76c30fd 100644
--- a/core/res/res/layout/usb_storage_activity.xml
+++ b/core/res/res/layout/usb_storage_activity.xml
@@ -37,8 +37,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:layout_below="@id/message"
- android:layout_marginTop="20dip"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="20dip"
>
<Button android:id="@+id/mount_button"
@@ -56,6 +56,13 @@
android:paddingRight="18dip"
android:text="@string/usb_storage_stop_button_mount"
/>
+ <ProgressBar android:id="@+id/progress"
+ android:visibility="gone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ style="?android:attr/progressBarStyle"
+ />
</RelativeLayout>
</RelativeLayout>