diff options
author | Steve Howard <showard@google.com> | 2010-09-17 16:45:58 -0700 |
---|---|---|
committer | Steve Howard <showard@google.com> | 2010-09-21 12:43:05 -0700 |
commit | d319729622da1893e895f2e35f41d01ecdca3705 (patch) | |
tree | 02994abdf2725061b798cb32339b044592cbf581 /res | |
parent | 78f433c68f14dfba605ceb0e5f3dc54243efd2b2 (diff) | |
download | android_packages_providers_DownloadProvider-d319729622da1893e895f2e35f41d01ecdca3705.tar.gz android_packages_providers_DownloadProvider-d319729622da1893e895f2e35f41d01ecdca3705.tar.bz2 android_packages_providers_DownloadProvider-d319729622da1893e895f2e35f41d01ecdca3705.zip |
Implement dialogs for wifi required + recommended limits.
This change extends the original work to add a size limit over which
wifi is required to download a file.
First, this change adds a second size limit, over which wifi is
recommended but not required. The user has the option to bypass this
limit.
Second, this change implements dialogs shown to the user when either
limit is exceeded. These dialogs are shown by the background download
manager service when a download is started and found to be over the
limit (and wifi is not connected).
I'm including one small fix to the unit tests needed from the previous
change.
Change-Id: Ia0f0acaa7b0d00e98355925c3446c0472048df10
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 1623fbe2..543c95c7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -154,5 +154,50 @@ [CHAR LIMIT=24] --> <string name="notification_need_wifi_for_size">Need wifi due to size</string> + <!-- Title for dialog when a download exceeds the carrier-specified maximum size of downloads + over the mobile network and WiFi is required. The user has the choice to either queue the + download to start next time WiFi is available or cancel the download altogether. [CHAR + LIMIT=50] --> + <string name="wifi_required_title">Download too large for operator network</string> + + <!-- Text for dialog when a download exceeds the carrier-specified maximum size of downloads + over the mobile network and WiFi is required. The user has the choice to either queue the + download to start next time WiFi is available or cancel the download altogether. [CHAR + LIMIT=200] --> + <string name="wifi_required_body">You must use WiFi to complete this <xliff:g id="size" + example="12.3KB">%s</xliff:g> download.\n\nClick \"<xliff:g id="queue_text" + example="Queue">%s</xliff:g>\" below to begin this download the next time you are connected + to a WiFi network.</string> + + <!-- Title for dialog when a download exceeds the carrier-specified recommended maximum size of + downloads over the mobile network, and the user may choose to start the download over mobile + anyway or to queue for download to start next time a WiFi connection is available [CHAR + LIMIT=50] --> + <string name="wifi_recommended_title">Queue for download later?</string> + + <!-- Text for dialog when a download exceeds the carrier-specified recommended maximum size of + downloads over the mobile network, and the user may choose to start the download over mobile + anyway or to queue for download to start next time a WiFi connection is available [CHAR + LIMIT=200] --> + <string name="wifi_recommended_body">Starting this <xliff:g id="size" example="12.3KB">%s + </xliff:g> download now may shorten your battery life and/or result in excessive usage of + your mobile data connection, which can lead to charges by your mobile operator depending on + your data plan.\n\nClick \"<xliff:g id="queue_text" example="Queue">%s</xliff:g>\" below to + begin this download the next time you are connected to a WiFi network.</string> + + + <!-- Text for button to queue a download to start next time WiFi is available [CHAR LIMIT=25] + --> + <string name="button_queue_for_wifi">Queue</string> + + <!-- Text for button to cancel a download because it's too large to proceed over the mobile + network and the user does not want to queue it for WiFi [CHAR LIMIT=25] --> + <string name="button_cancel_download">Cancel</string> + + <!-- Text for button to start a download over the mobile connection now, even though it's over + the carrier-specified recommended maximum size for downloads over the mobile connection + [CHAR LIMIT=25] --> + <string name="button_start_now">Start now</string> + </resources> |