diff options
112 files changed, 121 insertions, 13 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index f78a1b2a4..c1323951b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -47,6 +47,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/res/drawable-mdpi/bg_cling5.png b/res/drawable-mdpi/bg_cling5.png Binary files differnew file mode 100644 index 000000000..e094809b4 --- /dev/null +++ b/res/drawable-mdpi/bg_cling5.png diff --git a/res/drawable-nodpi/wallpaper_01.jpg b/res/drawable-nodpi/wallpaper_01.jpg Binary files differnew file mode 100644 index 000000000..d7475b4c6 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_01.jpg diff --git a/res/drawable-nodpi/wallpaper_01_small.jpg b/res/drawable-nodpi/wallpaper_01_small.jpg Binary files differnew file mode 100644 index 000000000..5cfe680c8 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_01_small.jpg diff --git a/res/drawable-nodpi/wallpaper_02.jpg b/res/drawable-nodpi/wallpaper_02.jpg Binary files differnew file mode 100644 index 000000000..d9cb2178f --- /dev/null +++ b/res/drawable-nodpi/wallpaper_02.jpg diff --git a/res/drawable-nodpi/wallpaper_02_small.jpg b/res/drawable-nodpi/wallpaper_02_small.jpg Binary files differnew file mode 100644 index 000000000..c33eafaec --- /dev/null +++ b/res/drawable-nodpi/wallpaper_02_small.jpg diff --git a/res/drawable-nodpi/wallpaper_03.jpg b/res/drawable-nodpi/wallpaper_03.jpg Binary files differnew file mode 100644 index 000000000..136b3faff --- /dev/null +++ b/res/drawable-nodpi/wallpaper_03.jpg diff --git a/res/drawable-nodpi/wallpaper_03_small.jpg b/res/drawable-nodpi/wallpaper_03_small.jpg Binary files differnew file mode 100644 index 000000000..6ff225470 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_03_small.jpg diff --git a/res/drawable-nodpi/wallpaper_04.jpg b/res/drawable-nodpi/wallpaper_04.jpg Binary files differnew file mode 100644 index 000000000..2ca3d05ed --- /dev/null +++ b/res/drawable-nodpi/wallpaper_04.jpg diff --git a/res/drawable-nodpi/wallpaper_04_small.jpg b/res/drawable-nodpi/wallpaper_04_small.jpg Binary files differnew file mode 100644 index 000000000..9a327526c --- /dev/null +++ b/res/drawable-nodpi/wallpaper_04_small.jpg diff --git a/res/drawable-nodpi/wallpaper_05.jpg b/res/drawable-nodpi/wallpaper_05.jpg Binary files differnew file mode 100644 index 000000000..d64d10a72 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_05.jpg diff --git a/res/drawable-nodpi/wallpaper_05_small.jpg b/res/drawable-nodpi/wallpaper_05_small.jpg Binary files differnew file mode 100644 index 000000000..cd71bd3ad --- /dev/null +++ b/res/drawable-nodpi/wallpaper_05_small.jpg diff --git a/res/drawable-nodpi/wallpaper_08.jpg b/res/drawable-nodpi/wallpaper_08.jpg Binary files differnew file mode 100644 index 000000000..0ae0eb2b7 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_08.jpg diff --git a/res/drawable-nodpi/wallpaper_08_small.jpg b/res/drawable-nodpi/wallpaper_08_small.jpg Binary files differnew file mode 100644 index 000000000..1ca48ad49 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_08_small.jpg diff --git a/res/drawable-nodpi/wallpaper_09.jpg b/res/drawable-nodpi/wallpaper_09.jpg Binary files differnew file mode 100644 index 000000000..c2f58459d --- /dev/null +++ b/res/drawable-nodpi/wallpaper_09.jpg diff --git a/res/drawable-nodpi/wallpaper_09_small.jpg b/res/drawable-nodpi/wallpaper_09_small.jpg Binary files differnew file mode 100644 index 000000000..0ac47252e --- /dev/null +++ b/res/drawable-nodpi/wallpaper_09_small.jpg diff --git a/res/drawable-nodpi/wallpaper_10.jpg b/res/drawable-nodpi/wallpaper_10.jpg Binary files differnew file mode 100644 index 000000000..7dfb66501 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_10.jpg diff --git a/res/drawable-nodpi/wallpaper_10_small.jpg b/res/drawable-nodpi/wallpaper_10_small.jpg Binary files differnew file mode 100644 index 000000000..fedae8a3d --- /dev/null +++ b/res/drawable-nodpi/wallpaper_10_small.jpg diff --git a/res/drawable-nodpi/wallpaper_11.jpg b/res/drawable-nodpi/wallpaper_11.jpg Binary files differnew file mode 100644 index 000000000..bedf16722 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_11.jpg diff --git a/res/drawable-nodpi/wallpaper_11_small.jpg b/res/drawable-nodpi/wallpaper_11_small.jpg Binary files differnew file mode 100644 index 000000000..76c3f7f95 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_11_small.jpg diff --git a/res/drawable-nodpi/wallpaper_12.jpg b/res/drawable-nodpi/wallpaper_12.jpg Binary files differnew file mode 100644 index 000000000..ab987f88e --- /dev/null +++ b/res/drawable-nodpi/wallpaper_12.jpg diff --git a/res/drawable-nodpi/wallpaper_12_small.jpg b/res/drawable-nodpi/wallpaper_12_small.jpg Binary files differnew file mode 100644 index 000000000..da3fbf7da --- /dev/null +++ b/res/drawable-nodpi/wallpaper_12_small.jpg diff --git a/res/drawable-nodpi/wallpaper_architecture.jpg b/res/drawable-nodpi/wallpaper_architecture.jpg Binary files differdeleted file mode 100644 index 82aafb748..000000000 --- a/res/drawable-nodpi/wallpaper_architecture.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_bubblegum.jpg b/res/drawable-nodpi/wallpaper_bubblegum.jpg Binary files differdeleted file mode 100644 index e8a717d84..000000000 --- a/res/drawable-nodpi/wallpaper_bubblegum.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_canyon.jpg b/res/drawable-nodpi/wallpaper_canyon.jpg Binary files differdeleted file mode 100644 index 85aaba46b..000000000 --- a/res/drawable-nodpi/wallpaper_canyon.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_chroma.jpg b/res/drawable-nodpi/wallpaper_chroma.jpg Binary files differdeleted file mode 100644 index 7e9224380..000000000 --- a/res/drawable-nodpi/wallpaper_chroma.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_escape.jpg b/res/drawable-nodpi/wallpaper_escape.jpg Binary files differdeleted file mode 100644 index ced555b50..000000000 --- a/res/drawable-nodpi/wallpaper_escape.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_fidelity.jpg b/res/drawable-nodpi/wallpaper_fidelity.jpg Binary files differdeleted file mode 100644 index 1f1eb31ec..000000000 --- a/res/drawable-nodpi/wallpaper_fidelity.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_flora.jpg b/res/drawable-nodpi/wallpaper_flora.jpg Binary files differdeleted file mode 100644 index 964e37c35..000000000 --- a/res/drawable-nodpi/wallpaper_flora.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_kepler.jpg b/res/drawable-nodpi/wallpaper_kepler.jpg Binary files differdeleted file mode 100644 index 4afee4045..000000000 --- a/res/drawable-nodpi/wallpaper_kepler.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_leaf.jpg b/res/drawable-nodpi/wallpaper_leaf.jpg Binary files differdeleted file mode 100644 index 7157ddd22..000000000 --- a/res/drawable-nodpi/wallpaper_leaf.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_noir.jpg b/res/drawable-nodpi/wallpaper_noir.jpg Binary files differdeleted file mode 100644 index 196249508..000000000 --- a/res/drawable-nodpi/wallpaper_noir.jpg +++ /dev/null diff --git a/res/drawable-nodpi/wallpaper_outofthebox.jpg b/res/drawable-nodpi/wallpaper_outofthebox.jpg Binary files differdeleted file mode 100644 index 6049dccc4..000000000 --- a/res/drawable-nodpi/wallpaper_outofthebox.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_01.jpg b/res/drawable-sw600dp-nodpi/wallpaper_01.jpg Binary files differnew file mode 100644 index 000000000..03a14c09c --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_01.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_02.jpg b/res/drawable-sw600dp-nodpi/wallpaper_02.jpg Binary files differnew file mode 100644 index 000000000..adab026ff --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_02.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_03.jpg b/res/drawable-sw600dp-nodpi/wallpaper_03.jpg Binary files differnew file mode 100644 index 000000000..f21de3747 --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_03.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_04.jpg b/res/drawable-sw600dp-nodpi/wallpaper_04.jpg Binary files differnew file mode 100644 index 000000000..1c366e77e --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_04.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_05.jpg b/res/drawable-sw600dp-nodpi/wallpaper_05.jpg Binary files differnew file mode 100644 index 000000000..2c1284d62 --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_05.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_08.jpg b/res/drawable-sw600dp-nodpi/wallpaper_08.jpg Binary files differnew file mode 100644 index 000000000..2558382f1 --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_08.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_09.jpg b/res/drawable-sw600dp-nodpi/wallpaper_09.jpg Binary files differnew file mode 100644 index 000000000..e8d47abdc --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_09.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_10.jpg b/res/drawable-sw600dp-nodpi/wallpaper_10.jpg Binary files differnew file mode 100644 index 000000000..73895346a --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_10.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_11.jpg b/res/drawable-sw600dp-nodpi/wallpaper_11.jpg Binary files differnew file mode 100644 index 000000000..3f3284e80 --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_11.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_12.jpg b/res/drawable-sw600dp-nodpi/wallpaper_12.jpg Binary files differnew file mode 100644 index 000000000..0891ea829 --- /dev/null +++ b/res/drawable-sw600dp-nodpi/wallpaper_12.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg Binary files differdeleted file mode 100644 index f17d9e8a1..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg Binary files differdeleted file mode 100644 index 587581048..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg Binary files differdeleted file mode 100644 index 72513b4f4..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg Binary files differdeleted file mode 100644 index 781c2c7ec..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg Binary files differdeleted file mode 100644 index 3a1a9c12c..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg Binary files differdeleted file mode 100644 index 01092cc3c..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg Binary files differdeleted file mode 100644 index 7faebc9a4..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg Binary files differdeleted file mode 100644 index dad79a274..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg Binary files differdeleted file mode 100644 index f37aab932..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg Binary files differdeleted file mode 100644 index 482a832f2..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg Binary files differdeleted file mode 100644 index 0b4cde7c0..000000000 --- a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg +++ /dev/null diff --git a/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg b/res/drawable-sw720dp-nodpi/wallpaper_architecture.jpg Binary files differindex fae9d4fbf..fae9d4fbf 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_architecture.jpg diff --git a/res/drawable-nodpi/wallpaper_architecture_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_architecture_small.jpg Binary files differindex f17d9e8a1..f17d9e8a1 100644 --- a/res/drawable-nodpi/wallpaper_architecture_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_architecture_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg b/res/drawable-sw720dp-nodpi/wallpaper_bubblegum.jpg Binary files differindex d902912a7..d902912a7 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_bubblegum.jpg diff --git a/res/drawable-nodpi/wallpaper_bubblegum_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_bubblegum_small.jpg Binary files differindex 587581048..587581048 100644 --- a/res/drawable-nodpi/wallpaper_bubblegum_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_bubblegum_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg b/res/drawable-sw720dp-nodpi/wallpaper_canyon.jpg Binary files differindex 96e3be533..96e3be533 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_canyon.jpg diff --git a/res/drawable-nodpi/wallpaper_canyon_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_canyon_small.jpg Binary files differindex 72513b4f4..72513b4f4 100644 --- a/res/drawable-nodpi/wallpaper_canyon_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_canyon_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg b/res/drawable-sw720dp-nodpi/wallpaper_chroma.jpg Binary files differindex 355286e3e..355286e3e 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_chroma.jpg diff --git a/res/drawable-nodpi/wallpaper_chroma_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_chroma_small.jpg Binary files differindex 781c2c7ec..781c2c7ec 100644 --- a/res/drawable-nodpi/wallpaper_chroma_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_chroma_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg b/res/drawable-sw720dp-nodpi/wallpaper_escape.jpg Binary files differindex d192ebff5..d192ebff5 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_escape.jpg diff --git a/res/drawable-nodpi/wallpaper_escape_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_escape_small.jpg Binary files differindex 3a1a9c12c..3a1a9c12c 100644 --- a/res/drawable-nodpi/wallpaper_escape_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_escape_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg b/res/drawable-sw720dp-nodpi/wallpaper_fidelity.jpg Binary files differindex d7ddef438..d7ddef438 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_fidelity.jpg diff --git a/res/drawable-nodpi/wallpaper_fidelity_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_fidelity_small.jpg Binary files differindex 01092cc3c..01092cc3c 100644 --- a/res/drawable-nodpi/wallpaper_fidelity_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_fidelity_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg b/res/drawable-sw720dp-nodpi/wallpaper_flora.jpg Binary files differindex ecdf0becc..ecdf0becc 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_flora.jpg diff --git a/res/drawable-nodpi/wallpaper_flora_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_flora_small.jpg Binary files differindex 7faebc9a4..7faebc9a4 100644 --- a/res/drawable-nodpi/wallpaper_flora_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_flora_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg b/res/drawable-sw720dp-nodpi/wallpaper_kepler.jpg Binary files differindex c7c6c2b72..c7c6c2b72 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_kepler.jpg diff --git a/res/drawable-nodpi/wallpaper_kepler_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_kepler_small.jpg Binary files differindex dad79a274..dad79a274 100644 --- a/res/drawable-nodpi/wallpaper_kepler_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_kepler_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg b/res/drawable-sw720dp-nodpi/wallpaper_leaf.jpg Binary files differindex 543d118f2..543d118f2 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_leaf.jpg diff --git a/res/drawable-nodpi/wallpaper_leaf_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_leaf_small.jpg Binary files differindex f37aab932..f37aab932 100644 --- a/res/drawable-nodpi/wallpaper_leaf_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_leaf_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg b/res/drawable-sw720dp-nodpi/wallpaper_noir.jpg Binary files differindex 283bf21da..283bf21da 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_noir.jpg diff --git a/res/drawable-nodpi/wallpaper_noir_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_noir_small.jpg Binary files differindex 482a832f2..482a832f2 100644 --- a/res/drawable-nodpi/wallpaper_noir_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_noir_small.jpg diff --git a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg b/res/drawable-sw720dp-nodpi/wallpaper_outofthebox.jpg Binary files differindex 1529dce4f..1529dce4f 100644 --- a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_outofthebox.jpg diff --git a/res/drawable-nodpi/wallpaper_outofthebox_small.jpg b/res/drawable-sw720dp-nodpi/wallpaper_outofthebox_small.jpg Binary files differindex 0b4cde7c0..0b4cde7c0 100644 --- a/res/drawable-nodpi/wallpaper_outofthebox_small.jpg +++ b/res/drawable-sw720dp-nodpi/wallpaper_outofthebox_small.jpg diff --git a/res/drawable-xhdpi/wallpaper_01.jpg b/res/drawable-xhdpi/wallpaper_01.jpg Binary files differnew file mode 100644 index 000000000..5b8d1d598 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_01.jpg diff --git a/res/drawable-xhdpi/wallpaper_02.jpg b/res/drawable-xhdpi/wallpaper_02.jpg Binary files differnew file mode 100644 index 000000000..29cba1317 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_02.jpg diff --git a/res/drawable-xhdpi/wallpaper_03.jpg b/res/drawable-xhdpi/wallpaper_03.jpg Binary files differnew file mode 100644 index 000000000..5c165cf38 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_03.jpg diff --git a/res/drawable-xhdpi/wallpaper_04.jpg b/res/drawable-xhdpi/wallpaper_04.jpg Binary files differnew file mode 100644 index 000000000..2f0da9de7 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_04.jpg diff --git a/res/drawable-xhdpi/wallpaper_05.jpg b/res/drawable-xhdpi/wallpaper_05.jpg Binary files differnew file mode 100644 index 000000000..4ae7bb9ba --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_05.jpg diff --git a/res/drawable-xhdpi/wallpaper_08.jpg b/res/drawable-xhdpi/wallpaper_08.jpg Binary files differnew file mode 100644 index 000000000..d091cb7b7 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_08.jpg diff --git a/res/drawable-xhdpi/wallpaper_09.jpg b/res/drawable-xhdpi/wallpaper_09.jpg Binary files differnew file mode 100644 index 000000000..7990d4c66 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_09.jpg diff --git a/res/drawable-xhdpi/wallpaper_10.jpg b/res/drawable-xhdpi/wallpaper_10.jpg Binary files differnew file mode 100644 index 000000000..1fd138891 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_10.jpg diff --git a/res/drawable-xhdpi/wallpaper_11.jpg b/res/drawable-xhdpi/wallpaper_11.jpg Binary files differnew file mode 100644 index 000000000..b1609b9f9 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_11.jpg diff --git a/res/drawable-xhdpi/wallpaper_12.jpg b/res/drawable-xhdpi/wallpaper_12.jpg Binary files differnew file mode 100644 index 000000000..ed7fa0f6d --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_12.jpg diff --git a/res/drawable-xhdpi/wallpaper_architecture.jpg b/res/drawable-xhdpi/wallpaper_architecture.jpg Binary files differdeleted file mode 100644 index 7605f753b..000000000 --- a/res/drawable-xhdpi/wallpaper_architecture.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_architecture_small.jpg b/res/drawable-xhdpi/wallpaper_architecture_small.jpg Binary files differdeleted file mode 100644 index f17d9e8a1..000000000 --- a/res/drawable-xhdpi/wallpaper_architecture_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_bubblegum.jpg b/res/drawable-xhdpi/wallpaper_bubblegum.jpg Binary files differdeleted file mode 100644 index d6c132990..000000000 --- a/res/drawable-xhdpi/wallpaper_bubblegum.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_bubblegum_small.jpg b/res/drawable-xhdpi/wallpaper_bubblegum_small.jpg Binary files differdeleted file mode 100644 index 587581048..000000000 --- a/res/drawable-xhdpi/wallpaper_bubblegum_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_canyon.jpg b/res/drawable-xhdpi/wallpaper_canyon.jpg Binary files differdeleted file mode 100644 index 7c3ff3a98..000000000 --- a/res/drawable-xhdpi/wallpaper_canyon.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_canyon_small.jpg b/res/drawable-xhdpi/wallpaper_canyon_small.jpg Binary files differdeleted file mode 100644 index 72513b4f4..000000000 --- a/res/drawable-xhdpi/wallpaper_canyon_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_chroma.jpg b/res/drawable-xhdpi/wallpaper_chroma.jpg Binary files differdeleted file mode 100644 index 6f8c85ead..000000000 --- a/res/drawable-xhdpi/wallpaper_chroma.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_chroma_small.jpg b/res/drawable-xhdpi/wallpaper_chroma_small.jpg Binary files differdeleted file mode 100644 index 781c2c7ec..000000000 --- a/res/drawable-xhdpi/wallpaper_chroma_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_escape.jpg b/res/drawable-xhdpi/wallpaper_escape.jpg Binary files differdeleted file mode 100644 index 09c9866eb..000000000 --- a/res/drawable-xhdpi/wallpaper_escape.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_escape_small.jpg b/res/drawable-xhdpi/wallpaper_escape_small.jpg Binary files differdeleted file mode 100644 index 3a1a9c12c..000000000 --- a/res/drawable-xhdpi/wallpaper_escape_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_fidelity.jpg b/res/drawable-xhdpi/wallpaper_fidelity.jpg Binary files differdeleted file mode 100644 index 38b15a529..000000000 --- a/res/drawable-xhdpi/wallpaper_fidelity.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_fidelity_small.jpg b/res/drawable-xhdpi/wallpaper_fidelity_small.jpg Binary files differdeleted file mode 100644 index 01092cc3c..000000000 --- a/res/drawable-xhdpi/wallpaper_fidelity_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_flora.jpg b/res/drawable-xhdpi/wallpaper_flora.jpg Binary files differdeleted file mode 100644 index 6fdada97c..000000000 --- a/res/drawable-xhdpi/wallpaper_flora.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_flora_small.jpg b/res/drawable-xhdpi/wallpaper_flora_small.jpg Binary files differdeleted file mode 100644 index 7faebc9a4..000000000 --- a/res/drawable-xhdpi/wallpaper_flora_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_kepler.jpg b/res/drawable-xhdpi/wallpaper_kepler.jpg Binary files differdeleted file mode 100644 index 45ce15c73..000000000 --- a/res/drawable-xhdpi/wallpaper_kepler.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_kepler_small.jpg b/res/drawable-xhdpi/wallpaper_kepler_small.jpg Binary files differdeleted file mode 100644 index dad79a274..000000000 --- a/res/drawable-xhdpi/wallpaper_kepler_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_leaf.jpg b/res/drawable-xhdpi/wallpaper_leaf.jpg Binary files differdeleted file mode 100644 index c8cc7fe5f..000000000 --- a/res/drawable-xhdpi/wallpaper_leaf.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_leaf_small.jpg b/res/drawable-xhdpi/wallpaper_leaf_small.jpg Binary files differdeleted file mode 100644 index f37aab932..000000000 --- a/res/drawable-xhdpi/wallpaper_leaf_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_noir.jpg b/res/drawable-xhdpi/wallpaper_noir.jpg Binary files differdeleted file mode 100644 index 535eda897..000000000 --- a/res/drawable-xhdpi/wallpaper_noir.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_noir_small.jpg b/res/drawable-xhdpi/wallpaper_noir_small.jpg Binary files differdeleted file mode 100644 index 482a832f2..000000000 --- a/res/drawable-xhdpi/wallpaper_noir_small.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_outofthebox.jpg b/res/drawable-xhdpi/wallpaper_outofthebox.jpg Binary files differdeleted file mode 100644 index f3ad2ee6f..000000000 --- a/res/drawable-xhdpi/wallpaper_outofthebox.jpg +++ /dev/null diff --git a/res/drawable-xhdpi/wallpaper_outofthebox_small.jpg b/res/drawable-xhdpi/wallpaper_outofthebox_small.jpg Binary files differdeleted file mode 100644 index 0b4cde7c0..000000000 --- a/res/drawable-xhdpi/wallpaper_outofthebox_small.jpg +++ /dev/null diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml new file mode 100644 index 000000000..8bf8d15ce --- /dev/null +++ b/res/layout-sw600dp-port/all_apps_cling.xml @@ -0,0 +1,51 @@ +<?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. +--> +<com.android.launcher2.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="all_apps_portrait"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="20dp" + android:layout_marginTop="20dp"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/all_apps_cling_title" + android:text="@string/all_apps_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/all_apps_cling_add_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_add_item" /> + </LinearLayout> + </FrameLayout> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_width="118dp" + android:layout_height="54dp" + android:textSize="24sp" + android:layout_marginBottom="27dp" + android:layout_marginRight="36dp" + android:layout_gravity="bottom|right" + android:onClick="dismissAllAppsCling" /> +</com.android.launcher2.Cling> diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml new file mode 100644 index 000000000..d154a5b16 --- /dev/null +++ b/res/layout-sw600dp-port/folder_cling.xml @@ -0,0 +1,52 @@ +<?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. +--> +<com.android.launcher2.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="folder_portrait"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="20dp" + android:layout_marginRight="10dp" + android:layout_marginTop="@dimen/folderClingMarginTop"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/folder_cling_title" + android:text="@string/folder_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/folder_cling_create_folder" /> + </LinearLayout> + </FrameLayout> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_width="118dp" + android:layout_height="54dp" + android:textSize="24sp" + android:layout_marginBottom="27dp" + android:layout_marginRight="36dp" + android:layout_gravity="bottom|right" + android:onClick="dismissFolderCling" /> +</com.android.launcher2.Cling> diff --git a/res/values/wallpapers.xml b/res/values/wallpapers.xml index fb386f491..ed56b18ff 100644 --- a/res/values/wallpapers.xml +++ b/res/values/wallpapers.xml @@ -17,16 +17,17 @@ <resources> <string-array name="wallpapers" translatable="false"> - <item>wallpaper_architecture</item> - <item>wallpaper_bubblegum</item> - <item>wallpaper_canyon</item> - <item>wallpaper_chroma</item> - <item>wallpaper_escape</item> - <item>wallpaper_fidelity</item> - <item>wallpaper_flora</item> - <item>wallpaper_kepler</item> - <item>wallpaper_leaf</item> - <item>wallpaper_noir</item> - <item>wallpaper_outofthebox</item> + <item>wallpaper_01</item> + <item>wallpaper_02</item> + <item>wallpaper_03</item> + <item>wallpaper_04</item> + <item>wallpaper_05</item> + <item>wallpaper_06</item> + <item>wallpaper_07</item> + <item>wallpaper_08</item> + <item>wallpaper_09</item> + <item>wallpaper_10</item> + <item>wallpaper_11</item> + <item>wallpaper_12</item> </string-array> </resources> diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java index 797829846..d61b9883a 100644 --- a/src/com/android/launcher2/Cling.java +++ b/src/com/android/launcher2/Cling.java @@ -186,11 +186,12 @@ public class Cling extends FrameLayout { mDrawIdentifier.equals(ALLAPPS_LARGE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling2); } else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) || - mDrawIdentifier.equals(FOLDER_LANDSCAPE) || - mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { + mDrawIdentifier.equals(FOLDER_LANDSCAPE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling3); } else if (mDrawIdentifier.equals(FOLDER_LARGE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling4); + } else if (mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { + mBackground = getResources().getDrawable(R.drawable.bg_cling5); } } if (mBackground != null) { |
