summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-05-11 10:18:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-11 10:18:38 -0700
commit4d89954dc4572a05339dc7a95ec683892558162b (patch)
tree412057ea0618e327d126dba438d99b2c92e99dde /core/res
parentb6f0cbdcbb566368ebe0468f61de024f644db6e1 (diff)
parenta27579016caf1438400a3637e3896bec653e3756 (diff)
downloadframeworks_base-4d89954dc4572a05339dc7a95ec683892558162b.zip
frameworks_base-4d89954dc4572a05339dc7a95ec683892558162b.tar.gz
frameworks_base-4d89954dc4572a05339dc7a95ec683892558162b.tar.bz2
am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp * commit 'a27579016caf1438400a3637e3896bec653e3756': Fix 2660488: Add LockScreen/InCallScreen resources to preloads
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/arrays.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index 0c065ef..4672c0e 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -71,6 +71,20 @@
<item>@drawable/indicator_code_lock_point_area_default</item>
<item>@drawable/indicator_code_lock_point_area_green</item>
<item>@drawable/indicator_code_lock_point_area_red</item>
+ <!-- SlidingTab drawables shared by InCallScreen and LockScreen -->
+ <item>@drawable/jog_tab_bar_left_end_confirm_gray</item>
+ <item>@drawable/jog_tab_bar_left_end_normal</item>
+ <item>@drawable/jog_tab_bar_left_end_pressed</item>
+ <item>@drawable/jog_tab_bar_right_end_confirm_gray</item>
+ <item>@drawable/jog_tab_bar_right_end_normal</item>
+ <item>@drawable/jog_tab_bar_right_end_pressed</item>
+ <item>@drawable/jog_tab_left_confirm_gray</item>
+ <item>@drawable/jog_tab_left_normal</item>
+ <item>@drawable/jog_tab_left_pressed</item>
+ <item>@drawable/jog_tab_right_confirm_gray</item>
+ <item>@drawable/jog_tab_right_normal</item>
+ <item>@drawable/jog_tab_right_pressed</item>
+ <item>@drawable/jog_tab_target_gray</item>
</array>
<!-- Do not translate. These are all of the color state list resources that should be