summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-26 14:16:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-26 14:16:48 -0700
commitbbf6a1c7fe3054c389d879fe7b4c60b5cbeaacee (patch)
tree4e734b3c2e2ac5500b146566b7574b79019b41fa /res
parent5c1215e8a31073aea747fd7fec1788e493fcef80 (diff)
parent380d44ad97ad6c800386729d9bac6947bff1a1b8 (diff)
downloadandroid_packages_providers_DownloadProvider-bbf6a1c7fe3054c389d879fe7b4c60b5cbeaacee.tar.gz
android_packages_providers_DownloadProvider-bbf6a1c7fe3054c389d879fe7b4c60b5cbeaacee.tar.bz2
android_packages_providers_DownloadProvider-bbf6a1c7fe3054c389d879fe7b4c60b5cbeaacee.zip
am 380d44ad: am b8bb8473: UI + string tweaks for downloads UI + size limits UI
Merge commit '380d44ad97ad6c800386729d9bac6947bff1a1b8' * commit '380d44ad97ad6c800386729d9bac6947bff1a1b8': UI + string tweaks for downloads UI + size limits UI
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml40
-rw-r--r--res/values/styles.xml21
2 files changed, 40 insertions, 21 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 46bf82a9..e7629cc1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -146,52 +146,50 @@
<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
+ mobile connection, and Wi-Fi 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>
+ <string name="notification_need_wifi_for_size">Download size requires Wi-Fi</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
+ over the mobile network and Wi-Fi is required. The user has the choice to either queue the
+ download to start next time Wi-Fi is available or cancel the download altogether. [CHAR
LIMIT=50] -->
- <string name="wifi_required_title">Download too large for operator network</string>
+ <string name="wifi_required_title">Download too large for mobile 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
+ over the mobile network and Wi-Fi is required. The user has the choice to either queue the
+ download to start next time Wi-Fi 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>
+ <string name="wifi_required_body">You can\'t download a <xliff:g id="size" example="12.3KB">%s
+ </xliff:g> file on this mobile network.\n\nTouch <xliff:g id="queue_text" example="Queue">%s
+ </xliff:g> to download this file when next connected to a Wi-Fi 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
+ anyway or to queue for download to start next time a Wi-Fi connection is available [CHAR
LIMIT=50] -->
- <string name="wifi_recommended_title">Queue for download later?</string>
+ <string name="wifi_recommended_title">Queue for Wi-Fi download?</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
+ anyway or to queue for download to start next time a Wi-Fi 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>
+ <string name="wifi_recommended_body">Downloading this <xliff:g id="size" example="12.3KB">%s
+ </xliff:g> file on this mobile network risks draining your battery and extra charges from
+ your carrier.\n\nTouch <xliff:g id="queue_text" example="Queue">%s</xliff:g> to download
+ this file when next connected to a Wi-Fi network.</string>
- <!-- Text for button to queue a download to start next time WiFi is available [CHAR LIMIT=25]
+ <!-- Text for button to queue a download to start next time Wi-Fi 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] -->
+ network and the user does not want to queue it for Wi-Fi [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
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 00000000..ec662d42
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <style name="Theme.Translucent" parent="android:style/Theme.Translucent">
+ <item name="android:windowNoTitle">true</item>
+ </style>
+</resources>