Commit Graph

27060 Commits

Author SHA1 Message Date
Dianne Hackborn
62dc79e399 Merge "Do not check features in PackageManagerService" into honeycomb 2011-01-31 17:41:09 -08:00
Eric Fischer
358f38581e Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 2011-01-31 17:27:30 -08:00
satok
7fc7b71d5a Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb 2011-01-31 16:53:05 -08:00
Justin Ho
4ace15d381 Merge "Updating notification title close asset" into honeycomb 2011-01-31 16:36:09 -08:00
Andreas Huber
f54f42694c Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb 2011-01-31 16:23:27 -08:00
Gilles Debunne
3736bef0a8 Merge "Patches for the Paste window behavior." into honeycomb 2011-01-31 16:22:25 -08:00
Svetoslav Ganov
0428e5da83 Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb 2011-01-31 16:11:59 -08:00
Adam Powell
0ab0c9b8b7 Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb 2011-01-31 16:11:51 -08:00
Gilles Debunne
ae2c5a5959 Merge "Hint text is visible when using center gravity." into honeycomb 2011-01-31 15:29:56 -08:00
Raphael
7e9b10c923 Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb 2011-01-31 14:30:28 -08:00
Justin Ho
f96f836ac6 Merge "Updated fallback sound for Honeycomb tablet" into honeycomb 2011-01-31 14:26:20 -08:00
Jamie Gennis
1aac40d853 Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb 2011-01-31 14:11:26 -08:00
Jamie Gennis
88d0a44358 Merge "Fix a multithreading bug in libagl's EGL." into honeycomb 2011-01-31 13:38:27 -08:00
Dianne Hackborn
8cb595fa55 Merge "Fix issue #3408542: "resizeable" attribute required to get out of compat mode" into honeycomb 2011-01-31 13:37:50 -08:00
Gilles Debunne
f925609153 Merge "Tabs are resized to make sure they fit in their parent." into honeycomb 2011-01-31 12:01:34 -08:00
Daniel Sandler
b729cd2692 Merge "Alignment in the title area of the notification panel." into honeycomb 2011-01-31 11:46:57 -08:00
Joe Onorato
1e08783fe8 Merge "Mask out the non public bits, not the public ones." into honeycomb 2011-01-31 11:25:06 -08:00
Gilles Debunne
43ddfd8e35 Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb 2011-01-31 11:10:53 -08:00
Jeff Hamilton
0f2c4b92a9 Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb 2011-01-31 11:01:07 -08:00
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