summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-07-07 11:58:56 -0700
committerAdam Cohen <adamcohen@google.com>2014-07-07 15:29:53 -0700
commit96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd (patch)
tree91ff1045255107518b9ea6c9d08667b44ef5a8d2 /res
parente54e67f8982f42190dcc3b2ee02092f474d1f7c6 (diff)
downloadandroid_packages_apps_Trebuchet-96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd.tar.gz
android_packages_apps_Trebuchet-96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd.tar.bz2
android_packages_apps_Trebuchet-96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd.zip
Enabling quantum look and feel everywhere
-> _l assets become default, new folder icon look is default -> Starting to unify folder look / feel with all apps -> New page indicators Change-Id: I50b2c647fbcbe6ed27705527d8e16bd89e123d0b
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_allapps.pngbin10781 -> 8345 bytes
-rw-r--r--res/drawable-hdpi/ic_allapps_l.pngbin8345 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_allapps_pressed.pngbin9985 -> 8184 bytes
-rw-r--r--res/drawable-hdpi/ic_allapps_pressed_l.pngbin8184 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_setting.pngbin3282 -> 2286 bytes
-rw-r--r--res/drawable-hdpi/ic_setting_l.pngbin2286 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_setting_pressed.pngbin3642 -> 2293 bytes
-rw-r--r--res/drawable-hdpi/ic_setting_pressed_l.pngbin2293 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_wallpaper.pngbin2189 -> 1997 bytes
-rw-r--r--res/drawable-hdpi/ic_wallpaper_l.pngbin1997 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_wallpaper_pressed.pngbin2474 -> 1882 bytes
-rw-r--r--res/drawable-hdpi/ic_wallpaper_pressed_l.pngbin1882 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_widget.pngbin1560 -> 1580 bytes
-rw-r--r--res/drawable-hdpi/ic_widget_l.pngbin1580 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_widget_pressed.pngbin2332 -> 1524 bytes
-rw-r--r--res/drawable-hdpi/ic_widget_pressed_l.pngbin1524 -> 0 bytes
-rw-r--r--res/drawable-hdpi/quantum_panel.9.pngbin0 -> 448 bytes
-rw-r--r--res/drawable-hdpi/screenpanel.9.pngbin881 -> 1097 bytes
-rw-r--r--res/drawable-hdpi/screenpanel_hover.9.pngbin1096 -> 1125 bytes
-rw-r--r--res/drawable-hdpi/screenpanel_hover_l.9.pngbin1125 -> 0 bytes
-rw-r--r--res/drawable-hdpi/screenpanel_l.9.pngbin1097 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_allapps.pngbin6613 -> 4962 bytes
-rw-r--r--res/drawable-mdpi/ic_allapps_l.pngbin4962 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_allapps_pressed.pngbin6048 -> 5186 bytes
-rw-r--r--res/drawable-mdpi/ic_allapps_pressed_l.pngbin5186 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_setting.pngbin2065 -> 1577 bytes
-rw-r--r--res/drawable-mdpi/ic_setting_l.pngbin1577 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_setting_pressed.pngbin2182 -> 1617 bytes
-rw-r--r--res/drawable-mdpi/ic_setting_pressed_l.pngbin1617 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_wallpaper.pngbin1494 -> 1496 bytes
-rw-r--r--res/drawable-mdpi/ic_wallpaper_l.pngbin1496 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_wallpaper_pressed.pngbin1574 -> 1391 bytes
-rw-r--r--res/drawable-mdpi/ic_wallpaper_pressed_l.pngbin1391 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_widget.pngbin1174 -> 1182 bytes
-rw-r--r--res/drawable-mdpi/ic_widget_l.pngbin1182 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_widget_pressed.pngbin1487 -> 1177 bytes
-rw-r--r--res/drawable-mdpi/ic_widget_pressed_l.pngbin1177 -> 0 bytes
-rw-r--r--res/drawable-mdpi/quantum_panel.9.pngbin0 -> 353 bytes
-rw-r--r--res/drawable-mdpi/screenpanel.9.pngbin900 -> 774 bytes
-rw-r--r--res/drawable-mdpi/screenpanel_hover.9.pngbin975 -> 777 bytes
-rw-r--r--res/drawable-mdpi/screenpanel_hover_l.9.pngbin777 -> 0 bytes
-rw-r--r--res/drawable-mdpi/screenpanel_l.9.pngbin774 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_allapps.pngbin15138 -> 11053 bytes
-rw-r--r--res/drawable-xhdpi/ic_allapps_l.pngbin11053 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_allapps_pressed.pngbin13782 -> 10926 bytes
-rw-r--r--res/drawable-xhdpi/ic_allapps_pressed_l.pngbin10926 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_setting.pngbin4499 -> 2976 bytes
-rw-r--r--res/drawable-xhdpi/ic_setting_l.pngbin2976 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_setting_pressed.pngbin5300 -> 3013 bytes
-rw-r--r--res/drawable-xhdpi/ic_setting_pressed_l.pngbin3013 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_wallpaper.pngbin2875 -> 2401 bytes
-rw-r--r--res/drawable-xhdpi/ic_wallpaper_l.pngbin2401 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_wallpaper_pressed.pngbin3504 -> 2209 bytes
-rw-r--r--res/drawable-xhdpi/ic_wallpaper_pressed_l.pngbin2209 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_widget.pngbin1978 -> 1982 bytes
-rw-r--r--res/drawable-xhdpi/ic_widget_l.pngbin1982 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_widget_pressed.pngbin3360 -> 1883 bytes
-rw-r--r--res/drawable-xhdpi/ic_widget_pressed_l.pngbin1883 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/quantum_panel.9.pngbin0 -> 578 bytes
-rw-r--r--res/drawable-xhdpi/screenpanel.9.pngbin1403 -> 1493 bytes
-rw-r--r--res/drawable-xhdpi/screenpanel_hover.9.pngbin1704 -> 1507 bytes
-rw-r--r--res/drawable-xhdpi/screenpanel_hover_l.9.pngbin1507 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/screenpanel_l.9.pngbin1493 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_allapps.pngbin18589 -> 16980 bytes
-rw-r--r--res/drawable-xxhdpi/ic_allapps_l.pngbin16980 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_allapps_pressed.pngbin17006 -> 15912 bytes
-rw-r--r--res/drawable-xxhdpi/ic_allapps_pressed_l.pngbin15912 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_pageindicator_add.pngbin1578 -> 1142 bytes
-rw-r--r--res/drawable-xxhdpi/ic_pageindicator_current.pngbin2227 -> 2002 bytes
-rw-r--r--res/drawable-xxhdpi/ic_pageindicator_default.pngbin1532 -> 1080 bytes
-rw-r--r--res/drawable-xxhdpi/ic_setting.pngbin4512 -> 4568 bytes
-rw-r--r--res/drawable-xxhdpi/ic_setting_l.pngbin4568 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_setting_pressed.pngbin7627 -> 4476 bytes
-rw-r--r--res/drawable-xxhdpi/ic_setting_pressed_l.pngbin4476 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_wallpaper.pngbin3422 -> 3563 bytes
-rw-r--r--res/drawable-xxhdpi/ic_wallpaper_l.pngbin3563 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_wallpaper_pressed.pngbin5546 -> 3312 bytes
-rw-r--r--res/drawable-xxhdpi/ic_wallpaper_pressed_l.pngbin3312 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_widget.pngbin2413 -> 2857 bytes
-rw-r--r--res/drawable-xxhdpi/ic_widget_l.pngbin2857 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_widget_pressed.pngbin5518 -> 2772 bytes
-rw-r--r--res/drawable-xxhdpi/ic_widget_pressed_l.pngbin2772 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/quantum_panel.9.pngbin0 -> 819 bytes
-rw-r--r--res/drawable-xxhdpi/screenpanel.9.pngbin5196 -> 2224 bytes
-rw-r--r--res/drawable-xxhdpi/screenpanel_hover.9.pngbin2605 -> 2230 bytes
-rw-r--r--res/drawable-xxhdpi/screenpanel_hover_l.9.pngbin2230 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/screenpanel_l.9.pngbin2224 -> 0 bytes
-rw-r--r--res/drawable-xxxhdpi/quantum_panel.9.pngbin0 -> 1861 bytes
-rw-r--r--res/drawable/all_apps_button_icon_l.xml21
-rw-r--r--res/drawable/setting_button_l.xml21
-rw-r--r--res/drawable/wallpaper_button_l.xml21
-rw-r--r--res/layout/apps_customize_application.xml4
-rw-r--r--res/layout/apps_customize_pane.xml38
-rw-r--r--res/layout/folder_application.xml (renamed from res/drawable/widget_button_l.xml)11
-rw-r--r--res/layout/user_folder.xml2
-rw-r--r--res/values/attrs.xml6
-rw-r--r--res/values/colors.xml4
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/styles.xml21
99 files changed, 57 insertions, 93 deletions
diff --git a/res/drawable-hdpi/ic_allapps.png b/res/drawable-hdpi/ic_allapps.png
index e7677d5d2..4fe3bf0e6 100644
--- a/res/drawable-hdpi/ic_allapps.png
+++ b/res/drawable-hdpi/ic_allapps.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_allapps_l.png b/res/drawable-hdpi/ic_allapps_l.png
deleted file mode 100644
index 4fe3bf0e6..000000000
--- a/res/drawable-hdpi/ic_allapps_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_allapps_pressed.png b/res/drawable-hdpi/ic_allapps_pressed.png
index 863eebaa5..af49dbb41 100644
--- a/res/drawable-hdpi/ic_allapps_pressed.png
+++ b/res/drawable-hdpi/ic_allapps_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_allapps_pressed_l.png b/res/drawable-hdpi/ic_allapps_pressed_l.png
deleted file mode 100644
index af49dbb41..000000000
--- a/res/drawable-hdpi/ic_allapps_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_setting.png b/res/drawable-hdpi/ic_setting.png
index 3f5bc43fd..1c12a5b80 100644
--- a/res/drawable-hdpi/ic_setting.png
+++ b/res/drawable-hdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_setting_l.png b/res/drawable-hdpi/ic_setting_l.png
deleted file mode 100644
index 1c12a5b80..000000000
--- a/res/drawable-hdpi/ic_setting_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_setting_pressed.png b/res/drawable-hdpi/ic_setting_pressed.png
index 9201064cf..d5b5ca204 100644
--- a/res/drawable-hdpi/ic_setting_pressed.png
+++ b/res/drawable-hdpi/ic_setting_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_setting_pressed_l.png b/res/drawable-hdpi/ic_setting_pressed_l.png
deleted file mode 100644
index d5b5ca204..000000000
--- a/res/drawable-hdpi/ic_setting_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wallpaper.png b/res/drawable-hdpi/ic_wallpaper.png
index 5e5d1186b..34d594336 100644
--- a/res/drawable-hdpi/ic_wallpaper.png
+++ b/res/drawable-hdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wallpaper_l.png b/res/drawable-hdpi/ic_wallpaper_l.png
deleted file mode 100644
index 34d594336..000000000
--- a/res/drawable-hdpi/ic_wallpaper_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wallpaper_pressed.png b/res/drawable-hdpi/ic_wallpaper_pressed.png
index d104e5770..1588ce717 100644
--- a/res/drawable-hdpi/ic_wallpaper_pressed.png
+++ b/res/drawable-hdpi/ic_wallpaper_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wallpaper_pressed_l.png b/res/drawable-hdpi/ic_wallpaper_pressed_l.png
deleted file mode 100644
index 1588ce717..000000000
--- a/res/drawable-hdpi/ic_wallpaper_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_widget.png b/res/drawable-hdpi/ic_widget.png
index 8c57af0de..ed7e1ca0d 100644
--- a/res/drawable-hdpi/ic_widget.png
+++ b/res/drawable-hdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_widget_l.png b/res/drawable-hdpi/ic_widget_l.png
deleted file mode 100644
index ed7e1ca0d..000000000
--- a/res/drawable-hdpi/ic_widget_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_widget_pressed.png b/res/drawable-hdpi/ic_widget_pressed.png
index 081f9f9ce..19d6feded 100644
--- a/res/drawable-hdpi/ic_widget_pressed.png
+++ b/res/drawable-hdpi/ic_widget_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_widget_pressed_l.png b/res/drawable-hdpi/ic_widget_pressed_l.png
deleted file mode 100644
index 19d6feded..000000000
--- a/res/drawable-hdpi/ic_widget_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png
new file mode 100644
index 000000000..ae625bead
--- /dev/null
+++ b/res/drawable-hdpi/quantum_panel.9.png
Binary files differ
diff --git a/res/drawable-hdpi/screenpanel.9.png b/res/drawable-hdpi/screenpanel.9.png
index 36e7dfd9c..eed0f2cbb 100644
--- a/res/drawable-hdpi/screenpanel.9.png
+++ b/res/drawable-hdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png
index 0fed7c9d8..2cea8a471 100644
--- a/res/drawable-hdpi/screenpanel_hover.9.png
+++ b/res/drawable-hdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/drawable-hdpi/screenpanel_hover_l.9.png b/res/drawable-hdpi/screenpanel_hover_l.9.png
deleted file mode 100644
index 2cea8a471..000000000
--- a/res/drawable-hdpi/screenpanel_hover_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/screenpanel_l.9.png b/res/drawable-hdpi/screenpanel_l.9.png
deleted file mode 100644
index eed0f2cbb..000000000
--- a/res/drawable-hdpi/screenpanel_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_allapps.png b/res/drawable-mdpi/ic_allapps.png
index e0fd9c07a..09cd82af9 100644
--- a/res/drawable-mdpi/ic_allapps.png
+++ b/res/drawable-mdpi/ic_allapps.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_allapps_l.png b/res/drawable-mdpi/ic_allapps_l.png
deleted file mode 100644
index 09cd82af9..000000000
--- a/res/drawable-mdpi/ic_allapps_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png
index 3bd87b187..d7ea96f61 100644
--- a/res/drawable-mdpi/ic_allapps_pressed.png
+++ b/res/drawable-mdpi/ic_allapps_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_allapps_pressed_l.png b/res/drawable-mdpi/ic_allapps_pressed_l.png
deleted file mode 100644
index d7ea96f61..000000000
--- a/res/drawable-mdpi/ic_allapps_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_setting.png b/res/drawable-mdpi/ic_setting.png
index 1e7645953..c614e9183 100644
--- a/res/drawable-mdpi/ic_setting.png
+++ b/res/drawable-mdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_setting_l.png b/res/drawable-mdpi/ic_setting_l.png
deleted file mode 100644
index c614e9183..000000000
--- a/res/drawable-mdpi/ic_setting_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_setting_pressed.png b/res/drawable-mdpi/ic_setting_pressed.png
index d7aca18e1..61e574ad1 100644
--- a/res/drawable-mdpi/ic_setting_pressed.png
+++ b/res/drawable-mdpi/ic_setting_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_setting_pressed_l.png b/res/drawable-mdpi/ic_setting_pressed_l.png
deleted file mode 100644
index 61e574ad1..000000000
--- a/res/drawable-mdpi/ic_setting_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wallpaper.png b/res/drawable-mdpi/ic_wallpaper.png
index 333a206e2..8f2a00a3f 100644
--- a/res/drawable-mdpi/ic_wallpaper.png
+++ b/res/drawable-mdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wallpaper_l.png b/res/drawable-mdpi/ic_wallpaper_l.png
deleted file mode 100644
index 8f2a00a3f..000000000
--- a/res/drawable-mdpi/ic_wallpaper_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wallpaper_pressed.png b/res/drawable-mdpi/ic_wallpaper_pressed.png
index 273c48b3a..aa598c3e2 100644
--- a/res/drawable-mdpi/ic_wallpaper_pressed.png
+++ b/res/drawable-mdpi/ic_wallpaper_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wallpaper_pressed_l.png b/res/drawable-mdpi/ic_wallpaper_pressed_l.png
deleted file mode 100644
index aa598c3e2..000000000
--- a/res/drawable-mdpi/ic_wallpaper_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_widget.png b/res/drawable-mdpi/ic_widget.png
index 5f974c28c..1bd393503 100644
--- a/res/drawable-mdpi/ic_widget.png
+++ b/res/drawable-mdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_widget_l.png b/res/drawable-mdpi/ic_widget_l.png
deleted file mode 100644
index 1bd393503..000000000
--- a/res/drawable-mdpi/ic_widget_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_widget_pressed.png b/res/drawable-mdpi/ic_widget_pressed.png
index 0a3e8838f..9b690d99b 100644
--- a/res/drawable-mdpi/ic_widget_pressed.png
+++ b/res/drawable-mdpi/ic_widget_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_widget_pressed_l.png b/res/drawable-mdpi/ic_widget_pressed_l.png
deleted file mode 100644
index 9b690d99b..000000000
--- a/res/drawable-mdpi/ic_widget_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png
new file mode 100644
index 000000000..1f9cd1a18
--- /dev/null
+++ b/res/drawable-mdpi/quantum_panel.9.png
Binary files differ
diff --git a/res/drawable-mdpi/screenpanel.9.png b/res/drawable-mdpi/screenpanel.9.png
index 4de3017f5..6f8b7e6a1 100644
--- a/res/drawable-mdpi/screenpanel.9.png
+++ b/res/drawable-mdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png
index 7dd885860..8a94984f5 100644
--- a/res/drawable-mdpi/screenpanel_hover.9.png
+++ b/res/drawable-mdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/drawable-mdpi/screenpanel_hover_l.9.png b/res/drawable-mdpi/screenpanel_hover_l.9.png
deleted file mode 100644
index 8a94984f5..000000000
--- a/res/drawable-mdpi/screenpanel_hover_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/screenpanel_l.9.png b/res/drawable-mdpi/screenpanel_l.9.png
deleted file mode 100644
index 6f8b7e6a1..000000000
--- a/res/drawable-mdpi/screenpanel_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps.png b/res/drawable-xhdpi/ic_allapps.png
index f71964c2d..eff3bea5d 100644
--- a/res/drawable-xhdpi/ic_allapps.png
+++ b/res/drawable-xhdpi/ic_allapps.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps_l.png b/res/drawable-xhdpi/ic_allapps_l.png
deleted file mode 100644
index eff3bea5d..000000000
--- a/res/drawable-xhdpi/ic_allapps_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png
index d678f027e..15a8aa964 100644
--- a/res/drawable-xhdpi/ic_allapps_pressed.png
+++ b/res/drawable-xhdpi/ic_allapps_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps_pressed_l.png b/res/drawable-xhdpi/ic_allapps_pressed_l.png
deleted file mode 100644
index 15a8aa964..000000000
--- a/res/drawable-xhdpi/ic_allapps_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_setting.png b/res/drawable-xhdpi/ic_setting.png
index 6f06bcfd9..3a7310b7c 100644
--- a/res/drawable-xhdpi/ic_setting.png
+++ b/res/drawable-xhdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_setting_l.png b/res/drawable-xhdpi/ic_setting_l.png
deleted file mode 100644
index 3a7310b7c..000000000
--- a/res/drawable-xhdpi/ic_setting_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_setting_pressed.png b/res/drawable-xhdpi/ic_setting_pressed.png
index bca8ccdd0..005d49c8c 100644
--- a/res/drawable-xhdpi/ic_setting_pressed.png
+++ b/res/drawable-xhdpi/ic_setting_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_setting_pressed_l.png b/res/drawable-xhdpi/ic_setting_pressed_l.png
deleted file mode 100644
index 005d49c8c..000000000
--- a/res/drawable-xhdpi/ic_setting_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wallpaper.png b/res/drawable-xhdpi/ic_wallpaper.png
index 41dc000fd..d2bf246ee 100644
--- a/res/drawable-xhdpi/ic_wallpaper.png
+++ b/res/drawable-xhdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wallpaper_l.png b/res/drawable-xhdpi/ic_wallpaper_l.png
deleted file mode 100644
index d2bf246ee..000000000
--- a/res/drawable-xhdpi/ic_wallpaper_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wallpaper_pressed.png b/res/drawable-xhdpi/ic_wallpaper_pressed.png
index ffff0531d..5a9b84d7d 100644
--- a/res/drawable-xhdpi/ic_wallpaper_pressed.png
+++ b/res/drawable-xhdpi/ic_wallpaper_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wallpaper_pressed_l.png b/res/drawable-xhdpi/ic_wallpaper_pressed_l.png
deleted file mode 100644
index 5a9b84d7d..000000000
--- a/res/drawable-xhdpi/ic_wallpaper_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_widget.png b/res/drawable-xhdpi/ic_widget.png
index 47dcdd14f..cf6be8173 100644
--- a/res/drawable-xhdpi/ic_widget.png
+++ b/res/drawable-xhdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_widget_l.png b/res/drawable-xhdpi/ic_widget_l.png
deleted file mode 100644
index cf6be8173..000000000
--- a/res/drawable-xhdpi/ic_widget_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_widget_pressed.png b/res/drawable-xhdpi/ic_widget_pressed.png
index 8bb387b88..633c9c648 100644
--- a/res/drawable-xhdpi/ic_widget_pressed.png
+++ b/res/drawable-xhdpi/ic_widget_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_widget_pressed_l.png b/res/drawable-xhdpi/ic_widget_pressed_l.png
deleted file mode 100644
index 633c9c648..000000000
--- a/res/drawable-xhdpi/ic_widget_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png
new file mode 100644
index 000000000..562d75802
--- /dev/null
+++ b/res/drawable-xhdpi/quantum_panel.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/screenpanel.9.png b/res/drawable-xhdpi/screenpanel.9.png
index b4b828d3e..2d70d7af5 100644
--- a/res/drawable-xhdpi/screenpanel.9.png
+++ b/res/drawable-xhdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/screenpanel_hover.9.png b/res/drawable-xhdpi/screenpanel_hover.9.png
index 251bf2085..0032fff4d 100644
--- a/res/drawable-xhdpi/screenpanel_hover.9.png
+++ b/res/drawable-xhdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/screenpanel_hover_l.9.png b/res/drawable-xhdpi/screenpanel_hover_l.9.png
deleted file mode 100644
index 0032fff4d..000000000
--- a/res/drawable-xhdpi/screenpanel_hover_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/screenpanel_l.9.png b/res/drawable-xhdpi/screenpanel_l.9.png
deleted file mode 100644
index 2d70d7af5..000000000
--- a/res/drawable-xhdpi/screenpanel_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_allapps.png b/res/drawable-xxhdpi/ic_allapps.png
index 624e0ef44..2461984ff 100644
--- a/res/drawable-xxhdpi/ic_allapps.png
+++ b/res/drawable-xxhdpi/ic_allapps.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_allapps_l.png b/res/drawable-xxhdpi/ic_allapps_l.png
deleted file mode 100644
index 2461984ff..000000000
--- a/res/drawable-xxhdpi/ic_allapps_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_allapps_pressed.png b/res/drawable-xxhdpi/ic_allapps_pressed.png
index 77b45aefb..929a0e6ab 100644
--- a/res/drawable-xxhdpi/ic_allapps_pressed.png
+++ b/res/drawable-xxhdpi/ic_allapps_pressed.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_allapps_pressed_l.png b/res/drawable-xxhdpi/ic_allapps_pressed_l.png
deleted file mode 100644
index 929a0e6ab..000000000
--- a/res/drawable-xxhdpi/ic_allapps_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png
index fd8a662e1..d78c95a74 100644
--- a/res/drawable-xxhdpi/ic_pageindicator_add.png
+++ b/res/drawable-xxhdpi/ic_pageindicator_add.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png
index 08615f371..2a5eff699 100644
--- a/res/drawable-xxhdpi/ic_pageindicator_current.png
+++ b/res/drawable-xxhdpi/ic_pageindicator_current.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_default.png b/res/drawable-xxhdpi/ic_pageindicator_default.png
index 9d4fbf820..969ae8c8e 100644
--- a/res/drawable-xxhdpi/ic_pageindicator_default.png
+++ b/res/drawable-xxhdpi/ic_pageindicator_default.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_setting.png b/res/drawable-xxhdpi/ic_setting.png
index b3729d315..01bdcd544 100644
--- a/res/drawable-xxhdpi/ic_setting.png
+++ b/res/drawable-xxhdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_setting_l.png b/res/drawable-xxhdpi/ic_setting_l.png
deleted file mode 100644
index 01bdcd544..000000000
--- a/res/drawable-xxhdpi/ic_setting_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_setting_pressed.png b/res/drawable-xxhdpi/ic_setting_pressed.png
index 5c9c1be44..d0cad5e0e 100644
--- a/res/drawable-xxhdpi/ic_setting_pressed.png
+++ b/res/drawable-xxhdpi/ic_setting_pressed.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_setting_pressed_l.png b/res/drawable-xxhdpi/ic_setting_pressed_l.png
deleted file mode 100644
index d0cad5e0e..000000000
--- a/res/drawable-xxhdpi/ic_setting_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wallpaper.png b/res/drawable-xxhdpi/ic_wallpaper.png
index c71844410..490c45a87 100644
--- a/res/drawable-xxhdpi/ic_wallpaper.png
+++ b/res/drawable-xxhdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wallpaper_l.png b/res/drawable-xxhdpi/ic_wallpaper_l.png
deleted file mode 100644
index 490c45a87..000000000
--- a/res/drawable-xxhdpi/ic_wallpaper_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wallpaper_pressed.png b/res/drawable-xxhdpi/ic_wallpaper_pressed.png
index 03324aa6c..e5d200be1 100644
--- a/res/drawable-xxhdpi/ic_wallpaper_pressed.png
+++ b/res/drawable-xxhdpi/ic_wallpaper_pressed.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png b/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png
deleted file mode 100644
index e5d200be1..000000000
--- a/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_widget.png b/res/drawable-xxhdpi/ic_widget.png
index fddfecaa3..d4b8324b1 100644
--- a/res/drawable-xxhdpi/ic_widget.png
+++ b/res/drawable-xxhdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_widget_l.png b/res/drawable-xxhdpi/ic_widget_l.png
deleted file mode 100644
index d4b8324b1..000000000
--- a/res/drawable-xxhdpi/ic_widget_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_widget_pressed.png b/res/drawable-xxhdpi/ic_widget_pressed.png
index 3d3670ed4..b8dd35dc6 100644
--- a/res/drawable-xxhdpi/ic_widget_pressed.png
+++ b/res/drawable-xxhdpi/ic_widget_pressed.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_widget_pressed_l.png b/res/drawable-xxhdpi/ic_widget_pressed_l.png
deleted file mode 100644
index b8dd35dc6..000000000
--- a/res/drawable-xxhdpi/ic_widget_pressed_l.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png
new file mode 100644
index 000000000..bc818b1c6
--- /dev/null
+++ b/res/drawable-xxhdpi/quantum_panel.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/screenpanel.9.png b/res/drawable-xxhdpi/screenpanel.9.png
index c44f3b898..7ed058efa 100644
--- a/res/drawable-xxhdpi/screenpanel.9.png
+++ b/res/drawable-xxhdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/screenpanel_hover.9.png b/res/drawable-xxhdpi/screenpanel_hover.9.png
index e8b36d8f1..24d2266a0 100644
--- a/res/drawable-xxhdpi/screenpanel_hover.9.png
+++ b/res/drawable-xxhdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/screenpanel_hover_l.9.png b/res/drawable-xxhdpi/screenpanel_hover_l.9.png
deleted file mode 100644
index 24d2266a0..000000000
--- a/res/drawable-xxhdpi/screenpanel_hover_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/screenpanel_l.9.png b/res/drawable-xxhdpi/screenpanel_l.9.png
deleted file mode 100644
index 7ed058efa..000000000
--- a/res/drawable-xxhdpi/screenpanel_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/quantum_panel.9.png b/res/drawable-xxxhdpi/quantum_panel.9.png
new file mode 100644
index 000000000..a15aab45d
--- /dev/null
+++ b/res/drawable-xxxhdpi/quantum_panel.9.png
Binary files differ
diff --git a/res/drawable/all_apps_button_icon_l.xml b/res/drawable/all_apps_button_icon_l.xml
deleted file mode 100644
index 91de1b5cd..000000000
--- a/res/drawable/all_apps_button_icon_l.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_allapps_pressed_l" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_allapps_pressed_l" />
- <item android:drawable="@drawable/ic_allapps_l" />
-</selector>
diff --git a/res/drawable/setting_button_l.xml b/res/drawable/setting_button_l.xml
deleted file mode 100644
index 01661db40..000000000
--- a/res/drawable/setting_button_l.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_setting_pressed_l" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_setting_pressed_l" />
- <item android:drawable="@drawable/ic_setting_l" />
-</selector>
diff --git a/res/drawable/wallpaper_button_l.xml b/res/drawable/wallpaper_button_l.xml
deleted file mode 100644
index c539b6124..000000000
--- a/res/drawable/wallpaper_button_l.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_wallpaper_pressed_l" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_wallpaper_pressed_l" />
- <item android:drawable="@drawable/ic_wallpaper_l" />
-</selector>
diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml
index 3b0fa6f4e..b48b9b7ac 100644
--- a/res/layout/apps_customize_application.xml
+++ b/res/layout/apps_customize_application.xml
@@ -19,10 +19,6 @@
xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
style="@style/WorkspaceIcon.AppsCustomize"
-
android:id="@+id/application_icon"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
android:focusable="true"
android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index eae216e93..19db373bc 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -52,28 +52,38 @@
android:id="@android:id/tabcontent"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <com.android.launcher3.AppsCustomizePagedView
- android:id="@+id/apps_customize_pane_content"
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x"
- launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y"
- launcher:clingFocusedX="@integer/apps_customize_cling_focused_x"
- launcher:clingFocusedY="@integer/apps_customize_cling_focused_y"
- launcher:maxGap="@dimen/workspace_max_gap"
- launcher:pageIndicator="@+id/apps_customize_page_indicator" />
+ android:orientation="vertical">
+
+ <com.android.launcher3.AppsCustomizePagedView
+ android:id="@+id/apps_customize_pane_content"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x"
+ launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y"
+ launcher:clingFocusedX="@integer/apps_customize_cling_focused_x"
+ launcher:clingFocusedY="@integer/apps_customize_cling_focused_y"
+ launcher:maxGap="@dimen/workspace_max_gap"
+ launcher:pageIndicator="@+id/apps_customize_page_indicator" />
+
+ <include
+ android:id="@+id/apps_customize_page_indicator"
+ layout="@layout/page_indicator"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center" />
+ </LinearLayout>
+
<FrameLayout
android:id="@+id/animation_buffer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FF000000"
android:visibility="gone" />
- <include
- android:id="@+id/apps_customize_page_indicator"
- layout="@layout/page_indicator"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|bottom" />
</FrameLayout>
</LinearLayout>
</com.android.launcher3.AppsCustomizeTabHost>
diff --git a/res/drawable/widget_button_l.xml b/res/layout/folder_application.xml
index 92521b9f2..37dd79d37 100644
--- a/res/drawable/widget_button_l.xml
+++ b/res/layout/folder_application.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_widget_pressed_l" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_widget_pressed_l" />
- <item android:drawable="@drawable/ic_widget_l" />
-</selector>
+<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/WorkspaceIcon.Folder"
+ android:focusable="true"
+ android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 5d5f33b1f..4e5303ac0 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@drawable/portal_container_holo">
+ android:background="@drawable/quantum_panel">
<ScrollView
android:id="@+id/scroll_view"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0006a7455..f3bfcec61 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -108,6 +108,12 @@
<attr name="pageIndicator" format="reference" />
</declare-styleable>
+ <declare-styleable name="BubbleTextView">
+ <!-- A spacing override for the icons within a page -->
+ <attr name="customShadows" format="boolean" />
+ <attr name="glowColor" format="color" />
+ </declare-styleable>
+
<!-- AppsCustomizePagedView specific attributes. These attributes are used to
customize an AppsCustomizePagedView in xml files. -->
<declare-styleable name="AppsCustomizePagedView">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ffee05f18..d1d33a0f6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -31,8 +31,8 @@
<color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color>
<color name="workspace_icon_text_color">#FFF</color>
- <color name="apps_customize_icon_text_color">#FFF</color>
- <color name="folder_items_text_color">#FF333333</color>
+ <color name="quantum_panel_text_color">#FF666666</color>
+ <color name="quantum_panel_text_shadow_color">#FFC4C4C4</color>
<color name="folder_items_glow_color">#FFCCCCCC</color>
<color name="outline_color">#FFFFFFFF</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d7404f9b9..8e561cfc0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -62,6 +62,7 @@
<dimen name="apps_customize_tab_bar_height">52dp</dimen>
<dimen name="apps_customize_tab_bar_margin_top">0dp</dimen>
<dimen name="app_icon_size">48dp</dimen>
+ <dimen name="apps_customize_horizontal_padding">4dp</dimen>
<!-- The AppsCustomize page indicator -->
<dimen name="apps_customize_page_indicator_height">12dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c18dccbab..462c29239 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -86,11 +86,26 @@
<style name="WorkspaceIcon.AppsCustomize">
<item name="android:background">@null</item>
- <item name="android:textColor">@color/apps_customize_icon_text_color</item>
+ <item name="android:textColor">@color/quantum_panel_text_color</item>
<item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item>
- <item name="android:shadowRadius">4.0</item>
- <item name="android:shadowColor">#FF000000</item>
+ <item name="android:shadowRadius">2.0</item>
+ <item name="android:shadowDx">0</item>
+ <item name="android:shadowDy">2</item>
+ <item name="android:shadowColor">#FFC4C4C4</item>
</style>
+
+ <style name="WorkspaceIcon.Folder">
+ <item name="android:background">@null</item>
+ <item name="android:textColor">@color/quantum_panel_text_color</item>
+ <item name="android:shadowColor">@color/quantum_panel_text_shadow_color</item>
+ <item name="android:shadowRadius">2.0</item>
+ <item name="android:shadowDx">0</item>
+ <item name="android:shadowDy">2</item>
+
+ <item name="customShadows">false</item>
+ <item name="glowColor">@color/folder_items_glow_color</item>
+ </style>
+
<style name="SearchDropTargetBar">
</style>
<style name="SearchButton">