From a45f6642277aee095483ed85b20d807c111b71a1 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Fri, 16 Oct 2009 15:07:32 -0700 Subject: [PATCH] Remove live wallpaper picker from Launcher2. Change-Id: I2c48f3624128276c3460939960168163d3c74c08 --- Android.mk | 18 +- AndroidManifest.xml | 28 +- .../livewallpaper_placeholder.png | Bin 4814 -> 0 bytes res/layout/live_wallpaper_content.xml | 72 ---- res/values/strings.xml | 10 - .../launcher2/LiveWallpaperPickActivity.java | 400 ------------------ 6 files changed, 6 insertions(+), 522 deletions(-) delete mode 100644 res/drawable-hdpi/livewallpaper_placeholder.png delete mode 100644 res/layout/live_wallpaper_content.xml delete mode 100644 src/com/android/launcher2/LiveWallpaperPickActivity.java diff --git a/Android.mk b/Android.mk index 1bcd41297a..528e840490 100644 --- a/Android.mk +++ b/Android.mk @@ -14,21 +14,6 @@ # limitations under the License. # -###################################################### -# -# WARNING -# -# /\ -# /||\ -# / || \ -# / \ -# / || \ -# /__________\ -# -# Change the LOCAL_CERTIFICATE back to shared -# -###################################################### - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -37,8 +22,7 @@ include $(CLEAR_VARS) 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/AndroidManifest.xml b/AndroidManifest.xml index dfbafdebf2..d2dae88875 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,11 +17,12 @@ ** limitations under the License. */ --> - - + package="com.android.launcher2" + android:sharedUserId="android.uid.shared" + android:sharedUserLabel="@string/uid_name"> + - - - - - @@ -97,19 +92,6 @@ - - - - - - - - - - f)t0TY%duT^c}Vgy z*fGvL&`HcA#0+^!c&`H?Vh{~#zThVi8c?^?pca$p2&6{94?lb&@z;$A5mN$$1Qatx z&?F>I>`cz!cyk8bFRydgWl_YSK7L_T(|B$cb&EOUi+ML?R6Z- z^SAA9+mtu&U%_bZ{IC zV7C2rW8XCcl*weS_*`0AssqDT2wM&-gQb)W!ul=XV`F3T;K74&e3wvQrD1Ue+JFMlnS$jD-h`~XW`G6< z2gi^7e!pZ+p#W$3TW`Jf&pUSPc-VA}&d$!Zcs!oy?(R;WJbALCxw*OL#EBEh{rmU# zD3H?1dKGYVoD?j(765IrZ|rZ^3m^uDYzDDs-@bkSR$pJgZtSiTh*Pik&&}%U>gpiy zdU|@2O-)U0r%#`b6L?>K`DHi0?o(h5DCP|)_SwM8Sw811AYK;+6=>iT!~XQ^ufM)n zTU)zms>)r0#v4HEOe7LX0uSzb>D;+<1Y&Z}o;{rkJdSY*;kLaB5NTO)d`0}bW`NS^ z^!RZg5RmLCQs9)p?r&>rdnFtWmoY#RDAU7F6*S&@dwaW+*xCMY3YX*eDJ{s#Ug%@f-43{r5iVH ztX#2TMLC`$3gF7Hp9uzpVX=IfWCDu7Aw!tx12_XB182FjuLpx0D1B(QDUw%Iq_a6`Ddx;naK$&%R>6%`R;-prXZ zEA@n6V-vDqTxC3;YQuO*^jk0}h{l#n260^Y;fEi3RYoC@MwBtVJ))s$OFdVBtQ1nf zk$VJ%v?xXFD+6c|Ft~i-!iAM!-zFAp!4U?bEzY* zt+uM6pqlVQ((*Ck=Gmixv6G&c5{WqeRL5!*bdn%->6FAf^ z=p!y+3iO0CEdasqZR0*6WF|`SUcF%uaOC$xf;~eDpb-I(X~@Kz2XGwdS*+4lj0{;O z+d=z+f&ve;P*MSTRna<~F~~H`5m~-`c^StarZjDEued4)Miel^8bFSV+q!|qMe+<~ ze4QC(Wn~dP7Sb`wAWjxn_5byBF|sIvV})!K_uARBXOk-aj2J9yxSl5uz+|bD72wd{ z0$_T%?&_&jsvlWwKy{8@v`#yNbgGBu%$YMrYd(+t9<*i#WrZ12eV)U(l1Va#jb$ce zuyAp4ajDLr?(S|5(8g-sHwB$@#Rk7NjUJAx=vlL7#i&sdAY#zZKmVLk0Ohnw+OZ6F z>G!t*RjBSS3(sI(U0nsYg8`y;AjR`AiLnj7NrK`v(B5MhAmc^`Nwn!Iy1&0a4O;gr zS~~_1yq1wZXObPrHC|}(;>A~V6ubL{3m1|CAbo7e$RMvvOfk()NbON1$AbKRe+)%z zSf@3>NvWXdSmc3eFyCuA-=u*kbNwFr>yN#?y?ZDYE?BUjJe$p46*H0I6B?7PF6PYx z6qEk&C>47HY=NToDeAQ~Yt~S$^oW>Z0;o`P?Rs>~A76a& z#nmW)7i`(G*k0(^nkIkMvyUbMGH#If!825w>@>pgh*l4npFkvgYB3AFkiMd-u|3pM93xcCVJ% zWZatvTZ6W2e&K}|Hb5=U_)Txx}kua+Gs9s{w zcI3zr4$^d=MPSVx#F_^md~jW1VWE$%t#5CN}*4D;@`PP{YpCuzu&#p&rZa|#yHAckbL-bS~XT0*{U_ednEb?%uj} z>o7o|v7i-CKKbOWk3II-E#YuD#J|zO!8IIJLPWqIV}M4A?^6I7Q@lwB$x1kcD%{Vs zB{Km;;P8HUcz6U1q8nyQOH0G(<&fTUiq=$^u72&c*Zu*)eJ!zuuP=29KP(NuzVXHz z^`CzF>8$6Td+v68p2;lMH5PXkl@O{UXfQ2i3ecxdpH7K6w46z6`7AnwKspaVk%^Ugb0)8Cn8 zdWK{dR_?=d{{dvMs4g|=GXUyW8pt{WTi^oFxz9fP>>^)SK7ceC_}bgs#{oiSi|TBn zJpiI!9iq5Ezh~g}PGIA|lM#?)@^5-u_+HRjeJU1)pn;-#J7`0UN-GVNGX-c%JdGT1Sg9i z$3i)p02fRrlS!H4bEf*QV1mK-R;1)sy+N`kU|8J=noRr~#z- zh{+v6Yhq9kaUo=zhL+%%bd=sfrq7Lyjbq6IOpTgY3Rh2w_+tgBz)~@@o%`sckJ@oz z$2K7+_h82WGYGT}>AeO@55mT3Fcp{`T}SE1w3mN3ov(k7*px#69t+S&GEo!LE?&Gi zpfSj*q-CY-XyY@3ot>SnG%W&`sgzklr}X8^mq#Jy#(cWCxHtr1dDV=lqBS-A!ZXi2 z^Iuc~)YQ}j$d)Zz7DGA?BfAAED=ULE(1!HywasanVh{sG0sraB^{TsbVI03V+@b0$5(3N~XF%W2?{ zB5pzBFWq(5T`Sx&3UmiAW(uHI3!9_>s{KW~cI_&MnjS#EjZu}CmxuJ2i8z=+n(tGcVNLP6i+L;n zjliEzqKDg2msOkMfXWJK1yBqigmiJK7q+aOWUt0zu`p>Ch)mC|x88aMcog9AP=jC_ z0oRY%n4z);?MkK7=|Ke`F```^&!CuwLe{6xWI*xfmEuhI$y(l`^?mxg7a-;!XeUl*!^ z?TLv}{6qlB>6o+o_U-F_{PD+)>Q+_pgKBJrQoLVhklV7mYduERq*+t4m@Y-6dy5pW z$Df>SCdFr&JFK7XrXKEn-jL!mia{w-#*!r{7sd?PcKld3d7fmPiD_=k zGgbYTaFCkFwen?<&Z3hLZCxu@uAC(UwUX`BE0=cf-n}0wxu~wLt{f?OthOpCDe>6~ zTwD2)&pG)rPlBlQTCdBRfC&L|(?cgd|NQgr?c29s5i8>H_=r-uv>kl!z4y9dbJbj0 z7y{4_@ka$Ijqa6_L2ZYrwj%Is*~hle7d#0Lvk_$ozfqL6faBx?kjJ8j;&7phh&cnO zeS+NB`|rPh{*fa`{y^1&GKxn>6srm$;z|*}qOdYm4g}QHGA(W>W$;ip5qKpiQi*wf zY(=&)pNYWJt9&++_9`jd46kkQ=pS%a$5EU>USfAIX1YwG4V{ z=<@xj5IrLh<3;-8~#T0NM#XOo6@#DII#fujQAp%Ru6!S_Ycs9i@ z0pj?Ea6s|0TVs$_3wd3JT;*E760tsc?Y3>({&nZhoon@J7gOLw-7|jJm@YOJ1POAOKWRu!zfNm0)fB`eJDgtOJz4~ z*l+-)$-k(3n--5c`2yq>Q^Umqpa^>JKfd|qn@uz(!*lOavASg%nQ;JKhQOn^0O}8* zMjHC$lTUi^Apfo!>vdU3QKEoj@Iq>;JV?HYL=uE13lMm)Qj|Z%@4owP3);OK=lrJv zM=l)AngDVO(q4<34WS2+?VDELc;k%~T$$TgWEw{0jbaW8(4v8Xfy=1WM;jU%QUK>A z#VXsvP&O_X^yM!FXkQUrwp_VwP=QCC`z`Fh6(FOAK<&vli+L7Fip0SvkX$v#9u(exe$#h35C`>uyZBcYuVa2*1oS+S&BG$t4opX@vNdIx94-kB<@>1&W@|!f2LFT}=KJ?H-+vvo- zd-o>5s55FTxLN6)Q5R4~4856~K)iV^D{XCyOFbG$Zf`n!CZmH)>D~kq*&4;f7WJTf z!_hn}t69!%bkAi;vd03B%^TeQ>A;i#(%)t-67ND3iM7#QjnXmM( z+k63WCi?(WeeirY-z0CEGh{ZK_L%5jKTIbm*KPAo^1OW0s`J+h$W#HcWewXkCi{<& o{!ajuPxf$ri@5MxZvP{|0Onb&?d_2`wEzGB07*qoM6N<$g7K3<<^TWy diff --git a/res/layout/live_wallpaper_content.xml b/res/layout/live_wallpaper_content.xml deleted file mode 100644 index 4dc6dbca81..0000000000 --- a/res/layout/live_wallpaper_content.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - -