Daniel Sandler
ff8d86bf1d
Merge "Kill spurious animations when vetoing notifications." into honeycomb
2011-01-31 09:04:32 -08:00
Tadashi G. Takaoka
ea8e520569
Merge "Fix hardware keyboard switch listener" into honeycomb
2011-01-31 08:47:12 -08:00
Wink Saville
836f90b2b5
Merge "Add debug for tracking bug 3404006." into honeycomb
2011-01-30 23:12:35 -08:00
Dheeraj Sharma
efea8c43d9
Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
2011-01-30 18:12:25 -08:00
Joe Onorato
581a0f83b6
Merge "I declare settings panel icon VICTORY!" into honeycomb
2011-01-30 17:56:25 -08:00
John Reck
50b556ea0e
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
2011-01-30 16:55:23 -08:00
Dharmaray Kundargi
af0bb2a24b
Merge "Merging the same files on top of tree." into honeycomb
2011-01-30 16:32:07 -08:00
Adam Powell
648b6f41ed
Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb
2011-01-30 16:12:56 -08:00
Dianne Hackborn
bf150ab172
Merge "Fix issue #3404571 : Commit final APIs" into honeycomb
2011-01-30 16:01:36 -08:00
Joe Onorato
eceabb02be
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
2011-01-30 16:00:52 -08:00
Jamie Gennis
2076f35549
Fix a multithreading bug in libagl's EGL.
...
The bug caused libagl to return 0 from eglGetError if an EGL error value
(including EGL_SUCCESS) was set on a different thread but not yet on the
current thread.
Bug: 3403756
Change-Id: Ifd965091d116745c2e22c121151ade9e78eb14c6
2011-01-30 15:59:36 -08:00
Gilles Debunne
a8abeba7c6
Merge "Auto-clearing setError popup" into honeycomb
2011-01-30 15:49:38 -08:00
Dheeraj Sharma
0c4a66082b
Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
2011-01-30 15:20:49 -08:00
Dheeraj Sharma
a1ff4e5645
Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb
2011-01-30 15:08:12 -08:00
Jamie Gennis
da04384f18
Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
2011-01-30 15:00:44 -08:00
Daniel Sandler
5646744581
Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb
2011-01-30 13:36:47 -08:00
Joe Onorato
82b4f8b396
Merge changes I09e8c4eb,I91a0e05f into honeycomb
...
* changes:
Use a DateFormat that fits.
Update the network info when the configuration changes.
2011-01-30 13:18:16 -08:00
The Android Open Source Project
b36560f33e
Mass merge from gingerbread - do not merge
...
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Jeff Brown
ce94d2db16
Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
2011-01-30 12:07:49 -08:00
Joe Malin
c172ee845a
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
2011-01-30 09:45:59 -08:00
Daniel Sandler
9477e08a9d
Merge "Fix broken intitial notification panel animation." into honeycomb
2011-01-29 22:37:13 -08:00
Dianne Hackborn
e2acfbeb83
am c12cdda9: (-s ours) Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
...
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
2011-01-29 22:27:16 -08:00
Dianne Hackborn
a7ba815307
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
2011-01-29 22:20:05 -08:00
Jean-Baptiste Queru
0fffe1b208
am 1358b6a4: Tweak to make merges easier
...
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
2011-01-29 14:32:04 -08:00
Jean-Baptiste Queru
39e41351f0
Merge 6b739dc7 from gingerbread
...
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -08:00
Jason parks
9f94e2cedc
Merge "Update the encryption password when the device password is changed." into honeycomb
2011-01-29 12:02:19 -08:00
Eric Fischer
ed22221952
am 5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
2011-01-29 11:25:30 -08:00
Dirk Dougherty
81e4229454
am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
...
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
2011-01-29 11:16:13 -08:00
Andreas Huber
7d56d0403b
am b6c2e2b4: (-s ours) DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
...
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
2011-01-29 11:16:07 -08:00
Jean-Baptiste Queru
d56d131095
Merge 0ef57993 from gingerbread
...
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
2011-01-29 11:04:41 -08:00
Jim Miller
d53a94a93b
am 226e5756: (-s ours) Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
...
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
2011-01-29 11:00:28 -08:00
Jean-Baptiste Queru
da285cf140
Merge d350dc04 from gingerbread
...
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
2011-01-29 10:57:48 -08:00
Eric Fischer
17e93c8c67
am 3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
2011-01-29 10:40:17 -08:00
Nick Pelly
368e77b240
am 21d0a173: Fix build - javadoc.
...
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
2011-01-29 10:40:07 -08:00
Scott Main
e093a7bfbe
am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
...
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 10:40:01 -08:00
Jean-Baptiste Queru
8e5bb47d02
Merge eab0e97b from gingerbread
...
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
2011-01-29 10:38:09 -08:00
Robert Greenwalt
4164387e86
am 89a54408: (-s ours) Merge "Update networktype before sending state change." into gingerbread
...
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
2011-01-29 10:26:33 -08:00
Dirk Dougherty
15bfd7b15a
am 591a5f86: Doc change: fix adt archive filename.
...
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
2011-01-29 10:16:14 -08:00
Jean-Baptiste Queru
c570aad4a0
Merge ba3dd323 from gingerbread
...
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
2011-01-29 10:11:06 -08:00
Scott Main
26a2a016c0
am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-29 09:59:33 -08:00
Andreas Huber
713ed42e3a
am 2dce338e: (-s ours) DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-29 09:55:13 -08:00
Dianne Hackborn
8ae2d642e6
am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-29 09:54:53 -08:00
Jean-Michel Trivi
4e486242d6
am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master
...
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2011-01-29 09:54:41 -08:00
Kenny Root
1399426de9
am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
ad1e202aef
Merge c33acae9 from gingerbread
...
Change-Id: I52b5045cbef6e4927f86830498050977b2829859
2011-01-29 09:45:41 -08:00
Mathias Agopian
7e857823df
am 239fd805: (-s ours) Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
...
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-29 09:40:51 -08:00
Mathias Agopian
73e4ee6289
am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
...
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-29 09:40:34 -08:00
Mathias Agopian
c9682070f0
am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
...
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-29 09:40:25 -08:00
Mathias Agopian
13c0c9559d
am 043a3cdd: (-s ours) Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
...
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-29 09:40:14 -08:00
Mathias Agopian
8b770ca695
am d3fcd0a1: (-s ours) Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
...
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-29 09:40:06 -08:00