From 86daa3fb872486dfd6d2fad179bcde47482536be Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Mon, 28 Sep 2009 16:03:50 -0400 Subject: [PATCH] Live wallpaper improvements. Now draws something a little nicer if the live wallpaper doesn't have a preview. Also: move Launcher2 back into "shared" so it has permission to set the wallpaper. --- Android.mk | 2 +- .../livewallpaper_placeholder.png | Bin 0 -> 4814 bytes .../livewallpaper_placeholder.png | Bin 0 -> 2735 bytes res/layout/live_wallpaper_content.xml | 2 +- .../launcher2/LiveWallpaperPickActivity.java | 40 +++++++++++------- 5 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 res/drawable-hdpi/livewallpaper_placeholder.png create mode 100644 res/drawable-mdpi/livewallpaper_placeholder.png diff --git a/Android.mk b/Android.mk index e60613f9a2..1bcd41297a 100644 --- a/Android.mk +++ b/Android.mk @@ -38,7 +38,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := Launcher2 LOCAL_CERTIFICATE := platform -LOCAL_CERTIFICATE := shared +# LOCAL_CERTIFICATE := shared LOCAL_OVERRIDES_PACKAGES := Launcher diff --git a/res/drawable-hdpi/livewallpaper_placeholder.png b/res/drawable-hdpi/livewallpaper_placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..3743489db93e293e58c6473d20ca68af791e74a3 GIT binary patch literal 4814 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 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/livewallpaper_placeholder.png b/res/drawable-mdpi/livewallpaper_placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..4d3456c61643f9ef8d7731197159a4797e725c4f GIT binary patch literal 2735 zcmV;g3Q+ZlP)WUcY|bef8?qmd3`$0X+L4pjsi_ zkWK~8?RE#j#l^+_qyYH+(xXR@{&~xmEfvOx08`)J-%n7j4Gj(5qX5?-GU~`hPe23` zlai7wfx!32oIZVeKF{;#&!4S7H0_D95}flw@#cm zk&d$&=QNySgl>5@uU)$~D?L5kQe0e|WwY5VsFS>eganIuD-dqNf zNLGX1x^=4_r)HJ@~h36lDYf^!E0Ck`Viwo0|i8pWm0`9BlL)4#z+7UQLKGO6Zimd-qms+_-T` zXJ=>kkt0VQZQos>8IXO&&FYtXC3|oWLYF)Kz)hpb83#M|T1vkkUe5Ydj_U*q0;{^4i zj;P-PM3-90U?}UR8%yD23staSXD?W*U@ZIkvB0h(V`+i zFTpUEu*B-@?CdX(A3wetz-RFJoH=un5VhX|OdpK@7jAupF}}n);tR~?g&afa7d-7$K5T0KC=+PtRy?ggcVR*@!HEVvwXM9KRP^kyeO;OS1J#;8-;vC;_ z0HSFSJ)x>!2@Rl7Sw}|)M~uN?(OCk9wWC}79gd~SFr8v~AOe*3|9<=8 z#fvj_0HDxMMhZ2u5WjwN`}Xa3%KKEHScamm&z(C*o=-&=nxTV)mj)5`BqP)4-R1MAT;-c#3b5cNc&zH;>U5rIzWLWc!F8fe1W)WMI8;paW{Bb;UX(MD(Jp-16y z0&`(~+YUN)=-`wdB8~|EbbLrBh#(n$td7`7EV|1RE0T{|Ggg9Ggs$IKwtpNKJV>#>r zm=>}I&X`m?J(n+Eel0D4N5+ch*y#1Mk#aG!X3a{2!HEEz`0m}izS*;952Yc;htoP_ z4d5FNfa(f4NDGRog*>m<0+n@jbumg7a=ab^9`JA)f#&DuXB&4P@Ley!^w!tcce>qf z&x;o?I(vG0JZH|F;YL@zG=Lo6QBhH`LQP5;u?D>23>ea#f2M-?PE`|raQx^>N0ALp!kfQfMm^e9! zH5e&08~}RZIp%}5ty{Ma6&RJ#a|DQ~-)=0%Q2RZ`ZIy7pnW|{q?7Rj!ObMm}0H}!* z6zUDP*BYuDC4gq~F>882{kKo46tI4L|{|^ z_!1GnLlHU&Kq9pMZg?JnK-`gm~~zei!ag@OE``u&J7b@1r=_3JIV zA(-N+s2c_73bkjWLazEIUDP{9&+9d0oFB9{eZaU57%2ioS`7e>{rmTOK{#eUc=_@r zL+Lz!{`@7>NC(>CBrLqS(n>&aCSme1&zLbIeYjn=kPWo2an7~%JC-@fe!CH7$9;gAJ}Pd27v$)+hODQ1Gh1Qv%$E1uvm@kL_=mu_qw zjMq_7Q9~)jYY<0R3LOrBN~3Df=~uEJ8BtJBkbdgasdC}-fWijF&&XA;IdLvQwa_{U^8>V!rT#u2`nC9ZJ3?SdJz-E)2C1Apx2=& zbfn#BPW7|Uw0(2>^yy{n70xX(b?uToQL7 z_Z+XOv3nZepjJ}LlFGRQXgY4$m6g8u!jA} zP+z-t&B?+i1#=UDOeSrDSM-@iv8C81*Aenvztn(#tbZ}7I`}t=wQ~LX^?6#)K8VSs z3wiFmbLUPMXs$_&=ARBv#9ITh0O8<+AcLR*C}h(x`=urgNQ4+Ys5xNFfATS;%*8+L z-o1Oh)oL|kz1oF#yH);etQBb%LzQ?$ykda={rmSJ4L}QFw8vzyE1=1k0nih1l8?U; zFmKp$YwhtTgRz4`tG + android:layout_height="120dip" />