OSDN Git Service
Chih-Wei Huang [Sun, 18 Apr 2010 11:46:03 +0000 (19:46 +0800)]
add missing resources
Kenny Root [Tue, 27 Apr 2010 21:33:06 +0000 (14:33 -0700)]
Import revised translations
Change-Id: I81db5f95d4521b7116267bea21d3cca7b79ae133
Kenny Root [Tue, 30 Mar 2010 16:17:09 +0000 (09:17 -0700)]
Import revised translations
Change-Id: I98ad3d38e3722bda9c845e8f70e8d0c1ff38ff1a
Kenny Root [Thu, 18 Mar 2010 05:17:31 +0000 (22:17 -0700)]
Import revised translations
Change-Id: I9a523b5d3c8cb866077410bba16401b50da10918
Daniel Sandler [Thu, 11 Mar 2010 19:23:22 +0000 (14:23 -0500)]
Assume xOffset is 0.5 in preview mode.
Bug:
2498042
Change-Id: Iff27cbd6fdc8a4b294c43f66cec56a15534b7ffd
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:05:21 +0000 (18:05 -0800)]
Add an empty CleanSpec.mk
Change-Id: I279db4940d520bf5746e2ff9a99af70b87713904
Jason Sams [Wed, 3 Mar 2010 23:08:54 +0000 (15:08 -0800)]
Merge "Clean up fall vertex shader."
Jason Sams [Tue, 2 Mar 2010 21:47:20 +0000 (13:47 -0800)]
Clean up fall vertex shader.
Ying Wang [Sat, 20 Feb 2010 02:53:33 +0000 (18:53 -0800)]
Fix proguard flags.
Eric Fischer [Sat, 27 Feb 2010 01:35:22 +0000 (17:35 -0800)]
Import new translations.
Romain Guy [Mon, 22 Feb 2010 20:13:08 +0000 (12:13 -0800)]
am
fe06b09f: am
9a2bf356: Better support for landscape.
Merge commit '
fe06b09f074cb6cb6c84086847e0594a35688b47'
* commit '
fe06b09f074cb6cb6c84086847e0594a35688b47':
Better support for landscape.
Romain Guy [Mon, 22 Feb 2010 20:03:58 +0000 (12:03 -0800)]
am
9a2bf356: Better support for landscape.
Merge commit '
9a2bf356a59957a4bb8414744b913eb1dc3e9771' into eclair-plus-aosp
* commit '
9a2bf356a59957a4bb8414744b913eb1dc3e9771':
Better support for landscape.
Romain Guy [Sun, 21 Feb 2010 21:29:38 +0000 (13:29 -0800)]
Better support for landscape.
Romain Guy [Fri, 19 Feb 2010 22:03:14 +0000 (14:03 -0800)]
am
34a6f37d: am
3cc89700: Merge "Improve Water live wallpaper behavior across devices/orientations." into eclair
Merge commit '
34a6f37d3859797d4c37a203c1e90be383fa1125'
* commit '
34a6f37d3859797d4c37a203c1e90be383fa1125':
Improve Water live wallpaper behavior across devices/orientations.
Romain Guy [Fri, 19 Feb 2010 22:01:15 +0000 (14:01 -0800)]
am
3cc89700: Merge "Improve Water live wallpaper behavior across devices/orientations." into eclair
Merge commit '
3cc89700d355499d728ec37b2e9faa27d64b430a' into eclair-plus-aosp
* commit '
3cc89700d355499d728ec37b2e9faa27d64b430a':
Improve Water live wallpaper behavior across devices/orientations.
Romain Guy [Fri, 19 Feb 2010 21:57:01 +0000 (13:57 -0800)]
Merge "Improve Water live wallpaper behavior across devices/orientations." into eclair
Daniel Sandler [Fri, 19 Feb 2010 21:32:25 +0000 (13:32 -0800)]
am
88fe1fb6: am
12290bd7: Fix coords of NeuralNetwork LW tap effects.
Merge commit '
88fe1fb6cbaa5138c5beceb85cb5d4499b0403f5'
* commit '
88fe1fb6cbaa5138c5beceb85cb5d4499b0403f5':
Fix coords of NeuralNetwork LW tap effects.
Daniel Sandler [Fri, 19 Feb 2010 21:27:52 +0000 (13:27 -0800)]
am
12290bd7: Fix coords of NeuralNetwork LW tap effects.
Merge commit '
12290bd7369db1e81b2dd67be67ef0d4b292b412' into eclair-plus-aosp
* commit '
12290bd7369db1e81b2dd67be67ef0d4b292b412':
Fix coords of NeuralNetwork LW tap effects.
Daniel Sandler [Fri, 19 Feb 2010 20:43:28 +0000 (15:43 -0500)]
Fix coords of NeuralNetwork LW tap effects.
(In landscape, nexus.rs ignores xOffset. This change makes
NexusRS.java behave the same way.)
Bug:
2456558
Change-Id: I541199fe57f3bb2a310f1920d207e2abdcdd2ac1
Romain Guy [Fri, 19 Feb 2010 01:08:41 +0000 (02:08 +0100)]
Improve Water live wallpaper behavior across devices/orientations.
The result is still not perfect in landscape as the waves are stretched
horizontally.
Jason Sams [Tue, 16 Feb 2010 20:12:55 +0000 (12:12 -0800)]
am
5e1b4fa0: am
a0735b21: Fix leaf movement in fall in landscape.
Merge commit '
5e1b4fa0fc048e4c6aca395cd6d8a3f127a96491'
* commit '
5e1b4fa0fc048e4c6aca395cd6d8a3f127a96491':
Fix leaf movement in fall in landscape.
Jason Sams [Tue, 16 Feb 2010 20:04:48 +0000 (12:04 -0800)]
am
a0735b21: Fix leaf movement in fall in landscape.
Merge commit '
a0735b21a2f5bc456f72c5186f5baa7e0d258143' into eclair-plus-aosp
* commit '
a0735b21a2f5bc456f72c5186f5baa7e0d258143':
Fix leaf movement in fall in landscape.
Jeff Hamilton [Sat, 13 Feb 2010 00:56:26 +0000 (18:56 -0600)]
Add an original-package tag that matches the real package name.
Change-Id: Icc5fe0fb871e9c440587ba28bacbd683c16ea5d0
Jason Sams [Fri, 12 Feb 2010 23:10:01 +0000 (15:10 -0800)]
Fix leaf movement in fall in landscape.
Jason Sams [Fri, 12 Feb 2010 22:22:27 +0000 (14:22 -0800)]
am
fd1792fc: am
f5afb727: Attempt to fix occasional grass texture corruption.
Merge commit '
fd1792fc5f13e1bf02e043d742b193470e97cebb'
* commit '
fd1792fc5f13e1bf02e043d742b193470e97cebb':
Attempt to fix occasional grass texture corruption.
Jason Sams [Fri, 12 Feb 2010 22:14:11 +0000 (14:14 -0800)]
am
f5afb727: Attempt to fix occasional grass texture corruption.
Merge commit '
f5afb72766ba1dba56eb14d57c72e70da0d76e92' into eclair-plus-aosp
* commit '
f5afb72766ba1dba56eb14d57c72e70da0d76e92':
Attempt to fix occasional grass texture corruption.
Jason Sams [Fri, 12 Feb 2010 22:02:54 +0000 (14:02 -0800)]
Attempt to fix occasional grass texture corruption.
Jason Sams [Fri, 12 Feb 2010 19:33:23 +0000 (11:33 -0800)]
am
bc3a44f1: (-s ours) am
6a500a1d: DO NOT MERGE. Port Froyo livewallpaper support to eclair for droid..
Merge commit '
bc3a44f18d2908047443f18fd3d3f54c33b09f7a'
* commit '
bc3a44f18d2908047443f18fd3d3f54c33b09f7a':
DO NOT MERGE. Port Froyo livewallpaper support to eclair for droid..
Jason Sams [Fri, 12 Feb 2010 19:26:42 +0000 (11:26 -0800)]
am
6a500a1d: DO NOT MERGE. Port Froyo livewallpaper support to eclair for droid..
Merge commit '
6a500a1d5e15bd5a563995f31d0796552cc13640' into eclair-plus-aosp
* commit '
6a500a1d5e15bd5a563995f31d0796552cc13640':
DO NOT MERGE. Port Froyo livewallpaper support to eclair for droid..
Jason Sams [Fri, 11 Dec 2009 01:32:28 +0000 (17:32 -0800)]
DO NOT MERGE. Port Froyo livewallpaper support to eclair for droid..
Update grass to use fragment shaders.
Create struct for blade data.
Use indicies to reduce grass cpu usage. Fix aliasing of tips of grass.
Update to new RS texture API.
Update to new RS element API.
Update to use RS generic attrib support.
Change to user attrib types.
Disable per touch logging.
Simplify the fall water script. Remove some dead code from the java layer that was left over from the old integer mesh.
Move Fall waveform calculation to vertex shader.
Add uses-feature to the manifest.
Enable red-pulses-only mode in Nexus wallpaper.
Also load textures with CLAMP for Droid compatiblity.
Bug:
2395147
Change-Id: Id310674e1c3160a545d632b286506e55e9cbc8ad
Fix shader problems in Nexus, er, Neural Network LW.
Change-Id: I852bdf4700d61f18a006ebcf619e9d4f3b51e4cd
Fix Galaxy in landscape mode.
Author: Romain Guy <romainguy@android.com>
Committer: Jason Sams <rjsams@android.com>
On branch droid
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: src/com/android/wallpaper/galaxy/GalaxyRS.java
Romain Guy [Wed, 10 Feb 2010 03:36:13 +0000 (19:36 -0800)]
Fix Galaxy in landscape mode.
Jason Sams [Wed, 10 Feb 2010 00:01:16 +0000 (16:01 -0800)]
Convert to RenderScriptGL
The Android Open Source Project [Fri, 5 Feb 2010 22:16:47 +0000 (14:16 -0800)]
am
ea0f3e9d: am
a7f85762: reconcile main tree with open-source eclair
Merge commit '
ea0f3e9deb05f2a77a616428db0d65d4579d013d'
* commit '
ea0f3e9deb05f2a77a616428db0d65d4579d013d':
Add uses-feature to the manifest.
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:45:53 +0000 (08:45 -0800)]
am
a7f85762: reconcile main tree with open-source eclair
Merge commit '
a7f85762cded62465c5144679ba8bf5b9986d0c0' into eclair-plus-aosp
* commit '
a7f85762cded62465c5144679ba8bf5b9986d0c0':
Add uses-feature to the manifest.
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:41 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Daniel Sandler [Fri, 29 Jan 2010 19:12:49 +0000 (14:12 -0500)]
Fix shader problems in Nexus, er, Neural Network LW.
Change-Id: I852bdf4700d61f18a006ebcf619e9d4f3b51e4cd
The Android Open Source Project [Fri, 29 Jan 2010 22:09:30 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Romain Guy [Thu, 28 Jan 2010 00:37:21 +0000 (16:37 -0800)]
Add uses-feature to the manifest.
Daniel Sandler [Thu, 28 Jan 2010 14:33:28 +0000 (06:33 -0800)]
Merge "Enable red-pulses-only mode in Nexus wallpaper."
Daniel Sandler [Tue, 26 Jan 2010 01:50:42 +0000 (20:50 -0500)]
Enable red-pulses-only mode in Nexus wallpaper.
Also load textures with CLAMP for Droid compatiblity.
Bug:
2395147
Change-Id: Id310674e1c3160a545d632b286506e55e9cbc8ad
Romain Guy [Thu, 28 Jan 2010 00:37:55 +0000 (16:37 -0800)]
Merge "Add uses-feature to the manifest."
Romain Guy [Thu, 28 Jan 2010 00:37:21 +0000 (16:37 -0800)]
Add uses-feature to the manifest.
The Android Open Source Project [Thu, 28 Jan 2010 00:15:17 +0000 (16:15 -0800)]
Jason Sams [Tue, 26 Jan 2010 20:40:07 +0000 (12:40 -0800)]
Move Fall waveform calculation to vertex shader.
The Android Open Source Project [Thu, 21 Jan 2010 19:21:32 +0000 (11:21 -0800)]
merge from open-source master
Jason Sams [Thu, 21 Jan 2010 01:29:06 +0000 (17:29 -0800)]
Simplify the fall water script. Remove some dead code from the java layer that was left over from the old integer mesh.
Jason Sams [Wed, 13 Jan 2010 22:54:32 +0000 (14:54 -0800)]
Merge "Update galaxy to new RS constant naming."
Jason Sams [Wed, 13 Jan 2010 22:53:26 +0000 (14:53 -0800)]
Update galaxy to new RS constant naming.
The Android Open Source Project [Tue, 12 Jan 2010 23:19:25 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
The Android Open Source Project [Mon, 11 Jan 2010 22:33:18 +0000 (14:33 -0800)]
empty initial commit
Daniel Sandler [Sat, 9 Jan 2010 00:48:13 +0000 (16:48 -0800)]
Eric Fischer [Fri, 8 Jan 2010 00:01:56 +0000 (16:01 -0800)]
Update with latest translations.
Jason Sams [Wed, 6 Jan 2010 22:41:51 +0000 (14:41 -0800)]
Disable per touch logging.
Jason Sams [Wed, 6 Jan 2010 19:55:45 +0000 (11:55 -0800)]
Change to user attrib types.
Daniel Sandler [Mon, 4 Jan 2010 22:14:28 +0000 (16:14 -0600)]
Fix http://b/
2352067 .
Time.month ranges over 0..11, not 1..12. Fixed code to deal
properly with this.
Additionally, months with 31 days will crash. Fixed that too.
While we're at it, fix http://b/
2354796 (the seconds arc
wasn't synchronized with wall-clock seconds).
Finally, added a bit of additional crash defense in case of
other exceptional situations (e.g. leap seconds, API bugs,
solar flares...)
Change-Id: If42c8fd408cf6619a16541a9661b39e33c5d47a5
Jean-Baptiste Queru [Tue, 5 Jan 2010 19:09:55 +0000 (11:09 -0800)]
explicit set an "optional" tag
Jason Sams [Tue, 5 Jan 2010 00:52:41 +0000 (16:52 -0800)]
Update to use RS generic attrib support.
Jason Sams [Wed, 23 Dec 2009 22:37:23 +0000 (14:37 -0800)]
Update to new RS element API.
Jason Sams [Fri, 18 Dec 2009 02:46:09 +0000 (18:46 -0800)]
Update to new RS texture API.
Jason Sams [Wed, 16 Dec 2009 02:38:06 +0000 (18:38 -0800)]
Use indicies to reduce grass cpu usage. Fix aliasing of tips of grass.
Jason Sams [Tue, 15 Dec 2009 23:46:29 +0000 (15:46 -0800)]
Create struct for blade data.
Jason Sams [Tue, 15 Dec 2009 20:41:58 +0000 (12:41 -0800)]
Update grass to use fragment shaders.
Jason Sams [Fri, 11 Dec 2009 01:32:28 +0000 (17:32 -0800)]
Galaxy shader update.
Mike Cleron [Fri, 11 Dec 2009 07:43:53 +0000 (23:43 -0800)]
am
994a7e69: am
31e5ba9c: Merge change I9be01039 into eclair
Merge commit '
994a7e693cac3594d056b7920b7e3ebbb6f9f1fd'
* commit '
994a7e693cac3594d056b7920b7e3ebbb6f9f1fd':
Experiment with new scheduler
Mike Cleron [Fri, 11 Dec 2009 02:00:34 +0000 (18:00 -0800)]
am
31e5ba9c: Merge change I9be01039 into eclair
Merge commit '
31e5ba9c7f1205ce4413619752e1ad9e33c51ce1' into eclair-mr2
* commit '
31e5ba9c7f1205ce4413619752e1ad9e33c51ce1':
Experiment with new scheduler
Jason Sams [Fri, 11 Dec 2009 01:13:40 +0000 (17:13 -0800)]
am
fe32ea4b: am
0cd53063: Throttle basic live wallpapers.
Merge commit '
fe32ea4bc55a237af799876b700fe3de0550de10'
* commit '
fe32ea4bc55a237af799876b700fe3de0550de10':
Throttle basic live wallpapers.
Jason Sams [Fri, 11 Dec 2009 00:45:09 +0000 (16:45 -0800)]
am
0cd53063: Throttle basic live wallpapers.
Merge commit '
0cd53063b38ec8c7cc60a451ff11165b6787e05d' into eclair-mr2
* commit '
0cd53063b38ec8c7cc60a451ff11165b6787e05d':
Throttle basic live wallpapers.
Android (Google) Code Review [Thu, 10 Dec 2009 18:41:49 +0000 (10:41 -0800)]
Merge change I9be01039 into eclair
* changes:
Experiment with new scheduler
Mike Cleron [Thu, 10 Dec 2009 18:37:17 +0000 (10:37 -0800)]
Experiment with new scheduler
Jason Sams [Tue, 8 Dec 2009 23:46:00 +0000 (15:46 -0800)]
Throttle basic live wallpapers.
Daniel Sandler [Mon, 7 Dec 2009 22:58:12 +0000 (14:58 -0800)]
am
65a277d2: am
ecdb8f86: Merge change I789085a5 into eclair
Merge commit '
65a277d22c33a1bceb801be899e3594615f0d44f'
* commit '
65a277d22c33a1bceb801be899e3594615f0d44f':
Fix problems in NexusGL:
Daniel Sandler [Sat, 5 Dec 2009 18:24:13 +0000 (10:24 -0800)]
am
ecdb8f86: Merge change I789085a5 into eclair
Merge commit '
ecdb8f86740be44097c791c2b6dd2c31e35fa89e' into eclair-mr2
* commit '
ecdb8f86740be44097c791c2b6dd2c31e35fa89e':
Fix problems in NexusGL:
Android (Google) Code Review [Sat, 5 Dec 2009 18:21:26 +0000 (10:21 -0800)]
Merge change I789085a5 into eclair
* changes:
Fix problems in NexusGL:
Jason Sams [Fri, 4 Dec 2009 12:31:38 +0000 (04:31 -0800)]
am
1166a852: am
c27d6534: Fix nexus wallpaper so objects in use are not GCed.
Merge commit '
1166a852c5c24d8ae6094e4c62057e9ef59bc2ef'
* commit '
1166a852c5c24d8ae6094e4c62057e9ef59bc2ef':
Fix nexus wallpaper so objects in use are not GCed.
Mike Cleron [Fri, 4 Dec 2009 12:31:34 +0000 (04:31 -0800)]
am
18001863: am
af45d444:
2295787: Rewrite Nexus wallpaper in RenderScript
Merge commit '
180018631e3b28b60209d414a0d0edf3c6a4c8c4'
* commit '
180018631e3b28b60209d414a0d0edf3c6a4c8c4':
2295787: Rewrite Nexus wallpaper in RenderScript
Jason Sams [Fri, 4 Dec 2009 02:02:18 +0000 (18:02 -0800)]
am
c27d6534: Fix nexus wallpaper so objects in use are not GCed.
Merge commit '
c27d65349acd38f6ee8fd74bb01518062b0c0b0d' into eclair-mr2
* commit '
c27d65349acd38f6ee8fd74bb01518062b0c0b0d':
Fix nexus wallpaper so objects in use are not GCed.
Jason Sams [Fri, 4 Dec 2009 01:28:37 +0000 (17:28 -0800)]
Fix nexus wallpaper so objects in use are not GCed.
Daniel Sandler [Thu, 3 Dec 2009 16:28:35 +0000 (11:28 -0500)]
Fix problems in NexusGL:
* pulse has bad dithering & off-color pixels
* glow isn't smooth enough
* off-by-one error in pulse positioning code
(you can see it by tapping the wallpaper; the four pulses
do not launch symmetrically---the north and west pulses
have a 'head start' of 1 cell)
Change-Id: I789085a5ef73a1ea3ed36dbbcb61c405563b463c
Mike Cleron [Thu, 3 Dec 2009 08:10:56 +0000 (00:10 -0800)]
am
af45d444:
2295787: Rewrite Nexus wallpaper in RenderScript
Merge commit '
af45d444c61a510f2f477a2a7ec01b2bdce25910' into eclair-mr2
* commit '
af45d444c61a510f2f477a2a7ec01b2bdce25910':
2295787: Rewrite Nexus wallpaper in RenderScript
Mike Cleron [Wed, 2 Dec 2009 10:04:46 +0000 (02:04 -0800)]
2295787: Rewrite Nexus wallpaper in RenderScript
Eric Fischer [Wed, 2 Dec 2009 02:41:51 +0000 (18:41 -0800)]
am
7d04ef2a: am
8a6e2c9c: Mark token strings untranslatable so they don\'t accidentally get messed up.
Merge commit '
7d04ef2afa37c20f9bd72dc8f3bd8929e148f62f'
* commit '
7d04ef2afa37c20f9bd72dc8f3bd8929e148f62f':
Mark token strings untranslatable so they don't accidentally get messed up.
Eric Fischer [Wed, 2 Dec 2009 02:30:50 +0000 (18:30 -0800)]
am
8a6e2c9c: Mark token strings untranslatable so they don\'t accidentally get messed up.
Merge commit '
8a6e2c9c7682dcb69074d6e18e2006b9859abe1a' into eclair-mr2
* commit '
8a6e2c9c7682dcb69074d6e18e2006b9859abe1a':
Mark token strings untranslatable so they don't accidentally get messed up.
Eric Fischer [Wed, 2 Dec 2009 01:38:34 +0000 (17:38 -0800)]
am
bcf1351f: (-s ours) am
ef507081: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
bcf1351faefa60cd726b0faad8d816d2beef0b53'
* commit '
bcf1351faefa60cd726b0faad8d816d2beef0b53':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:11:54 +0000 (17:11 -0800)]
am
ef507081: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
ef507081d3e31ff8ce427edbc097ef052f2a5948' into eclair-mr2
* commit '
ef507081d3e31ff8ce427edbc097ef052f2a5948':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 21:06:06 +0000 (13:06 -0800)]
Mark token strings untranslatable so they don't accidentally get messed up.
Eric Fischer [Mon, 30 Nov 2009 19:41:36 +0000 (11:41 -0800)]
Import revised translations. DO NOT MERGE
Romain Guy [Tue, 24 Nov 2009 20:43:14 +0000 (12:43 -0800)]
Romain Guy [Tue, 24 Nov 2009 20:18:56 +0000 (12:18 -0800)]
am
97529663: Save about 700 kB of ROM.
Merge commit '
97529663e620501d8201ed6fbeaa520058e511c6' into eclair-mr2
* commit '
97529663e620501d8201ed6fbeaa520058e511c6':
Save about 700 kB of ROM.
Romain Guy [Tue, 24 Nov 2009 19:17:33 +0000 (11:17 -0800)]
Save about 700 kB of ROM.
Change-Id: I220e611b0adfc00ae7162aaba9f05edcd762c88f
Mike Cleron [Fri, 20 Nov 2009 20:13:03 +0000 (12:13 -0800)]
am
8efc0d43: am
5b219fce: Use 1024x1024 for background. Fix leaf Z-order.
Merge commit '
8efc0d435d7658b0dad78f6ab1a0bc35c91a08e1'
* commit '
8efc0d435d7658b0dad78f6ab1a0bc35c91a08e1':
Use 1024x1024 for background. Fix leaf Z-order.
Mike Cleron [Fri, 20 Nov 2009 20:06:05 +0000 (12:06 -0800)]
am
5b219fce: Use 1024x1024 for background. Fix leaf Z-order.
Merge commit '
5b219fcee2c52c4c47baf3ab4cc0404b10034999' into eclair-mr2
* commit '
5b219fcee2c52c4c47baf3ab4cc0404b10034999':
Use 1024x1024 for background. Fix leaf Z-order.
Mike Cleron [Fri, 20 Nov 2009 07:23:13 +0000 (23:23 -0800)]
Use 1024x1024 for background. Fix leaf Z-order.
Dianne Hackborn [Thu, 19 Nov 2009 19:15:58 +0000 (11:15 -0800)]
am
7f25e0b3: am
9d9a645b: Fix issue #
2271640: Fix wallpaper etc docs
Merge commit '
7f25e0b37441347d0f52a9b09879b1871b163c65'
* commit '
7f25e0b37441347d0f52a9b09879b1871b163c65':
Fix issue #
2271640: Fix wallpaper etc docs
Dianne Hackborn [Thu, 19 Nov 2009 19:08:35 +0000 (11:08 -0800)]
am
9d9a645b: Fix issue #
2271640: Fix wallpaper etc docs
Merge commit '
9d9a645b22a264e740b5a93ac1cddda594d36181' into eclair-mr2
* commit '
9d9a645b22a264e740b5a93ac1cddda594d36181':
Fix issue #
2271640: Fix wallpaper etc docs
Dianne Hackborn [Thu, 19 Nov 2009 02:21:54 +0000 (18:21 -0800)]
Fix issue #
2271640: Fix wallpaper etc docs
Track API changes.
Change-Id: If4a8a97395b4610a50e9f6a5308a99f2ab8c20e0
Romain Guy [Wed, 18 Nov 2009 20:30:13 +0000 (12:30 -0800)]
am
25821afa: am
10f19665: Disable See Through live wallpaper. Coolness must make way for correctness.
Merge commit '
25821afa056db40cb501e0bc00e98757153856bd'
* commit '
25821afa056db40cb501e0bc00e98757153856bd':
Disable See Through live wallpaper. Coolness must make way for correctness.
Romain Guy [Wed, 18 Nov 2009 20:25:19 +0000 (12:25 -0800)]
am
10f19665: Disable See Through live wallpaper. Coolness must make way for correctness.
Merge commit '
10f196655c3ac554a854cad819ee6509b2b49d4f' into eclair-mr2
* commit '
10f196655c3ac554a854cad819ee6509b2b49d4f':
Disable See Through live wallpaper. Coolness must make way for correctness.
Romain Guy [Wed, 18 Nov 2009 20:19:22 +0000 (21:19 +0100)]
Disable See Through live wallpaper. Coolness must make way for correctness.
Change-Id: If90c6cd9043b69d3182160a06e9a77db907334e8
Jason Sams [Tue, 17 Nov 2009 15:36:02 +0000 (07:36 -0800)]
am
8e2f5d5b: am
03dfdbac: Merge change I756f9749 into eclair
Merge commit '
8e2f5d5b757a915ada9bce8d66f15f782fb7b0a4'
* commit '
8e2f5d5b757a915ada9bce8d66f15f782fb7b0a4':
Switch to dt from frames for annimation.
Eric Fischer [Tue, 17 Nov 2009 15:35:59 +0000 (07:35 -0800)]
am
7277848f: (-s ours) am
a0fdcad4: (-s ours) Merge change I5677c576 into eclair
Merge commit '
7277848f64806c4d9fdfaf6855b8194669b9be97'
* commit '
7277848f64806c4d9fdfaf6855b8194669b9be97':
Import revised translations. DO NOT MERGE
OSDN Git Service
