summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2014-02-14 16:59:24 -0500
committerChris Wren <cwren@android.com>2014-03-11 13:41:05 -0400
commitaeff7ea43409d817490fbb8c22b8d4b9725bb54f (patch)
tree15d620ddc1b70e02d82852aae7000b69935c6c5c /res
parentbfbd52a5e618a86dc7a13bb5e4866759e181a7cb (diff)
downloadandroid_packages_apps_Trebuchet-aeff7ea43409d817490fbb8c22b8d4b9725bb54f.tar.gz
android_packages_apps_Trebuchet-aeff7ea43409d817490fbb8c22b8d4b9725bb54f.tar.bz2
android_packages_apps_Trebuchet-aeff7ea43409d817490fbb8c22b8d4b9725bb54f.zip
update promise icon status
also fix a crash in LauncherModel.DEBUG_LOADERS Bug: 10778992 Change-Id: Iafc28c1e0c2f2a1283783a7ce27e181634b62993
Diffstat (limited to 'res')
-rw-r--r--res/values/integers.xml22
-rw-r--r--res/values/strings.xml11
2 files changed, 33 insertions, 0 deletions
diff --git a/res/values/integers.xml b/res/values/integers.xml
new file mode 100644
index 000000000..7d26d8595
--- /dev/null
+++ b/res/values/integers.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2014 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>
+ <integer name="promise_icon_alpha">127</integer>
+</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9cb6c293b..8ba58e56f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -262,4 +262,15 @@ s -->
<string name="wallpaper_button_text">Wallpapers</string>
<!-- Text for settings button -->
<string name="settings_button_text">Settings</string>
+
+ <!-- Label on an icon that references an uninstalled package, that is going to be installed at some point. [CHAR_LIMIT=15] -->
+ <string name="package_state_enqueued">Waiting</string>
+ <!-- Label on an icon that references an uninstalled package, that is currently being downloaded. [CHAR_LIMIT=15] -->
+ <string name="package_state_downloading">Downloading</string>
+ <!-- Label on an icon that references an uninstalled package, that is currently being installed. [CHAR_LIMIT=15] -->
+ <string name="package_state_installing">Installing</string>
+ <!-- Label on an icon that references an uninstalled package, for which we have no information about when it might be installed. [CHAR_LIMIT=15] -->
+ <string name="package_state_unknown">Unknown</string>
+ <!-- Label on an icon that references an uninstalled package, for which restore from market has failed. [CHAR_LIMIT=15] -->
+ <string name="package_state_error">Error</string>
</resources>