diff options
| author | Steve Howard <showard@google.com> | 2010-08-24 11:01:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 11:01:44 -0700 |
| commit | 140fcdcda4d1ff10eff86704f20700e83bf60b7e (patch) | |
| tree | 446695be33860c40b3349a965bcb59b3ad655ab0 /res | |
| parent | 000e1a78010c54849022937c587f3af76937c815 (diff) | |
| parent | 9877c7f8414bfa1feb49b2afe166f99fff678794 (diff) | |
| download | android_packages_providers_DownloadProvider-140fcdcda4d1ff10eff86704f20700e83bf60b7e.tar.gz android_packages_providers_DownloadProvider-140fcdcda4d1ff10eff86704f20700e83bf60b7e.tar.bz2 android_packages_providers_DownloadProvider-140fcdcda4d1ff10eff86704f20700e83bf60b7e.zip | |
am 9877c7f8: am 97d590d5: Add UI message when queued for wifi due to size.
Merge commit '9877c7f8414bfa1feb49b2afe166f99fff678794'
* commit '9877c7f8414bfa1feb49b2afe166f99fff678794':
Add UI message when queued for wifi due to size.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/status_bar_ongoing_event_progress_bar.xml | 13 | ||||
| -rw-r--r-- | res/values/strings.xml | 9 |
2 files changed, 21 insertions, 1 deletions
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> |