summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Czech: fixed translationgingerbreadgb-release-7.2Ondrej Zima2011-10-161-3/+2
| | | | Change-Id: I83d6b5582455fd7aeb14e4d516e9b7a9e19ac044
* Merge branch 'gingerbread' of ↵cm-7.1.0cm-7.0.3cm-7.0.2.1cm-7.0.1cm-7.0.0gingerbread-releaseSteve Kondik2011-02-2821-0/+588
|\ | | | | | | git://android.git.kernel.org/platform/packages/wallpapers/MagicSmoke into 233-merge
| * Import translations for additional languages.Eric Fischer2011-01-0621-0/+588
| | | | | | | | Change-Id: I16ee85ab44eb607cf1131b799de51295fb16f7bc
* | MDPI Drawables for MagicSmokeWes Garner2010-12-225-0/+0
|/
* Fix proguard flag file dependency.Ying Wang2010-09-291-1/+1
| | | | Change-Id: Iba7a0e63b0d5f3072545fd349d60b16cdf4d7caa
* Trim unwanted whitespace from translations. DO NOT MERGEEric Fischer2010-09-272-2/+2
| | | | Change-Id: I2177c16de7e9ce08c11ee9776d899189e67fe264
* Force 32 bit surface for Magic Smoke.Marco Nelissen2010-09-231-0/+2
| | | | Change-Id: I5e98426c2d46429094d582470853403a2f3868f1
* Apparently we can now get motionevents before the renderer is created.Marco Nelissen2010-09-151-2/+6
| | | | Change-Id: I6f4e5be8c8c4b3b8a47847f74309c3e9ded81b10
* Use new SharedPreferences$Editor.apply instead of commit.Brad Fitzpatrick2010-09-061-3/+1
| | | | | | | apply is the new async version when the caller doesn't care about the return value, but is otherwise identical in observable effects. Change-Id: Ib0cf9ff455925f0191ccecca652899acc879c3a6
* Import revised translations. DO NOT MERGEEric Fischer2010-08-042-2/+2
| | | | Change-Id: Ic2c620cfa8e7bc1bec595d11a23389e670cc5eb3
* Import revised translationsKenny Root2010-03-1720-260/+340
| | | | Change-Id: Iad20be95cd913eaf3346e6b040e2c7edcde185ae
* Fix proguard.Daniel Sandler2010-03-111-0/+4
| | | | | | Bug: 2505538 Change-Id: Ic08eb11a0eedd77d8601826c9260ac98203eb1e9
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
| | | | Change-Id: If7b6e8a31d4c6531a32fabc1f1bcf673c0f618d5
* Fix Proguard flags.Ying Wang2010-02-192-0/+5
|
* Add an original-package tag that matches the real package name.Jeff Hamilton2010-02-121-0/+2
| | | | Change-Id: I7899b6ebe2ef3d7c7afeba86a9bdfda88f4dbe75
* am ae9ba575: (-s ours) am b7cac95f: DO NOT MERGE. Port live wallpaper ↵Marco Nelissen2010-02-120-0/+0
|\ | | | | | | | | | | | | | | | | changes from Froyo to Eclair for Droid support. Merge commit 'ae9ba5758133ba753bd4a749a81267e08a3ee811' * commit 'ae9ba5758133ba753bd4a749a81267e08a3ee811': DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair for Droid support.
| * am b7cac95f: DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair ↵Marco Nelissen2010-02-123-19/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | for Droid support. Merge commit 'b7cac95f928bf5b02f4a2a914c3a43014c2469f8' into eclair-plus-aosp * commit 'b7cac95f928bf5b02f4a2a914c3a43014c2469f8': DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair for Droid support.
| | * DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair for Droid ↵Marco Nelissen2010-02-113-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support. Fix the magic smoke wallpaper so it doesn't jump after turning the screen on. Update to new RS texture API. Add uses-feature for live wallpapers.
* | | Convert to RenderScriptGLJason Sams2010-02-092-9/+10
| | |
* | | am e2bb5c45: am fcdc3073: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e2bb5c459608224989dd3f9d5c462790c5f92332' * commit 'e2bb5c459608224989dd3f9d5c462790c5f92332': Add uses-feature for live wallpapers. android-2.1_r1 snapshot
| * | am fcdc3073: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | Merge commit 'fcdc30736467201cc8b7b365a969f4db75c44637' into eclair-plus-aosp * commit 'fcdc30736467201cc8b7b365a969f4db75c44637': Add uses-feature for live wallpapers. android-2.1_r1 snapshot
| | * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-291-0/+2
| | |/|
| | | * Add uses-feature for live wallpapers.Romain Guy2010-01-281-0/+2
| | | |
| | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-1241-0/+2041
| | | |
* | | | Merge "Add uses-feature for live wallpapers."Romain Guy2010-01-271-0/+2
|\ \ \ \
| * | | | Add uses-feature for live wallpapers.Romain Guy2010-01-271-0/+2
| | | | |
* | | | | am 244493eb: merge from open-source masterThe Android Open Source Project2010-01-270-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | Merge commit '244493eb9dcf1785dfa8cb5565ffd82aff7ae678' * commit '244493eb9dcf1785dfa8cb5565ffd82aff7ae678': empty initial commit
| * | | merge from open-source masterThe Android Open Source Project2010-01-210-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * empty initial commitThe Android Open Source Project2010-01-110-0/+0
| |
* | Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-081-1/+1
| | | | | | | | Bug: #2361749.
* | Update with latest translations.Eric Fischer2010-01-0720-0/+480
| |
* | explicit set an "optional" tagJean-Baptiste Queru2010-01-051-1/+1
| |
* | Update to new RS texture API.Jason Sams2009-12-171-16/+15
| |
* | am 5e07c1e2: am c2e62f1c: Throttle magic smoke cpu use.Jason Sams2009-12-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '5e07c1e2de463303382e8bb11fcdbc3038387a80' * commit '5e07c1e2de463303382e8bb11fcdbc3038387a80': Throttle magic smoke cpu use.
| * | am c2e62f1c: Throttle magic smoke cpu use.Jason Sams2009-12-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'c2e62f1c375d3fd9f28f4da7372462ed859fc0e3' into eclair-mr2 * commit 'c2e62f1c375d3fd9f28f4da7372462ed859fc0e3': Throttle magic smoke cpu use.
| | * Throttle magic smoke cpu use.Jason Sams2009-12-081-1/+1
| | |
* | | am f974e91d: Fix the magic smoke wallpaper so it doesn\'t jump after turning ↵Marco Nelissen2009-12-101-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | the screen on. Merge commit 'f974e91d19c78937f9a196fa818e51ffd8838ff3' * commit 'f974e91d19c78937f9a196fa818e51ffd8838ff3': Fix the magic smoke wallpaper so it doesn't jump after turning the screen on.
| * | Fix the magic smoke wallpaper so it doesn't jump after turning the screen on.Marco Nelissen2009-12-101-3/+4
| | |
* | | am 7235a0be: am db27a7c4: Run the magic smoke wallpaper at lower priority, ↵Marco Nelissen2009-12-023-15/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | and make its animation time based so it runs at constant speed regardless of framerate. Also fix the red flash when first starting the wallpaper. Merge commit '7235a0be5f56e1231a6e2ec789a081b678833ec6' * commit '7235a0be5f56e1231a6e2ec789a081b678833ec6': Run the magic smoke wallpaper at lower priority, and make its animation
| * | am db27a7c4: Run the magic smoke wallpaper at lower priority, and make its ↵Marco Nelissen2009-12-023-15/+27
| |\| | | | | | | | | | | | | | | | | | | | | | | | | animation time based so it runs at constant speed regardless of framerate. Also fix the red flash when first starting the wallpaper. Merge commit 'db27a7c47541365f87d128f748463dd176d53d3e' into eclair-mr2 * commit 'db27a7c47541365f87d128f748463dd176d53d3e': Run the magic smoke wallpaper at lower priority, and make its animation
| | * Run the magic smoke wallpaper at lower priority, and make its animationMarco Nelissen2009-12-023-15/+27
| | | | | | | | | | | | | | | time based so it runs at constant speed regardless of framerate. Also fix the red flash when first starting the wallpaper.
* | | am d15aa1a3: am 4875eb5f: Fix issue #2271640: Fix wallpaper etc docsDianne Hackborn2009-11-191-2/+2
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'd15aa1a38f1ea840ebf60ec039199932671d40da' * commit 'd15aa1a38f1ea840ebf60ec039199932671d40da': Fix issue #2271640: Fix wallpaper etc docs
| * | am 4875eb5f: Fix issue #2271640: Fix wallpaper etc docsDianne Hackborn2009-11-191-2/+2
| |\| | | | | | | | | | | | | | | | | | | Merge commit '4875eb5fd284b9fa73b6c5326ebcc2fe6be10336' into eclair-mr2 * commit '4875eb5fd284b9fa73b6c5326ebcc2fe6be10336': Fix issue #2271640: Fix wallpaper etc docs
| | * Fix issue #2271640: Fix wallpaper etc docsDianne Hackborn2009-11-181-2/+2
| | | | | | | | | | | | Track API changes.
* | | am 642d9682: (-s ours) am f9ec15fb: (-s ours) Import revised translations. ↵Eric Fischer2009-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '642d9682d81e8a6cddc55ccf517d46cdf0664a17' * commit '642d9682d81e8a6cddc55ccf517d46cdf0664a17': Import revised translations. DO NOT MERGE
| * | am f9ec15fb: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'f9ec15fb73a051e4b83d673a97d0d506f892be49' into eclair-mr2 * commit 'f9ec15fb73a051e4b83d673a97d0d506f892be49': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2009-11-161-0/+24
| | |
* | | am b0fbfd13: am 7a8980b4: Merge change I97e65a2a into eclairMarco Nelissen2009-11-131-0/+13
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'b0fbfd13a78c298bfb149a71043fb6fb885de66d' * commit 'b0fbfd13a78c298bfb149a71043fb6fb885de66d': Make sure texture coordinates and angles don't get too big, since
| * | am 7a8980b4: Merge change I97e65a2a into eclairMarco Nelissen2009-11-131-0/+13
| |\| | | | | | | | | | | | | | | | | | | Merge commit '7a8980b45d74af83443e7b3b6387476abe6eb14a' into eclair-mr2 * commit '7a8980b45d74af83443e7b3b6387476abe6eb14a': Make sure texture coordinates and angles don't get too big, since