diff options
108 files changed, 101 insertions, 182 deletions
diff --git a/res/drawable-hdpi/ic_allapps.png b/res/drawable-hdpi/ic_allapps.png Binary files differindex e7677d5d2..4fe3bf0e6 100644 --- a/res/drawable-hdpi/ic_allapps.png +++ b/res/drawable-hdpi/ic_allapps.png diff --git a/res/drawable-hdpi/ic_allapps_l.png b/res/drawable-hdpi/ic_allapps_l.png Binary files differdeleted file mode 100644 index 4fe3bf0e6..000000000 --- a/res/drawable-hdpi/ic_allapps_l.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_allapps_pressed.png b/res/drawable-hdpi/ic_allapps_pressed.png Binary files differindex 863eebaa5..af49dbb41 100644 --- a/res/drawable-hdpi/ic_allapps_pressed.png +++ b/res/drawable-hdpi/ic_allapps_pressed.png diff --git a/res/drawable-hdpi/ic_allapps_pressed_l.png b/res/drawable-hdpi/ic_allapps_pressed_l.png Binary files differdeleted file mode 100644 index af49dbb41..000000000 --- a/res/drawable-hdpi/ic_allapps_pressed_l.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_setting.png b/res/drawable-hdpi/ic_setting.png Binary files differindex 3f5bc43fd..1c12a5b80 100644 --- a/res/drawable-hdpi/ic_setting.png +++ b/res/drawable-hdpi/ic_setting.png diff --git a/res/drawable-hdpi/ic_setting_l.png b/res/drawable-hdpi/ic_setting_l.png Binary files differdeleted file mode 100644 index 1c12a5b80..000000000 --- a/res/drawable-hdpi/ic_setting_l.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_setting_pressed.png b/res/drawable-hdpi/ic_setting_pressed.png Binary files differindex 9201064cf..d5b5ca204 100644 --- a/res/drawable-hdpi/ic_setting_pressed.png +++ b/res/drawable-hdpi/ic_setting_pressed.png diff --git a/res/drawable-hdpi/ic_setting_pressed_l.png b/res/drawable-hdpi/ic_setting_pressed_l.png Binary files differdeleted file mode 100644 index d5b5ca204..000000000 --- a/res/drawable-hdpi/ic_setting_pressed_l.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wallpaper.png b/res/drawable-hdpi/ic_wallpaper.png Binary files differindex 5e5d1186b..34d594336 100644 --- a/res/drawable-hdpi/ic_wallpaper.png +++ b/res/drawable-hdpi/ic_wallpaper.png diff --git a/res/drawable-hdpi/ic_wallpaper_l.png b/res/drawable-hdpi/ic_wallpaper_l.png Binary files differdeleted file mode 100644 index 34d594336..000000000 --- a/res/drawable-hdpi/ic_wallpaper_l.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wallpaper_pressed.png b/res/drawable-hdpi/ic_wallpaper_pressed.png Binary files differindex d104e5770..1588ce717 100644 --- a/res/drawable-hdpi/ic_wallpaper_pressed.png +++ b/res/drawable-hdpi/ic_wallpaper_pressed.png diff --git a/res/drawable-hdpi/ic_wallpaper_pressed_l.png b/res/drawable-hdpi/ic_wallpaper_pressed_l.png Binary files differdeleted file mode 100644 index 1588ce717..000000000 --- a/res/drawable-hdpi/ic_wallpaper_pressed_l.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_widget.png b/res/drawable-hdpi/ic_widget.png Binary files differindex 8c57af0de..ed7e1ca0d 100644 --- a/res/drawable-hdpi/ic_widget.png +++ b/res/drawable-hdpi/ic_widget.png diff --git a/res/drawable-hdpi/ic_widget_l.png b/res/drawable-hdpi/ic_widget_l.png Binary files differdeleted file mode 100644 index ed7e1ca0d..000000000 --- a/res/drawable-hdpi/ic_widget_l.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_widget_pressed.png b/res/drawable-hdpi/ic_widget_pressed.png Binary files differindex 081f9f9ce..19d6feded 100644 --- a/res/drawable-hdpi/ic_widget_pressed.png +++ b/res/drawable-hdpi/ic_widget_pressed.png diff --git a/res/drawable-hdpi/ic_widget_pressed_l.png b/res/drawable-hdpi/ic_widget_pressed_l.png Binary files differdeleted file mode 100644 index 19d6feded..000000000 --- a/res/drawable-hdpi/ic_widget_pressed_l.png +++ /dev/null diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png Binary files differnew file mode 100644 index 000000000..ae625bead --- /dev/null +++ b/res/drawable-hdpi/quantum_panel.9.png diff --git a/res/drawable-hdpi/screenpanel.9.png b/res/drawable-hdpi/screenpanel.9.png Binary files differindex 36e7dfd9c..eed0f2cbb 100644 --- a/res/drawable-hdpi/screenpanel.9.png +++ b/res/drawable-hdpi/screenpanel.9.png diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png Binary files differindex 0fed7c9d8..2cea8a471 100644 --- a/res/drawable-hdpi/screenpanel_hover.9.png +++ b/res/drawable-hdpi/screenpanel_hover.9.png diff --git a/res/drawable-hdpi/screenpanel_hover_l.9.png b/res/drawable-hdpi/screenpanel_hover_l.9.png Binary files differdeleted file mode 100644 index 2cea8a471..000000000 --- a/res/drawable-hdpi/screenpanel_hover_l.9.png +++ /dev/null diff --git a/res/drawable-hdpi/screenpanel_l.9.png b/res/drawable-hdpi/screenpanel_l.9.png Binary files differdeleted file mode 100644 index eed0f2cbb..000000000 --- a/res/drawable-hdpi/screenpanel_l.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_allapps.png b/res/drawable-mdpi/ic_allapps.png Binary files differindex e0fd9c07a..09cd82af9 100644 --- a/res/drawable-mdpi/ic_allapps.png +++ b/res/drawable-mdpi/ic_allapps.png diff --git a/res/drawable-mdpi/ic_allapps_l.png b/res/drawable-mdpi/ic_allapps_l.png Binary files differdeleted file mode 100644 index 09cd82af9..000000000 --- a/res/drawable-mdpi/ic_allapps_l.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png Binary files differindex 3bd87b187..d7ea96f61 100644 --- a/res/drawable-mdpi/ic_allapps_pressed.png +++ b/res/drawable-mdpi/ic_allapps_pressed.png diff --git a/res/drawable-mdpi/ic_allapps_pressed_l.png b/res/drawable-mdpi/ic_allapps_pressed_l.png Binary files differdeleted file mode 100644 index d7ea96f61..000000000 --- a/res/drawable-mdpi/ic_allapps_pressed_l.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_setting.png b/res/drawable-mdpi/ic_setting.png Binary files differindex 1e7645953..c614e9183 100644 --- a/res/drawable-mdpi/ic_setting.png +++ b/res/drawable-mdpi/ic_setting.png diff --git a/res/drawable-mdpi/ic_setting_l.png b/res/drawable-mdpi/ic_setting_l.png Binary files differdeleted file mode 100644 index c614e9183..000000000 --- a/res/drawable-mdpi/ic_setting_l.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_setting_pressed.png b/res/drawable-mdpi/ic_setting_pressed.png Binary files differindex d7aca18e1..61e574ad1 100644 --- a/res/drawable-mdpi/ic_setting_pressed.png +++ b/res/drawable-mdpi/ic_setting_pressed.png diff --git a/res/drawable-mdpi/ic_setting_pressed_l.png b/res/drawable-mdpi/ic_setting_pressed_l.png Binary files differdeleted file mode 100644 index 61e574ad1..000000000 --- a/res/drawable-mdpi/ic_setting_pressed_l.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wallpaper.png b/res/drawable-mdpi/ic_wallpaper.png Binary files differindex 333a206e2..8f2a00a3f 100644 --- a/res/drawable-mdpi/ic_wallpaper.png +++ b/res/drawable-mdpi/ic_wallpaper.png diff --git a/res/drawable-mdpi/ic_wallpaper_l.png b/res/drawable-mdpi/ic_wallpaper_l.png Binary files differdeleted file mode 100644 index 8f2a00a3f..000000000 --- a/res/drawable-mdpi/ic_wallpaper_l.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wallpaper_pressed.png b/res/drawable-mdpi/ic_wallpaper_pressed.png Binary files differindex 273c48b3a..aa598c3e2 100644 --- a/res/drawable-mdpi/ic_wallpaper_pressed.png +++ b/res/drawable-mdpi/ic_wallpaper_pressed.png diff --git a/res/drawable-mdpi/ic_wallpaper_pressed_l.png b/res/drawable-mdpi/ic_wallpaper_pressed_l.png Binary files differdeleted file mode 100644 index aa598c3e2..000000000 --- a/res/drawable-mdpi/ic_wallpaper_pressed_l.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_widget.png b/res/drawable-mdpi/ic_widget.png Binary files differindex 5f974c28c..1bd393503 100644 --- a/res/drawable-mdpi/ic_widget.png +++ b/res/drawable-mdpi/ic_widget.png diff --git a/res/drawable-mdpi/ic_widget_l.png b/res/drawable-mdpi/ic_widget_l.png Binary files differdeleted file mode 100644 index 1bd393503..000000000 --- a/res/drawable-mdpi/ic_widget_l.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_widget_pressed.png b/res/drawable-mdpi/ic_widget_pressed.png Binary files differindex 0a3e8838f..9b690d99b 100644 --- a/res/drawable-mdpi/ic_widget_pressed.png +++ b/res/drawable-mdpi/ic_widget_pressed.png diff --git a/res/drawable-mdpi/ic_widget_pressed_l.png b/res/drawable-mdpi/ic_widget_pressed_l.png Binary files differdeleted file mode 100644 index 9b690d99b..000000000 --- a/res/drawable-mdpi/ic_widget_pressed_l.png +++ /dev/null diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png Binary files differnew file mode 100644 index 000000000..1f9cd1a18 --- /dev/null +++ b/res/drawable-mdpi/quantum_panel.9.png diff --git a/res/drawable-mdpi/screenpanel.9.png b/res/drawable-mdpi/screenpanel.9.png Binary files differindex 4de3017f5..6f8b7e6a1 100644 --- a/res/drawable-mdpi/screenpanel.9.png +++ b/res/drawable-mdpi/screenpanel.9.png diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png Binary files differindex 7dd885860..8a94984f5 100644 --- a/res/drawable-mdpi/screenpanel_hover.9.png +++ b/res/drawable-mdpi/screenpanel_hover.9.png diff --git a/res/drawable-mdpi/screenpanel_hover_l.9.png b/res/drawable-mdpi/screenpanel_hover_l.9.png Binary files differdeleted file mode 100644 index 8a94984f5..000000000 --- a/res/drawable-mdpi/screenpanel_hover_l.9.png +++ /dev/null diff --git a/res/drawable-mdpi/screenpanel_l.9.png b/res/drawable-mdpi/screenpanel_l.9.png Binary files differdeleted file mode 100644 index 6f8b7e6a1..000000000 --- a/res/drawable-mdpi/screenpanel_l.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_allapps.png b/res/drawable-xhdpi/ic_allapps.png Binary files differindex f71964c2d..eff3bea5d 100644 --- a/res/drawable-xhdpi/ic_allapps.png +++ b/res/drawable-xhdpi/ic_allapps.png diff --git a/res/drawable-xhdpi/ic_allapps_l.png b/res/drawable-xhdpi/ic_allapps_l.png Binary files differdeleted file mode 100644 index eff3bea5d..000000000 --- a/res/drawable-xhdpi/ic_allapps_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png Binary files differindex d678f027e..15a8aa964 100644 --- a/res/drawable-xhdpi/ic_allapps_pressed.png +++ b/res/drawable-xhdpi/ic_allapps_pressed.png diff --git a/res/drawable-xhdpi/ic_allapps_pressed_l.png b/res/drawable-xhdpi/ic_allapps_pressed_l.png Binary files differdeleted file mode 100644 index 15a8aa964..000000000 --- a/res/drawable-xhdpi/ic_allapps_pressed_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_setting.png b/res/drawable-xhdpi/ic_setting.png Binary files differindex 6f06bcfd9..3a7310b7c 100644 --- a/res/drawable-xhdpi/ic_setting.png +++ b/res/drawable-xhdpi/ic_setting.png diff --git a/res/drawable-xhdpi/ic_setting_l.png b/res/drawable-xhdpi/ic_setting_l.png Binary files differdeleted file mode 100644 index 3a7310b7c..000000000 --- a/res/drawable-xhdpi/ic_setting_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_setting_pressed.png b/res/drawable-xhdpi/ic_setting_pressed.png Binary files differindex bca8ccdd0..005d49c8c 100644 --- a/res/drawable-xhdpi/ic_setting_pressed.png +++ b/res/drawable-xhdpi/ic_setting_pressed.png diff --git a/res/drawable-xhdpi/ic_setting_pressed_l.png b/res/drawable-xhdpi/ic_setting_pressed_l.png Binary files differdeleted file mode 100644 index 005d49c8c..000000000 --- a/res/drawable-xhdpi/ic_setting_pressed_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wallpaper.png b/res/drawable-xhdpi/ic_wallpaper.png Binary files differindex 41dc000fd..d2bf246ee 100644 --- a/res/drawable-xhdpi/ic_wallpaper.png +++ b/res/drawable-xhdpi/ic_wallpaper.png diff --git a/res/drawable-xhdpi/ic_wallpaper_l.png b/res/drawable-xhdpi/ic_wallpaper_l.png Binary files differdeleted file mode 100644 index d2bf246ee..000000000 --- a/res/drawable-xhdpi/ic_wallpaper_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wallpaper_pressed.png b/res/drawable-xhdpi/ic_wallpaper_pressed.png Binary files differindex ffff0531d..5a9b84d7d 100644 --- a/res/drawable-xhdpi/ic_wallpaper_pressed.png +++ b/res/drawable-xhdpi/ic_wallpaper_pressed.png diff --git a/res/drawable-xhdpi/ic_wallpaper_pressed_l.png b/res/drawable-xhdpi/ic_wallpaper_pressed_l.png Binary files differdeleted file mode 100644 index 5a9b84d7d..000000000 --- a/res/drawable-xhdpi/ic_wallpaper_pressed_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_widget.png b/res/drawable-xhdpi/ic_widget.png Binary files differindex 47dcdd14f..cf6be8173 100644 --- a/res/drawable-xhdpi/ic_widget.png +++ b/res/drawable-xhdpi/ic_widget.png diff --git a/res/drawable-xhdpi/ic_widget_l.png b/res/drawable-xhdpi/ic_widget_l.png Binary files differdeleted file mode 100644 index cf6be8173..000000000 --- a/res/drawable-xhdpi/ic_widget_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_widget_pressed.png b/res/drawable-xhdpi/ic_widget_pressed.png Binary files differindex 8bb387b88..633c9c648 100644 --- a/res/drawable-xhdpi/ic_widget_pressed.png +++ b/res/drawable-xhdpi/ic_widget_pressed.png diff --git a/res/drawable-xhdpi/ic_widget_pressed_l.png b/res/drawable-xhdpi/ic_widget_pressed_l.png Binary files differdeleted file mode 100644 index 633c9c648..000000000 --- a/res/drawable-xhdpi/ic_widget_pressed_l.png +++ /dev/null diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png Binary files differnew file mode 100644 index 000000000..562d75802 --- /dev/null +++ b/res/drawable-xhdpi/quantum_panel.9.png diff --git a/res/drawable-xhdpi/screenpanel.9.png b/res/drawable-xhdpi/screenpanel.9.png Binary files differindex b4b828d3e..2d70d7af5 100644 --- a/res/drawable-xhdpi/screenpanel.9.png +++ b/res/drawable-xhdpi/screenpanel.9.png diff --git a/res/drawable-xhdpi/screenpanel_hover.9.png b/res/drawable-xhdpi/screenpanel_hover.9.png Binary files differindex 251bf2085..0032fff4d 100644 --- a/res/drawable-xhdpi/screenpanel_hover.9.png +++ b/res/drawable-xhdpi/screenpanel_hover.9.png diff --git a/res/drawable-xhdpi/screenpanel_hover_l.9.png b/res/drawable-xhdpi/screenpanel_hover_l.9.png Binary files differdeleted file mode 100644 index 0032fff4d..000000000 --- a/res/drawable-xhdpi/screenpanel_hover_l.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/screenpanel_l.9.png b/res/drawable-xhdpi/screenpanel_l.9.png Binary files differdeleted file mode 100644 index 2d70d7af5..000000000 --- a/res/drawable-xhdpi/screenpanel_l.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_allapps.png b/res/drawable-xxhdpi/ic_allapps.png Binary files differindex 624e0ef44..2461984ff 100644 --- a/res/drawable-xxhdpi/ic_allapps.png +++ b/res/drawable-xxhdpi/ic_allapps.png diff --git a/res/drawable-xxhdpi/ic_allapps_l.png b/res/drawable-xxhdpi/ic_allapps_l.png Binary files differdeleted file mode 100644 index 2461984ff..000000000 --- a/res/drawable-xxhdpi/ic_allapps_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_allapps_pressed.png b/res/drawable-xxhdpi/ic_allapps_pressed.png Binary files differindex 77b45aefb..929a0e6ab 100644 --- a/res/drawable-xxhdpi/ic_allapps_pressed.png +++ b/res/drawable-xxhdpi/ic_allapps_pressed.png diff --git a/res/drawable-xxhdpi/ic_allapps_pressed_l.png b/res/drawable-xxhdpi/ic_allapps_pressed_l.png Binary files differdeleted file mode 100644 index 929a0e6ab..000000000 --- a/res/drawable-xxhdpi/ic_allapps_pressed_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png Binary files differindex fd8a662e1..d78c95a74 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_add.png +++ b/res/drawable-xxhdpi/ic_pageindicator_add.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png Binary files differindex 08615f371..2a5eff699 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_current.png +++ b/res/drawable-xxhdpi/ic_pageindicator_current.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_default.png b/res/drawable-xxhdpi/ic_pageindicator_default.png Binary files differindex 9d4fbf820..969ae8c8e 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_default.png +++ b/res/drawable-xxhdpi/ic_pageindicator_default.png diff --git a/res/drawable-xxhdpi/ic_setting.png b/res/drawable-xxhdpi/ic_setting.png Binary files differindex b3729d315..01bdcd544 100644 --- a/res/drawable-xxhdpi/ic_setting.png +++ b/res/drawable-xxhdpi/ic_setting.png diff --git a/res/drawable-xxhdpi/ic_setting_l.png b/res/drawable-xxhdpi/ic_setting_l.png Binary files differdeleted file mode 100644 index 01bdcd544..000000000 --- a/res/drawable-xxhdpi/ic_setting_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_setting_pressed.png b/res/drawable-xxhdpi/ic_setting_pressed.png Binary files differindex 5c9c1be44..d0cad5e0e 100644 --- a/res/drawable-xxhdpi/ic_setting_pressed.png +++ b/res/drawable-xxhdpi/ic_setting_pressed.png diff --git a/res/drawable-xxhdpi/ic_setting_pressed_l.png b/res/drawable-xxhdpi/ic_setting_pressed_l.png Binary files differdeleted file mode 100644 index d0cad5e0e..000000000 --- a/res/drawable-xxhdpi/ic_setting_pressed_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_wallpaper.png b/res/drawable-xxhdpi/ic_wallpaper.png Binary files differindex c71844410..490c45a87 100644 --- a/res/drawable-xxhdpi/ic_wallpaper.png +++ b/res/drawable-xxhdpi/ic_wallpaper.png diff --git a/res/drawable-xxhdpi/ic_wallpaper_l.png b/res/drawable-xxhdpi/ic_wallpaper_l.png Binary files differdeleted file mode 100644 index 490c45a87..000000000 --- a/res/drawable-xxhdpi/ic_wallpaper_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_wallpaper_pressed.png b/res/drawable-xxhdpi/ic_wallpaper_pressed.png Binary files differindex 03324aa6c..e5d200be1 100644 --- a/res/drawable-xxhdpi/ic_wallpaper_pressed.png +++ b/res/drawable-xxhdpi/ic_wallpaper_pressed.png diff --git a/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png b/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png Binary files differdeleted file mode 100644 index e5d200be1..000000000 --- a/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_widget.png b/res/drawable-xxhdpi/ic_widget.png Binary files differindex fddfecaa3..d4b8324b1 100644 --- a/res/drawable-xxhdpi/ic_widget.png +++ b/res/drawable-xxhdpi/ic_widget.png diff --git a/res/drawable-xxhdpi/ic_widget_l.png b/res/drawable-xxhdpi/ic_widget_l.png Binary files differdeleted file mode 100644 index d4b8324b1..000000000 --- a/res/drawable-xxhdpi/ic_widget_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_widget_pressed.png b/res/drawable-xxhdpi/ic_widget_pressed.png Binary files differindex 3d3670ed4..b8dd35dc6 100644 --- a/res/drawable-xxhdpi/ic_widget_pressed.png +++ b/res/drawable-xxhdpi/ic_widget_pressed.png diff --git a/res/drawable-xxhdpi/ic_widget_pressed_l.png b/res/drawable-xxhdpi/ic_widget_pressed_l.png Binary files differdeleted file mode 100644 index b8dd35dc6..000000000 --- a/res/drawable-xxhdpi/ic_widget_pressed_l.png +++ /dev/null diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png Binary files differnew file mode 100644 index 000000000..bc818b1c6 --- /dev/null +++ b/res/drawable-xxhdpi/quantum_panel.9.png diff --git a/res/drawable-xxhdpi/screenpanel.9.png b/res/drawable-xxhdpi/screenpanel.9.png Binary files differindex c44f3b898..7ed058efa 100644 --- a/res/drawable-xxhdpi/screenpanel.9.png +++ b/res/drawable-xxhdpi/screenpanel.9.png diff --git a/res/drawable-xxhdpi/screenpanel_hover.9.png b/res/drawable-xxhdpi/screenpanel_hover.9.png Binary files differindex e8b36d8f1..24d2266a0 100644 --- a/res/drawable-xxhdpi/screenpanel_hover.9.png +++ b/res/drawable-xxhdpi/screenpanel_hover.9.png diff --git a/res/drawable-xxhdpi/screenpanel_hover_l.9.png b/res/drawable-xxhdpi/screenpanel_hover_l.9.png Binary files differdeleted file mode 100644 index 24d2266a0..000000000 --- a/res/drawable-xxhdpi/screenpanel_hover_l.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/screenpanel_l.9.png b/res/drawable-xxhdpi/screenpanel_l.9.png Binary files differdeleted file mode 100644 index 7ed058efa..000000000 --- a/res/drawable-xxhdpi/screenpanel_l.9.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/quantum_panel.9.png b/res/drawable-xxxhdpi/quantum_panel.9.png Binary files differnew file mode 100644 index 000000000..a15aab45d --- /dev/null +++ b/res/drawable-xxxhdpi/quantum_panel.9.png 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"> diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 04426a8f1..2520b8a12 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -1007,6 +1007,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen layout.setPadding(mAllAppsPadding.left, mAllAppsPadding.top, mAllAppsPadding.right, mAllAppsPadding.bottom); setVisibilityOnChildren(layout, View.VISIBLE); + + Resources res = getContext().getResources(); + layout.setBackground(res.getDrawable(R.drawable.quantum_panel)); } public void syncAppsPageItems(int page, boolean immediate) { @@ -1437,6 +1440,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } } + // TODO: clean this up + alpha = 1; + translationX = 0; + scale = 1; + v.setTranslationX(translationX); v.setScaleX(scale); v.setScaleY(scale); diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 160a5ebcc..54d7e506e 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -17,7 +17,9 @@ package com.android.launcher3; import android.content.Context; +import android.content.res.ColorStateList; import android.content.res.Resources; +import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Rect; @@ -64,7 +66,7 @@ public class BubbleTextView extends TextView { private float mSlop; private int mTextColor; - private boolean mShadowsEnabled = true; + private boolean mCustomShadowsEnabled = true; private boolean mIsTextVisible; private boolean mBackgroundSizeChanged; @@ -72,22 +74,28 @@ public class BubbleTextView extends TextView { private boolean mStayPressed; private CheckLongPressHelper mLongPressHelper; - private int mInstallState; private CharSequence mDefaultText = ""; public BubbleTextView(Context context) { - super(context); - init(); + this(context, null, 0); } public BubbleTextView(Context context, AttributeSet attrs) { - super(context, attrs); - init(); + this(context, attrs, 0); } public BubbleTextView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + + Resources res = context.getResources(); + TypedArray a = context.obtainStyledAttributes(attrs, + R.styleable.BubbleTextView, defStyle, 0); + setGlowColor(a.getColor(R.styleable.BubbleTextView_glowColor, + res.getColor(R.color.outline_color))); + mCustomShadowsEnabled = a.getBoolean(R.styleable.BubbleTextView_customShadows, true); + a.recycle(); + init(); } @@ -98,7 +106,6 @@ public class BubbleTextView extends TextView { LauncherAppState app = LauncherAppState.getInstance(); DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx); - setTextColor(getResources().getColor(R.color.workspace_icon_text_color)); } private void init() { @@ -106,12 +113,9 @@ public class BubbleTextView extends TextView { mBackground = getBackground(); mOutlineHelper = HolographicOutlineHelper.obtain(getContext()); - - final Resources res = getContext().getResources(); - mFocusedOutlineColor = mFocusedGlowColor = mPressedOutlineColor = mPressedGlowColor = - res.getColor(R.color.outline_color); - - setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR); + if (mCustomShadowsEnabled) { + setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR); + } } public void applyFromShortcutInfo(ShortcutInfo info, IconCache iconCache) { @@ -322,7 +326,7 @@ public class BubbleTextView extends TextView { @Override public void draw(Canvas canvas) { - if (!mShadowsEnabled) { + if (!mCustomShadowsEnabled) { super.draw(canvas); return; } @@ -384,10 +388,10 @@ public class BubbleTextView extends TextView { super.setTextColor(color); } - public void setShadowsEnabled(boolean enabled) { - mShadowsEnabled = enabled; - getPaint().clearShadowLayer(); - invalidate(); + @Override + public void setTextColor(ColorStateList colors) { + mTextColor = colors.getDefaultColor(); + super.setTextColor(colors); } public void setTextVisibility(boolean visible) { diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index a0c9c2ed9..8ca8d9105 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -217,11 +217,6 @@ public class CellLayout extends ViewGroup { mNormalBackground = res.getDrawable(R.drawable.screenpanel); mActiveGlowBackground = res.getDrawable(R.drawable.screenpanel_hover); - if (Utilities.isLmp()) { - mNormalBackground = res.getDrawable(R.drawable.screenpanel_l); - mActiveGlowBackground = res.getDrawable(R.drawable.screenpanel_hover_l); - } - mOverScrollLeft = res.getDrawable(R.drawable.overscroll_glow_left); mOverScrollRight = res.getDrawable(R.drawable.overscroll_glow_right); mForegroundPadding = diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 8470b39a3..c0f505481 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -767,11 +767,10 @@ public class DeviceProfile { (allAppsIconSizePx / DynamicGrid.DEFAULT_ICON_SIZE_PX))); pageIndicator = host.findViewById(R.id.apps_customize_page_indicator); if (pageIndicator != null) { - lp = (FrameLayout.LayoutParams) pageIndicator.getLayoutParams(); - lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; - lp.width = LayoutParams.WRAP_CONTENT; - lp.height = pageIndicatorHeight; - pageIndicator.setLayoutParams(lp); + LinearLayout.LayoutParams lllp = (LinearLayout.LayoutParams) pageIndicator.getLayoutParams(); + lllp.width = LayoutParams.WRAP_CONTENT; + lllp.height = pageIndicatorHeight; + pageIndicator.setLayoutParams(lllp); } AppsCustomizePagedView pagedView = (AppsCustomizePagedView) @@ -796,6 +795,11 @@ public class DeviceProfile { padding.bottom = Math.max(0, pageIndicatorHeight - paddingTB); pagedView.setAllAppsPadding(padding); pagedView.setWidgetsPageIndicatorPadding(pageIndicatorHeight); + + // Horizontal padding for the whole paged view + int pagedViewPadding = + res.getDimensionPixelSize(R.dimen.apps_customize_horizontal_padding); + pagedView.setPadding(pagedViewPadding, 0, pagedViewPadding, 0); } } diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 2216b9eca..47c8a4a0f 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -566,8 +566,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } protected View createAndAddShortcut(ShortcutInfo item) { - final BubbleTextView textView = - (BubbleTextView) mInflater.inflate(R.layout.application, this, false); + final TextView textView = + (TextView) mInflater.inflate(R.layout.folder_application, this, false); textView.setCompoundDrawables(null, Utilities.createIconDrawable(item.getIcon(mIconCache)), null, null); textView.setText(item.title); @@ -575,11 +575,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList textView.setContentDescription(item.contentDescription); } textView.setTag(item); - textView.setTextColor(getResources().getColor(R.color.folder_items_text_color)); - textView.setShadowsEnabled(false); - textView.setGlowColor(getResources().getColor(R.color.folder_items_glow_color)); - textView.applyState(); - textView.setOnClickListener(this); textView.setOnLongClickListener(this); diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index be6cf4857..ab8976a59 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -71,9 +71,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { private static final float OUTER_RING_GROWTH_FACTOR = 0.3f; // The amount of vertical spread between items in the stack [0...1] - private static final float PERSPECTIVE_SHIFT_FACTOR = 0.24f; - - private static final float PERSPECTIVE_SHIFT_FACTOR_L = 0.18f; + private static final float PERSPECTIVE_SHIFT_FACTOR = 0.18f; // Flag as to whether or not to draw an outer ring. Currently none is designed. public static final boolean HAS_OUTER_RING = true; @@ -503,16 +501,11 @@ public class FolderIcon extends FrameLayout implements FolderListener { int adjustedAvailableSpace = (int) ((mAvailableSpaceInPreview / 2) * (1 + 0.8f)); int unscaledHeight = (int) (mIntrinsicIconSize * (1 + PERSPECTIVE_SHIFT_FACTOR)); - if (Utilities.isLmp()) { - unscaledHeight = (int) (mIntrinsicIconSize * (1 + PERSPECTIVE_SHIFT_FACTOR_L)); - } + mBaselineIconScale = (1.0f * adjustedAvailableSpace / unscaledHeight); mBaselineIconSize = (int) (mIntrinsicIconSize * mBaselineIconScale); mMaxPerspectiveShift = mBaselineIconSize * PERSPECTIVE_SHIFT_FACTOR; - if (Utilities.isLmp()) { - mMaxPerspectiveShift = mBaselineIconSize * PERSPECTIVE_SHIFT_FACTOR_L; - } mPreviewOffsetX = (mTotalWidth - mAvailableSpaceInPreview) / 2; mPreviewOffsetY = previewPadding + grid.folderBackgroundOffset; @@ -563,14 +556,10 @@ public class FolderIcon extends FrameLayout implements FolderListener { // We want to imagine our coordinates from the bottom left, growing up and to the // right. This is natural for the x-axis, but for the y-axis, we have to invert things. float transY = mAvailableSpaceInPreview - (offset + scaledSize + scaleOffsetCorrection) + getPaddingTop(); - float transX = offset + scaleOffsetCorrection; + float transX = (mAvailableSpaceInPreview - scaledSize) / 2; float totalScale = mBaselineIconScale * scale; final int overlayAlpha = (int) (80 * (1 - r)); - if (Utilities.isLmp()) { - transX = (mAvailableSpaceInPreview - scaledSize) / 2; - } - if (params == null) { params = new PreviewItemDrawingParams(transX, transY, totalScale, overlayAlpha); } else { diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 4b2543328..2d171238f 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -151,10 +151,6 @@ public class Hotseat extends FrameLayout { inflater.inflate(R.layout.all_apps_button, mContent, false); Drawable d = context.getResources().getDrawable(R.drawable.all_apps_button_icon); - if (Utilities.isLmp()) { - d = context.getResources().getDrawable(R.drawable.all_apps_button_icon_l); - } - Utilities.resizeIconDrawable(d); allAppsButton.setCompoundDrawables(null, d, null, null); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 93a780789..a85b5b18d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1285,10 +1285,6 @@ public class Launcher extends Activity } }); widgetButton.setOnTouchListener(getHapticFeedbackTouchListener()); - if (Utilities.isLmp()) { - ((TextView) widgetButton).setCompoundDrawablesWithIntrinsicBounds(0, - R.drawable.widget_button_l, 0, 0); - } View wallpaperButton = findViewById(R.id.wallpaper_button); wallpaperButton.setOnClickListener(new OnClickListener() { @@ -1301,11 +1297,6 @@ public class Launcher extends Activity }); wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener()); - if (Utilities.isLmp()) { - ((TextView) wallpaperButton).setCompoundDrawablesWithIntrinsicBounds(0, - R.drawable.wallpaper_button_l, 0, 0); - } - View settingsButton = findViewById(R.id.settings_button); if (hasSettings()) { settingsButton.setOnClickListener(new OnClickListener() { @@ -1317,10 +1308,6 @@ public class Launcher extends Activity } }); settingsButton.setOnTouchListener(getHapticFeedbackTouchListener()); - if (Utilities.isLmp()) { - ((TextView) settingsButton).setCompoundDrawablesWithIntrinsicBounds(0, - R.drawable.setting_button_l, 0, 0); - } } else { settingsButton.setVisibility(View.GONE); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) widgetButton.getLayoutParams(); diff --git a/src/com/android/launcher3/PagedViewIcon.java b/src/com/android/launcher3/PagedViewIcon.java index 713d3a42f..e819d5edf 100644 --- a/src/com/android/launcher3/PagedViewIcon.java +++ b/src/com/android/launcher3/PagedViewIcon.java @@ -111,27 +111,4 @@ public class PagedViewIcon extends TextView { setAlpha(1f); } } - - @Override - public void draw(Canvas canvas) { - // If text is transparent, don't draw any shadow - if (getCurrentTextColor() == getResources().getColor(android.R.color.transparent)) { - getPaint().clearShadowLayer(); - super.draw(canvas); - return; - } - - // We enhance the shadow by drawing the shadow twice - getPaint().setShadowLayer(BubbleTextView.SHADOW_LARGE_RADIUS, 0.0f, - BubbleTextView.SHADOW_Y_OFFSET, BubbleTextView.SHADOW_LARGE_COLOUR); - super.draw(canvas); - canvas.save(Canvas.CLIP_SAVE_FLAG); - canvas.clipRect(getScrollX(), getScrollY() + getExtendedPaddingTop(), - getScrollX() + getWidth(), - getScrollY() + getHeight(), Region.Op.INTERSECT); - getPaint().setShadowLayer(BubbleTextView.SHADOW_SMALL_RADIUS, 0.0f, 0.0f, - BubbleTextView.SHADOW_SMALL_COLOUR); - super.draw(canvas); - canvas.restore(); - } } |