summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-22Merge "Disable MagicSmoke as it depends on hidden APIs."android-l-preview_r2l-previewStephen Hines
2014-08-22Disable MagicSmoke as it depends on hidden APIs.Stephen Hines
Bug: 16031597 RS graphics requires apps to be compiled against v20 or earlier. Building against internal APIs doesn't allow us to specify LOCAL_SDK_VERSION := 20 or any other valid value. Change-Id: I6803de8d7022aee65a2c41dc9005740f34581d9d (cherry picked from commit 7aa068093e814d7a53daa4850dbe5f5c3c16e262)
2013-09-14am 5fb10178: (-s ours) Import translations. DO NOT MERGEidea133-weekly-releaseidea133Baligh Uddin
* commit '5fb10178b0d92900cfaf4f21d7a52c63b4195d2e': Import translations. DO NOT MERGE
2013-09-14Import translations. DO NOT MERGEandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devBaligh Uddin
Change-Id: I9ab59fae2172fe3e9516c2cf21010db8277357fa Auto-generated-cl: translation import
2013-06-18MagicSmoke doesn't actually need BIND_WALLPAPER and SET_WALLPAPER_COMPONENTandroid-4.4_r0.7Christopher Tate
Change-Id: I95e3666be7a834675f1d30ac89a080ace58dc6ec
2012-09-25Import translations. DO NOT MERGEandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devBaligh Uddin
Change-Id: I789cb6d059c6430231dbf19d3ded22ccfb59c66b Auto-generated-cl: translation import
2012-09-16Update to follow framework.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devDianne Hackborn
Change-Id: Ib6e54f8843f51ea53859bcb5852befdaa19f0910
2012-04-13Import translations. DO NOT MERGEandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-devEric Fischer
Change-Id: If24a8a2c26a73d6fd258a4455cd377f4f1145e19
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood
2012-01-26Import translations. DO NOT MERGEEric Fischer
Change-Id: I556d58c580b59c028010e7395ec622b06609ba14
2012-01-05Merge "Removing Live Wallpaper Description - Bug 5462731"Justin Ho
2011-11-18Removing Live Wallpaper Description - Bug 5462731Leon Hong
Change-Id: I84f3b4ed71bf572061b018e30ead5a1c4ee850ff
2011-11-02Merge "Import revised translations."Eric Fischer
2011-11-02Import revised translations.Eric Fischer
Change-Id: If44a20584d4d9de43061e554382c305b6b79881c
2011-11-01am 75da25a5: Import revised translations.Eric Fischer
* commit '75da25a50f87692b0cd357698c1dee409a11eb27': Import revised translations.
2011-11-01Import revised translations.android-sdk-adt_r20android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1Eric Fischer
Change-Id: I6526c97f70a25e0e4205564680a79a01f67a1773
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-18am e0c4dd3d: Merge "Import revised translations."Eric Fischer
* commit 'e0c4dd3d4041d4d226828c13dd8ed184afb12c8c': Import revised translations.
2011-10-18Merge "Import revised translations."Eric Fischer
2011-10-18Import revised translations.Eric Fischer
Change-Id: I879d31caf469cf502668d8df3fd6b72f59af4e1f
2011-10-18am b2e90bea: (-s ours) am 15ae8e5c: (-s ours) Merge "Import revised ↵Eric Fischer
translations. DO NOT MERGE" into ics-mr0 * commit 'b2e90beadf6489dfb7c10164ee1b3213f4d33e6f': Import revised translations. DO NOT MERGE
2011-10-18am 15ae8e5c: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer
into ics-mr0 * commit '15ae8e5c5532e27a1fd5c909cc3a38a4df1d50b0': Import revised translations. DO NOT MERGE
2011-10-18Merge "Import revised translations. DO NOT MERGE" into ics-mr0android-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseEric Fischer
2011-10-18Import revised translations. DO NOT MERGEEric Fischer
Change-Id: Ia6c8785f1644f93c1edfe7f98ac3a196c56cc45a
2011-10-17Update MagicSmoke app iconJustin Ho
Change-Id: I6d3e26fdbcd5adc9a4a6c4837d7be44060c1a859
2011-10-13Apply settings immediately, like other wallpapers.Marco Nelissen
Don't have an explicit "OK" button to apply the current preset, but just apply it immediately, like other wallpapers with settings do. Also use a different default setting that is more in line with the overall ICS theme, and update the thumbnail accordingly. b/5288769 Change-Id: Ibe35b74c3d5c9ad35708b98007d9bb0a396a25c2
2011-08-22Import revised translations.Eric Fischer
Change-Id: I4180c14b668f10e7d71c273b27839b304476b67e
2011-07-11Remove the simulator target from all makefiles.Jeff Brown
Bug: 5010576 Change-Id: I20878bdcb0bfd5f3222d2cad8c6e990ed31246f1
2011-06-20Import revised translations.Eric Fischer
Change-Id: I44d8b50fadbbed532f095ddc50fd5b46b4d98a08
2011-05-26Import revised translations.Eric Fischer
Change-Id: I1d314561893ff29007d5921612e087f4ff65df8a
2011-05-02Clean up use of rsSetObject/rsClearObject.Stephen Hines
Change-Id: I5dd679ee759d6321c0111358360dfeb5cbddc9e6
2011-04-27Fix RS graphics samples.Stephen Hines
Change-Id: I2d7e6029b10135407871a18bf6adfc65c082564f
2011-01-30Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project
Change-Id: I19629108310359980e81d221b3c5c82fd2025361
2011-01-30Mass merge from gingerbread - do not mergeThe Android Open Source Project
Change-Id: Ic0d8c51f6373169b514a8ff2681d8cf36c92abd6
2011-01-25am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer
* commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages.
2011-01-19am 8d57c787: Fix horizontal and vertical panning.Marco Nelissen
* commit '8d57c78704797dff5df2df2b10a08dec885fe489': Fix horizontal and vertical panning.
2011-01-19Fix horizontal and vertical panning.Marco Nelissen
Change-Id: I5177f3f3424233371136bdcbf358ce7056ea055d
2011-01-18am f50de7e2: Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen
* commit 'f50de7e2660498d0c606597982639090ac1a8235': Fix Magic Smoke crash and clarify why we use getPixels
2011-01-18Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen
Change-Id: Ica61181aedc98d30dc0960387064f253b78177e9
2011-01-08am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer
* commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages.
2011-01-06Import translations for additional languages.android-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1gingerbread-releasegingerbread-mr4-releasegingerbreadEric Fischer
Change-Id: I16ee85ab44eb607cf1131b799de51295fb16f7bc
2010-12-21rendescript api cleanupAlex Sakhartchouk
Change-Id: Ic35a7840518818ee2df0ff00f2d0ee4dacda299c
2010-12-15Merge "Update for Allocation changes"Jason Sams
2010-12-14Update for Allocation changesJason Sams
Change-Id: I664d96abc4e045962aebe156ac8c143ef474aeef
2010-12-09Add Context to a RenderScript or RenderScriptGL instance.Shih-wei Liao
This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. Change-Id: I33b759db49706f0cecba689f021f66d1b80666b0
2010-12-07Unbreak magic smoke.Jason Sams
Change-Id: I599f7d62603506de91a986b5e470c946b01afca8
2010-12-06API updateJason Sams
Change-Id: Idf4ea56d40f51d9964b86deb4670c618e681ba4c
2010-12-02Rename Indonesian and Hebrew translations to match Locale.java conventionsEric Fischer
Change-Id: Ia2816d2c5d16cd179967656be8d2d81c8d27edc2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 01:22:44 +0000