summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translations.ics-releaseicscm-9.1.0Eric Fischer2011-11-012-0/+56
| | | | Change-Id: I6526c97f70a25e0e4205564680a79a01f67a1773
* Merge "Import revised translations."Eric Fischer2011-10-181-0/+28
|\
| * Import revised translations.Eric Fischer2011-10-181-0/+28
| | | | | | | | Change-Id: I879d31caf469cf502668d8df3fd6b72f59af4e1f
* | am 15ae8e5c: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-180-0/+0
|\ \ | |/ |/| | | | | | | | | into ics-mr0 * commit '15ae8e5c5532e27a1fd5c909cc3a38a4df1d50b0': Import revised translations. DO NOT MERGE
| * Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-181-0/+28
|/|
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+28
| | | | | | | | Change-Id: Ia6c8785f1644f93c1edfe7f98ac3a196c56cc45a
* | Update MagicSmoke app iconJustin Ho2011-10-174-0/+0
|/ | | | Change-Id: I6d3e26fdbcd5adc9a4a6c4837d7be44060c1a859
* Apply settings immediately, like other wallpapers.Marco Nelissen2011-10-136-26/+21
| | | | | | | | | | 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
* Import revised translations.Eric Fischer2011-08-221-2/+2
| | | | Change-Id: I4180c14b668f10e7d71c273b27839b304476b67e
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
| | | | | | Bug: 5010576 Change-Id: I20878bdcb0bfd5f3222d2cad8c6e990ed31246f1
* Import revised translations.Eric Fischer2011-06-202-0/+56
| | | | Change-Id: I44d8b50fadbbed532f095ddc50fd5b46b4d98a08
* Import revised translations.Eric Fischer2011-05-263-0/+84
| | | | Change-Id: I1d314561893ff29007d5921612e087f4ff65df8a
* Clean up use of rsSetObject/rsClearObject.Stephen Hines2011-05-021-4/+4
| | | | Change-Id: I5dd679ee759d6321c0111358360dfeb5cbddc9e6
* Fix RS graphics samples.Stephen Hines2011-04-271-1/+1
| | | | Change-Id: I2d7e6029b10135407871a18bf6adfc65c082564f
* Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ | | | | | | Change-Id: I19629108310359980e81d221b3c5c82fd2025361
| * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| |\ | | | | | | | | | Change-Id: Ic0d8c51f6373169b514a8ff2681d8cf36c92abd6
| | * am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer2011-01-250-0/+0
| |/| | | | | | | | | | | | | * commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages.
* | | am 8d57c787: Fix horizontal and vertical panning.Marco Nelissen2011-01-196-23/+31
|\| | | | | | | | | | | | | | * commit '8d57c78704797dff5df2df2b10a08dec885fe489': Fix horizontal and vertical panning.
| * | Fix horizontal and vertical panning.Marco Nelissen2011-01-196-23/+31
| | | | | | | | | | | | Change-Id: I5177f3f3424233371136bdcbf358ce7056ea055d
* | | am f50de7e2: Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen2011-01-181-1/+12
|\| | | | | | | | | | | | | | * commit 'f50de7e2660498d0c606597982639090ac1a8235': Fix Magic Smoke crash and clarify why we use getPixels
| * | Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen2011-01-181-1/+12
| | | | | | | | | | | | Change-Id: Ica61181aedc98d30dc0960387064f253b78177e9
* | | am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer2011-01-080-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages.
| * Import translations for additional languages.Eric Fischer2011-01-0621-0/+588
| | | | | | | | Change-Id: I16ee85ab44eb607cf1131b799de51295fb16f7bc
* | rendescript api cleanupAlex Sakhartchouk2010-12-211-22/+21
| | | | | | | | Change-Id: Ic35a7840518818ee2df0ff00f2d0ee4dacda299c
* | Merge "Update for Allocation changes"Jason Sams2010-12-152-3/+8
|\ \
| * | Update for Allocation changesJason Sams2010-12-142-3/+8
| | | | | | | | | | | | Change-Id: I664d96abc4e045962aebe156ac8c143ef474aeef
* | | Add Context to a RenderScript or RenderScriptGL instance.Shih-wei Liao2010-12-091-1/+1
|/ / | | | | | | | | | | | | This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. Change-Id: I33b759db49706f0cecba689f021f66d1b80666b0
* | Unbreak magic smoke.Jason Sams2010-12-071-2/+2
| | | | | | | | Change-Id: I599f7d62603506de91a986b5e470c946b01afca8
* | API updateJason Sams2010-12-063-17/+8
| | | | | | | | Change-Id: Idf4ea56d40f51d9964b86deb4670c618e681ba4c
* | Rename Indonesian and Hebrew translations to match Locale.java conventionsEric Fischer2010-12-022-0/+0
| | | | | | | | Change-Id: Ia2816d2c5d16cd179967656be8d2d81c8d27edc2
* | Merge "Remove unnecessary export_func pragma."Stephen Hines2010-11-181-2/+0
|\ \
| * | Remove unnecessary export_func pragma.Stephen Hines2010-11-181-2/+0
| | | | | | | | | | | | Change-Id: Ib121cfb1168f901d13cfddefc4196a9351fd939f
* | | Merge "Import initial translations for 20 new locales."Eric Fischer2010-11-1820-0/+560
|\ \ \ | |/ / |/| |
| * | Import initial translations for 20 new locales.Eric Fischer2010-11-1720-0/+560
| | | | | | | | | | | | Change-Id: Ide36c3526e00d77f5e7ae5745c7f0f83d5bf449e
* | | Mark non-exported functions as static.Stephen Hines2010-11-171-6/+6
|/ / | | | | | | Change-Id: Ibcab2f01cc51f192b0cf887a8773b7de4844bad4
* | Remove warnings for unused RS script variables.Stephen Hines2010-11-162-38/+22
| | | | | | | | Change-Id: I8f814664365d09cd1d8ab221305a2a65f7b995e6
* | Fix refcounting bug in MagicSmoke.Stephen Hines2010-11-161-2/+2
| | | | | | | | | | Bug: 3167301 Change-Id: I5c0bf9174844ea4072a619e52406a4ff6450d85f
* | Remove zero-init/destructor WARs.Stephen Hines2010-11-151-4/+2
| | | | | | | | Change-Id: Ib8a5d4afa83a60b6c42161119313827839930250
* | Updating to handle RS local variables properly.Stephen Hines2010-10-291-2/+6
| | | | | | | | Change-Id: I8c4f9865a7e9508e184e80a9bfb23f5c6fe6bf03
* | Import revised translations.Eric Fischer2010-10-272-2/+2
| | | | | | | | Change-Id: I5025860c7f7e67ddfdfe992c4fd868974a18585a
* | Performance optimizations for MagicSmokeFredrik Ehnbom2010-10-137-90/+261
| | | | | | | | | | | | | | The MagicSmoke wallpaper was modified to be single pass multi texture rather than blended multipass. Change-Id: If838a4abd2c3fa73def46c47d1f362c8a2af3363
* | Update to use SurfaceConfig.Jason Sams2010-10-101-1/+2
| | | | | | | | Change-Id: I2d50c789a2346fdea03e0fbae20e6256dfd5e02b
* | Remove now unnecessary pragma rs export_var().Stephen Hines2010-10-081-8/+7
| | | | | | | | Change-Id: I4348e7f14485c7f5117faa8a566b07ee84f0e724
* | am 7e818fdc: Fix proguard flag file dependency.Ying Wang2010-09-301-1/+1
|\| | | | | | | | | | | | | Merge commit '7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d' * commit '7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d': Fix proguard flag file dependency.
| * Fix proguard flag file dependency.Ying Wang2010-09-291-1/+1
| | | | | | | | Change-Id: Iba7a0e63b0d5f3072545fd349d60b16cdf4d7caa
* | am edd79102: (-s ours) Trim unwanted whitespace from translations. DO NOT MERGEEric Fischer2010-09-270-0/+0
|\| | | | | | | | | | | | | Merge commit 'edd791028c2eb7926265b9a9171202d11a06bce5' * commit 'edd791028c2eb7926265b9a9171202d11a06bce5': Trim unwanted whitespace from translations. DO NOT MERGE
| * Trim unwanted whitespace from translations. DO NOT MERGEEric Fischer2010-09-272-2/+2
| | | | | | | | Change-Id: I2177c16de7e9ce08c11ee9776d899189e67fe264
* | Import revised translations.Eric Fischer2010-09-241-1/+1
| | | | | | | | Change-Id: Ifdcc064a49fff5d6063eee6b2fa381747c8d1d2c
* | resolved conflicts for merge of 896a34b4 to masterMarco Nelissen2010-09-231-0/+2
|\| | | | | | | Change-Id: Idb94e8674611f9ed960f1c4e8340ea6489b27d6b
| * Force 32 bit surface for Magic Smoke.Marco Nelissen2010-09-231-0/+2
| | | | | | | | Change-Id: I5e98426c2d46429094d582470853403a2f3868f1