From 97d590d5a1f583acb7992d20851bdc6cd0454d12 Mon Sep 17 00:00:00 2001
From: Steve Howard <showard@google.com>
Date: Fri, 20 Aug 2010 17:45:03 -0700
Subject: Add UI message when queued for wifi due to size.

As it stands, when a download is paused because it's too big to
proceed over mobile, and must proceed over wifi, it looks like any
other paused download, with no indication of why it's paused.  That
may be passable for most other reasons for pausing a download, but it
seems too confusing for this case.  So this change adds a simple
string message that replaces the progress bar when a download is
paused for this reason (the icon also changes to a warning).

The implementation isn't beautiful and could use some improvement, but
I think it's acceptable and necessary.  The exact UI design and
wording are certainly open to change.

Change-Id: I753d57f463e2614b5694bdc178d2a51066da8ca3
---
 res/layout/status_bar_ongoing_event_progress_bar.xml | 13 ++++++++++++-
 res/values/strings.xml                               |  9 +++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout/status_bar_ongoing_event_progress_bar.xml b/res/layout/status_bar_ongoing_event_progress_bar.xml
index c6a71d46..e3a60b2e 100644
--- a/res/layout/status_bar_ongoing_event_progress_bar.xml
+++ b/res/layout/status_bar_ongoing_event_progress_bar.xml
@@ -88,14 +88,25 @@
                     android:paddingLeft="5dp"
                     />
             </LinearLayout>
+            <!-- Only one of progress_bar and paused_text will be visible. -->
             <ProgressBar android:id="@+id/progress_bar"
                 style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent" 
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:paddingBottom="8dp"
                 android:paddingRight="25dp"
                 />
+            <TextView android:id="@+id/paused_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:paddingBottom="8dp"
+                android:singleLine="true"
+                android:textSize="14sp"
+                android:paddingLeft="5dp"
+                android:textColor="#ff000000"
+                />
         </RelativeLayout>
     </LinearLayout>
         
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 62ba38f7..b0d95ce5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -134,5 +134,14 @@
         application, a content marketplace. -->
     <string name="notification_download_failed">Download unsuccessful</string>
 
+    <!-- When a download is paused because it's too large to download over a
+        mobile connection, and wifi is unavailable, this string is displayed in
+        the system notification for the running download, beneath the download
+        title and description.  Note that such a download could have been
+        initiated by a variety of applications, including (but not limited to)
+        the browser, an email application, a content marketplace.
+        [CHAR LIMIT=24] -->
+    <string name="notification_need_wifi_for_size">Need wifi due to size</string>
+
 
 </resources>
-- 
cgit v1.2.3