OSDN Git Service
Dharmaray Kundargi [Wed, 2 Feb 2011 19:14:33 +0000 (11:14 -0800)]
Merge "Fix issue
3408285 Crash while generating KenBurns" into honeycomb
Carl Shapiro [Wed, 2 Feb 2011 18:55:28 +0000 (10:55 -0800)]
Merge "Fix the naming of the heap growth limit property." into honeycomb
Nemmara Venkateswaran [Wed, 2 Feb 2011 17:27:10 +0000 (09:27 -0800)]
Merge "Fix for issue
3370023 : Wrong aspect ratio in overlay" into honeycomb
Justin Ho [Wed, 2 Feb 2011 16:33:45 +0000 (08:33 -0800)]
Merge "Removing red cross from hdpi emergency symbol" into honeycomb
Justin Ho [Wed, 2 Feb 2011 16:08:15 +0000 (08:08 -0800)]
Merge "Low battery notification sound update, alarm sound update" into honeycomb
Romain Guy [Wed, 2 Feb 2011 08:47:21 +0000 (00:47 -0800)]
Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #
3413433" into honeycomb
Romain Guy [Wed, 2 Feb 2011 07:05:35 +0000 (23:05 -0800)]
Merge "Update layers based on the dirty region. Bug #
3413433" into honeycomb
Romain Guy [Wed, 2 Feb 2011 06:02:00 +0000 (22:02 -0800)]
Merge "New API to let apps draw without layers. Bug #
3413433" into honeycomb
Wink Saville [Wed, 2 Feb 2011 05:02:10 +0000 (21:02 -0800)]
Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
Michael Jurka [Wed, 2 Feb 2011 04:53:13 +0000 (20:53 -0800)]
Merge "add missing call to superclass method" into honeycomb
Ben Murdoch [Wed, 2 Feb 2011 02:37:43 +0000 (18:37 -0800)]
Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb
Brian Muramatsu [Wed, 2 Feb 2011 02:09:36 +0000 (18:09 -0800)]
Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb
Jaikumar Ganesh [Wed, 2 Feb 2011 01:06:56 +0000 (17:06 -0800)]
Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb
Dianne Hackborn [Wed, 2 Feb 2011 00:50:44 +0000 (16:50 -0800)]
Merge "Whoops, need to put this check back." into honeycomb
Dianne Hackborn [Wed, 2 Feb 2011 00:23:47 +0000 (16:23 -0800)]
Merge "Make image wallpaper use a big surface." into honeycomb
Wink Saville [Tue, 1 Feb 2011 23:24:31 +0000 (15:24 -0800)]
Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb
Paul Westbrook [Tue, 1 Feb 2011 23:07:40 +0000 (15:07 -0800)]
Merge "Enable retrieving default download manager settings" into honeycomb
Romain Guy [Tue, 1 Feb 2011 22:00:35 +0000 (14:00 -0800)]
Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #
3410819" into honeycomb
Mike Cleron [Tue, 1 Feb 2011 22:00:09 +0000 (14:00 -0800)]
Merge "Assume ARGB_8888 for unknown configs. Bug #
3327175" into honeycomb
Dheeraj Sharma [Tue, 1 Feb 2011 17:00:42 +0000 (09:00 -0800)]
Merge "Fix for issue
3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb
Justin Ho [Tue, 1 Feb 2011 15:28:04 +0000 (07:28 -0800)]
Merge "Updating Froyo framework assets to Holo style Bug:
3362749" into honeycomb
Mike Cleron [Tue, 1 Feb 2011 07:22:36 +0000 (23:22 -0800)]
Merge "Remove MeasuredText debug messages" into honeycomb
Justin Ho [Tue, 1 Feb 2011 07:20:24 +0000 (23:20 -0800)]
Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb
Justin Ho [Tue, 1 Feb 2011 07:16:58 +0000 (23:16 -0800)]
Merge "Updated notification and effects for Honeycomb Bug:
3389139" into honeycomb
Joe Onorato [Tue, 1 Feb 2011 06:16:02 +0000 (22:16 -0800)]
Merge "When the data flows, the icon glows." into honeycomb
Dheeraj Sharma [Tue, 1 Feb 2011 06:06:10 +0000 (22:06 -0800)]
Merge "Fix for issue
3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb
Romain Guy [Tue, 1 Feb 2011 06:05:34 +0000 (22:05 -0800)]
Merge "Don't convert 4444 images to 565. Bug #
3327175" into honeycomb
Justin Ho [Tue, 1 Feb 2011 04:59:46 +0000 (20:59 -0800)]
Merge "Fix bug
3410400 - Holo rating bar assets" into honeycomb
Jason parks [Tue, 1 Feb 2011 03:48:24 +0000 (19:48 -0800)]
Merge "Show the encryption boot animation." into honeycomb
Chet Haase [Tue, 1 Feb 2011 03:08:28 +0000 (19:08 -0800)]
Merge "Fix invalidation issue with actionbar items" into honeycomb
Dharmaray Kundargi [Tue, 1 Feb 2011 03:01:13 +0000 (19:01 -0800)]
Merge "Fix issue
3408285. Fix issue in Thread safe in Java." into honeycomb
Justin Ho [Tue, 1 Feb 2011 02:32:20 +0000 (18:32 -0800)]
Merge "Updated notification panel alpha" into honeycomb
Gilles Debunne [Tue, 1 Feb 2011 02:14:05 +0000 (18:14 -0800)]
Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb
Tadashi G. Takaoka [Tue, 1 Feb 2011 02:04:11 +0000 (18:04 -0800)]
Merge "Update hard keyboard status on closing input methods panel" into honeycomb
Jeff Brown [Tue, 1 Feb 2011 01:45:56 +0000 (17:45 -0800)]
Merge "Fix keyboard hidden flag." into honeycomb
Dianne Hackborn [Tue, 1 Feb 2011 01:41:09 +0000 (17:41 -0800)]
Merge "Do not check features in PackageManagerService" into honeycomb
Eric Fischer [Tue, 1 Feb 2011 01:27:30 +0000 (17:27 -0800)]
Merge "Import revised translations. DO NOT MERGE. Bug
3394542" into honeycomb
satok [Tue, 1 Feb 2011 00:53:05 +0000 (16:53 -0800)]
Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb
Justin Ho [Tue, 1 Feb 2011 00:36:09 +0000 (16:36 -0800)]
Merge "Updating notification title close asset" into honeycomb
Andreas Huber [Tue, 1 Feb 2011 00:23:27 +0000 (16:23 -0800)]
Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb
Gilles Debunne [Tue, 1 Feb 2011 00:22:25 +0000 (16:22 -0800)]
Merge "Patches for the Paste window behavior." into honeycomb
Svetoslav Ganov [Tue, 1 Feb 2011 00:11:59 +0000 (16:11 -0800)]
Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
Adam Powell [Tue, 1 Feb 2011 00:11:51 +0000 (16:11 -0800)]
Merge "Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
Gilles Debunne [Mon, 31 Jan 2011 23:29:56 +0000 (15:29 -0800)]
Merge "Hint text is visible when using center gravity." into honeycomb
Raphael [Mon, 31 Jan 2011 22:30:28 +0000 (14:30 -0800)]
Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
Justin Ho [Mon, 31 Jan 2011 22:26:20 +0000 (14:26 -0800)]
Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
Jamie Gennis [Mon, 31 Jan 2011 22:11:26 +0000 (14:11 -0800)]
Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
Jamie Gennis [Mon, 31 Jan 2011 21:38:27 +0000 (13:38 -0800)]
Merge "Fix a multithreading bug in libagl's EGL." into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 21:37:50 +0000 (13:37 -0800)]
Merge "Fix issue #
3408542: "resizeable" attribute required to get out of compat mode" into honeycomb
Gilles Debunne [Mon, 31 Jan 2011 20:01:34 +0000 (12:01 -0800)]
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
Daniel Sandler [Mon, 31 Jan 2011 19:46:57 +0000 (11:46 -0800)]
Merge "Alignment in the title area of the notification panel." into honeycomb
Joe Onorato [Mon, 31 Jan 2011 19:25:06 +0000 (11:25 -0800)]
Merge "Mask out the non public bits, not the public ones." into honeycomb
Gilles Debunne [Mon, 31 Jan 2011 19:10:53 +0000 (11:10 -0800)]
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
Jeff Hamilton [Mon, 31 Jan 2011 19:01:07 +0000 (11:01 -0800)]
Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
Daniel Sandler [Mon, 31 Jan 2011 17:04:32 +0000 (09:04 -0800)]
Merge "Kill spurious animations when vetoing notifications." into honeycomb
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:47:12 +0000 (08:47 -0800)]
Merge "Fix hardware keyboard switch listener" into honeycomb
Wink Saville [Mon, 31 Jan 2011 07:12:35 +0000 (23:12 -0800)]
Merge "Add debug for tracking bug
3404006." into honeycomb
Dheeraj Sharma [Mon, 31 Jan 2011 02:12:25 +0000 (18:12 -0800)]
Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 01:56:25 +0000 (17:56 -0800)]
Merge "I declare settings panel icon VICTORY!" into honeycomb
John Reck [Mon, 31 Jan 2011 00:55:23 +0000 (16:55 -0800)]
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
Dharmaray Kundargi [Mon, 31 Jan 2011 00:32:07 +0000 (16:32 -0800)]
Merge "Merging the same files on top of tree." into honeycomb
Adam Powell [Mon, 31 Jan 2011 00:12:56 +0000 (16:12 -0800)]
Merge "Fix bug
3405899 - android.view.WindowManager$BadTokenException" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 00:01:36 +0000 (16:01 -0800)]
Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 00:00:52 +0000 (16:00 -0800)]
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
Jamie Gennis [Sun, 30 Jan 2011 23:59:36 +0000 (15:59 -0800)]
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
Gilles Debunne [Sun, 30 Jan 2011 23:49:38 +0000 (15:49 -0800)]
Merge "Auto-clearing setError popup" into honeycomb
Dheeraj Sharma [Sun, 30 Jan 2011 23:20:49 +0000 (15:20 -0800)]
Merge "Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
Dheeraj Sharma [Sun, 30 Jan 2011 23:08:12 +0000 (15:08 -0800)]
Merge "
3404665 Preview window is blank after returning from playing exported movie" into honeycomb
Jamie Gennis [Sun, 30 Jan 2011 23:00:44 +0000 (15:00 -0800)]
Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
Daniel Sandler [Sun, 30 Jan 2011 21:36:47 +0000 (13:36 -0800)]
Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb
Joe Onorato [Sun, 30 Jan 2011 21:18:16 +0000 (13:18 -0800)]
Merge changes I09e8c4eb,I91a0e05f into honeycomb
* changes:
Use a DateFormat that fits.
Update the network info when the configuration changes.
The Android Open Source Project [Sun, 30 Jan 2011 20:40:32 +0000 (12:40 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
Jeff Brown [Sun, 30 Jan 2011 20:07:49 +0000 (12:07 -0800)]
Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
Joe Malin [Sun, 30 Jan 2011 17:45:59 +0000 (09:45 -0800)]
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
Daniel Sandler [Sun, 30 Jan 2011 06:37:13 +0000 (22:37 -0800)]
Merge "Fix broken intitial notification panel animation." into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 06:27:16 +0000 (22:27 -0800)]
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.
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:32:04 +0000 (14:32 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:59:11 +0000 (12:59 -0800)]
Merge
6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
Jason parks [Sat, 29 Jan 2011 20:02:19 +0000 (12:02 -0800)]
Merge "Update the encryption password when the device password is changed." into honeycomb
Eric Fischer [Sat, 29 Jan 2011 19:25:30 +0000 (11:25 -0800)]
am
5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Dirk Dougherty [Sat, 29 Jan 2011 19:16:13 +0000 (11:16 -0800)]
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.
Andreas Huber [Sat, 29 Jan 2011 19:16:07 +0000 (11:16 -0800)]
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.
Jean-Baptiste Queru [Sat, 29 Jan 2011 19:03:55 +0000 (11:03 -0800)]
Merge
0ef57993 from gingerbread
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
Jim Miller [Sat, 29 Jan 2011 19:00:28 +0000 (11:00 -0800)]
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]
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:57:48 +0000 (10:57 -0800)]
Merge
d350dc04 from gingerbread
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
Eric Fischer [Sat, 29 Jan 2011 18:40:17 +0000 (10:40 -0800)]
am
3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
Nick Pelly [Sat, 29 Jan 2011 18:40:07 +0000 (10:40 -0800)]
am
21d0a173: Fix build - javadoc.
* commit '
21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
Scott Main [Sat, 29 Jan 2011 18:40:01 +0000 (10:40 -0800)]
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
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:38:09 +0000 (10:38 -0800)]
Merge
eab0e97b from gingerbread
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
Robert Greenwalt [Sat, 29 Jan 2011 18:26:33 +0000 (10:26 -0800)]
am
89a54408: (-s ours) Merge "Update networktype before sending state change." into gingerbread
* commit '
89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
Dirk Dougherty [Sat, 29 Jan 2011 18:16:14 +0000 (10:16 -0800)]
am
591a5f86: Doc change: fix adt archive filename.
* commit '
591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:10:02 +0000 (10:10 -0800)]
Merge
ba3dd323 from gingerbread
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
Scott Main [Sat, 29 Jan 2011 17:59:33 +0000 (09:59 -0800)]
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
Andreas Huber [Sat, 29 Jan 2011 17:55:13 +0000 (09:55 -0800)]
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.
Dianne Hackborn [Sat, 29 Jan 2011 17:54:53 +0000 (09:54 -0800)]
am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Sat, 29 Jan 2011 17:54:41 +0000 (09:54 -0800)]
am
2ba92c71: (-s ours) do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
Kenny Root [Sat, 29 Jan 2011 17:48:07 +0000 (09:48 -0800)]
am
138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '
138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:45:41 +0000 (09:45 -0800)]
Merge
c33acae9 from gingerbread
Change-Id: I52b5045cbef6e4927f86830498050977b2829859
Mathias Agopian [Sat, 29 Jan 2011 17:40:51 +0000 (09:40 -0800)]
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)