OSDN Git Service
Scott Main [Wed, 12 Oct 2011 19:00:40 +0000 (12:00 -0700)]
am
c2916535: Merge "docs: add Fujitsu USB info bug
5427262" into ics-mr0
* commit '
c291653539fd0a8b6b73a1174aa80afdb62272e5':
docs: add Fujitsu USB info bug
5427262
Scott Main [Wed, 12 Oct 2011 18:19:17 +0000 (11:19 -0700)]
Merge "docs: add Fujitsu USB info bug
5427262" into ics-mr0
Peter Ng [Wed, 12 Oct 2011 18:15:29 +0000 (11:15 -0700)]
Merge "darker notification press state and divider"
Eino-Ville Talvala [Wed, 12 Oct 2011 17:40:11 +0000 (10:40 -0700)]
am
0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
* commit '
0a2735928030229b3340074eb11c2423342fda93':
Add video stabilization control to Camera parameters.
Eino-Ville Talvala [Wed, 12 Oct 2011 17:37:57 +0000 (10:37 -0700)]
Merge "Add video stabilization control to Camera parameters." into ics-mr0
Amith Yamasani [Wed, 12 Oct 2011 17:00:54 +0000 (10:00 -0700)]
am
421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
* commit '
421648ed06a2c944bc6a5fa866d461761533005b':
Backup owner info as part of settings backup. DO NOT MERGE.
Steve Block [Wed, 12 Oct 2011 17:00:48 +0000 (10:00 -0700)]
am
c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
* commit '
c0c394ee053c1b62da58247c431c20d5939c4ada':
Modify BrowserFrame.requestClientCert() to take the host and port as a String
Amith Yamasani [Wed, 12 Oct 2011 16:59:11 +0000 (09:59 -0700)]
Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
Steve Block [Wed, 12 Oct 2011 16:58:25 +0000 (09:58 -0700)]
Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
Gilles Debunne [Wed, 12 Oct 2011 16:51:17 +0000 (09:51 -0700)]
Merge "Bug
5385279: IOOB in createMisspelledSuggestionSpan"
Gilles Debunne [Wed, 12 Oct 2011 16:50:45 +0000 (09:50 -0700)]
Merge "Bug
5237623: word no longer underlined after replacement"
Robert Ly [Wed, 12 Oct 2011 16:50:31 +0000 (09:50 -0700)]
Merge "docs: restructure animation and add container doc"
Robert Ly [Wed, 12 Oct 2011 16:50:26 +0000 (09:50 -0700)]
Merge "docs: restructure graphics docs and add hw-acceleration docs"
Amith Yamasani [Wed, 12 Oct 2011 16:45:22 +0000 (09:45 -0700)]
Merge "Backup owner info as part of settings backup."
Jean-Michel Trivi [Wed, 12 Oct 2011 16:42:48 +0000 (09:42 -0700)]
am
49f61439: (-s ours) Merge "DO NOT MERGE Fix
5389442 RemoteControlClient javadoc" into ics-mr0
* commit '
49f61439db7f8960745b0a5664795b5a5ad31ef8':
DO NOT MERGE Fix
5389442 RemoteControlClient javadoc
Jean-Michel Trivi [Wed, 12 Oct 2011 16:40:17 +0000 (09:40 -0700)]
Merge "DO NOT MERGE Fix
5389442 RemoteControlClient javadoc" into ics-mr0
Jake Hamby [Wed, 12 Oct 2011 08:21:34 +0000 (01:21 -0700)]
am
34877877: Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
* commit '
34877877bb563e7e20600e6777cca4dc358a12d9':
Fix bug in CDMA WDP datagram handling (fixes incoming MMS).
Jake Hamby [Wed, 12 Oct 2011 08:10:28 +0000 (01:10 -0700)]
Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
Adam Powell [Wed, 12 Oct 2011 02:33:29 +0000 (19:33 -0700)]
am
35af3639: Merge "Fix bug
5173029 - make fast scroller aware of scrolling containers" into ics-mr0
* commit '
35af3639a169b1b8e5f4d96579795e5480080b52':
Fix bug
5173029 - make fast scroller aware of scrolling containers
Adam Powell [Wed, 12 Oct 2011 02:30:08 +0000 (19:30 -0700)]
Merge "Fix bug
5173029 - make fast scroller aware of scrolling containers" into ics-mr0
Svetoslav Ganov [Wed, 12 Oct 2011 01:41:05 +0000 (18:41 -0700)]
am
52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
* commit '
5276373430af24448324941af6b911d90a3ddd10':
Dragging in touch explore mode should not become exploring.
Svetoslav Ganov [Wed, 12 Oct 2011 01:39:36 +0000 (18:39 -0700)]
Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
Justin Ho [Wed, 12 Oct 2011 00:53:40 +0000 (17:53 -0700)]
Merge "Integrating updated system bar assets Bug:
5353986"
Jake Hamby [Wed, 12 Oct 2011 00:32:53 +0000 (17:32 -0700)]
am
c5b28bd0: Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0
* commit '
c5b28bd00dd1be682103275815f588870c6fec7d':
Change DCS of MO SMS to the correct value for UCS-2 encoding.
Jake Hamby [Wed, 12 Oct 2011 00:23:04 +0000 (17:23 -0700)]
Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0
Adam Powell [Tue, 11 Oct 2011 23:16:09 +0000 (16:16 -0700)]
am
acf7d982: Merge "Fix bug
5434403 - invalidation problem with seek bars at edges" into ics-mr0
* commit '
acf7d982ae981c039ec8445a30da91be0a4fbbc5':
Fix bug
5434403 - invalidation problem with seek bars at edges
Adam Powell [Tue, 11 Oct 2011 23:14:31 +0000 (16:14 -0700)]
Merge "Fix bug
5434403 - invalidation problem with seek bars at edges" into ics-mr0
Svetoslav Ganov [Tue, 11 Oct 2011 23:00:54 +0000 (16:00 -0700)]
Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API"
Michael Kolb [Tue, 11 Oct 2011 22:33:37 +0000 (15:33 -0700)]
am
f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0
* commit '
f0f7a9139b40e9b90a2981aa7aba49fa2c24ca1d':
Support spellcheck attribute in WebTextView
Michael Jurka [Tue, 11 Oct 2011 22:33:36 +0000 (15:33 -0700)]
am
78bbcd31: Merge "Refactoring loading of recent apps" into ics-mr0
* commit '
78bbcd31aac4e6744a00ee0a6bd6ac5cc1bec673':
Refactoring loading of recent apps
Adam Powell [Tue, 11 Oct 2011 22:33:33 +0000 (15:33 -0700)]
am
1a4c4334: Merge "Fix bug
5396097 - menu theme consistency" into ics-mr0
* commit '
1a4c4334f02152c96cfc71136dc31085826c6894':
Fix bug
5396097 - menu theme consistency
Jeff Brown [Tue, 11 Oct 2011 22:33:28 +0000 (15:33 -0700)]
am
58bf986c: Merge "Use ashmem for CursorWindows. Bug:
5332296" into ics-mr0
* commit '
58bf986c3e3948242e89654e6d59b97a21345582':
Use ashmem for CursorWindows. Bug:
5332296
Svetoslav Ganov [Tue, 11 Oct 2011 22:33:26 +0000 (15:33 -0700)]
am
a72a8063: (-s ours) Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
* commit '
a72a80632b07dd7faf0ca2a4a0eae2770b14caa6':
DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
Svetoslav Ganov [Tue, 11 Oct 2011 22:33:25 +0000 (15:33 -0700)]
am
52f7fcf8: (-s ours) Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
* commit '
52f7fcf844ffdf5f03bca58e58b1ee3e8cc1a4c5':
DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter.
Michael Kolb [Tue, 11 Oct 2011 22:25:22 +0000 (15:25 -0700)]
Merge "Support spellcheck attribute in WebTextView" into ics-mr0
Jean-Michel Trivi [Tue, 11 Oct 2011 22:24:15 +0000 (15:24 -0700)]
Merge "Fix
5389442 RemoteControlClient javadoc"
Michael Jurka [Tue, 11 Oct 2011 22:23:08 +0000 (15:23 -0700)]
Merge "Refactoring loading of recent apps" into ics-mr0
Adam Powell [Tue, 11 Oct 2011 22:07:36 +0000 (15:07 -0700)]
Merge "Fix bug
5396097 - menu theme consistency" into ics-mr0
Jeff Sharkey [Tue, 11 Oct 2011 21:54:08 +0000 (14:54 -0700)]
Merge "Update internal state when iface is removed."
Romain Guy [Tue, 11 Oct 2011 21:51:18 +0000 (14:51 -0700)]
Merge "Fix the build"
Romain Guy [Tue, 11 Oct 2011 21:10:10 +0000 (14:10 -0700)]
Merge "Check whether an AsyncTask is created/executed on a looper thread."
Romain Guy [Tue, 11 Oct 2011 21:07:15 +0000 (14:07 -0700)]
Merge "Correctly apply transforms when getting a TextureView's bitmap Bug #
5439406"
Jeff Brown [Tue, 11 Oct 2011 20:54:45 +0000 (13:54 -0700)]
Merge "Use ashmem for CursorWindows. Bug:
5332296" into ics-mr0
Svetoslav Ganov [Tue, 11 Oct 2011 20:54:28 +0000 (13:54 -0700)]
Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
Svetoslav Ganov [Tue, 11 Oct 2011 20:54:23 +0000 (13:54 -0700)]
Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
John Reck [Tue, 11 Oct 2011 20:49:59 +0000 (13:49 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Nick Pelly [Tue, 11 Oct 2011 19:39:46 +0000 (12:39 -0700)]
Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's."
Jeff Brown [Tue, 11 Oct 2011 19:35:05 +0000 (12:35 -0700)]
Merge "Don't log BlockGuard violations on ENG builds."
Daniel Sandler [Tue, 11 Oct 2011 19:01:15 +0000 (12:01 -0700)]
Merge "Stop enabling all disabled status bar features from GlobalActions."
Svetoslav Ganov [Tue, 11 Oct 2011 18:30:45 +0000 (11:30 -0700)]
Merge changes I67d080ab,Ia3d7a5ad
* changes:
AdapterView does not set setCurrentItemIndex in accessibility event.
AdapterView#isScrollableForAccessibility does not handle null adapter.
Jeff Brown [Mon, 10 Oct 2011 21:50:10 +0000 (14:50 -0700)]
Use ashmem for CursorWindows.
Bug:
5332296
The memory dealer introduces additional delays for reclaiming
the memory owned by CursorWindows because the Binder object must
be finalized. Using ashmem instead gives CursorWindow more
direct control over the lifetime of the shared memory region.
The provider now allocates the CursorWindows and returns them
to clients with a read-only protection bit set on the ashmem
region.
Improved the encapsulation of CursorWindow. Callers shouldn't
need to care about details like how string fields are allocated.
Removed the compile-time configuration of string and numeric
storage modes to remove some dead weight.
Change-Id: I07c2bc2a9c573d7e435dcaecd269d25ea9807acd
Ying Wang [Tue, 11 Oct 2011 17:01:39 +0000 (10:01 -0700)]
Merge "Remove non-module names from PRODUCT_PACKAGES"
The Android Open Source Project [Tue, 11 Oct 2011 11:29:26 +0000 (04:29 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ibd1dca227b44e13538ea0b9f6aea45d180a010d3
Mathias Agopian [Tue, 11 Oct 2011 05:21:57 +0000 (22:21 -0700)]
Merge "fix an issue where the screen could stay off"
Mathias Agopian [Tue, 11 Oct 2011 05:18:55 +0000 (22:18 -0700)]
fix an issue where the screen could stay off
this would happen when toggling on/off/on very fast, the screen
could stay black (while the panel is on).
Bug:
5429724
Change-Id: Ic8aa6aff066e6267923c0d47ef65e314e7bb6d41
Jim Miller [Tue, 11 Oct 2011 05:06:07 +0000 (22:06 -0700)]
Merge "Fix
5386408: Fix battery state information propagation in Lock Screen"
The Android Automerger [Tue, 11 Oct 2011 03:38:59 +0000 (20:38 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jim Miller [Tue, 11 Oct 2011 03:06:29 +0000 (20:06 -0700)]
Merge "Fix
5249234: Add contentDescription to buttons on transport control on lock screen."
Dianne Hackborn [Tue, 11 Oct 2011 02:16:52 +0000 (19:16 -0700)]
Merge "Keep screen brightness at 0 while waiting for the UI to be displayed."
Dianne Hackborn [Tue, 11 Oct 2011 02:15:32 +0000 (19:15 -0700)]
Merge "Fix issue #
5435470: SharedPreferencesImpl should read from file..."
Mathias Agopian [Tue, 11 Oct 2011 02:05:23 +0000 (19:05 -0700)]
Merge "Fix screen off animation when in landscape"
Mathias Agopian [Tue, 11 Oct 2011 02:02:07 +0000 (19:02 -0700)]
Fix screen off animation when in landscape
Change-Id: I4bc5b12d7a64a4bf8b9a851594be4d60b790d1ed
Jeff Sharkey [Tue, 11 Oct 2011 00:47:46 +0000 (17:47 -0700)]
Merge "Over-limit within handful of MTU's, update assets."
Svetoslav Ganov [Tue, 11 Oct 2011 00:39:54 +0000 (17:39 -0700)]
Merge "Adding accessibility support to the pattern lock."
Jake Hamby [Tue, 11 Oct 2011 00:34:15 +0000 (17:34 -0700)]
Merge "Add "format" extra to SMS delivery report intents."
Christopher Tate [Tue, 11 Oct 2011 00:27:05 +0000 (17:27 -0700)]
Merge "Gracefully handle "needs init" transport errors at finish"
Justin Ho [Mon, 10 Oct 2011 23:46:35 +0000 (16:46 -0700)]
Resolved conflicts for merge of
83cf0313 to master
Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344
Amith Yamasani [Mon, 10 Oct 2011 23:34:34 +0000 (16:34 -0700)]
Merge "Don't show icon for power-off confirmation dialog."
Hiroshi Lockheimer [Mon, 10 Oct 2011 23:34:23 +0000 (16:34 -0700)]
Merge "Ensuring previous sounds are named correctly Bug:
5416299" into ics-factoryrom
Jim Miller [Mon, 10 Oct 2011 23:30:06 +0000 (16:30 -0700)]
Merge "Fix
5406921: Register for receiving phone state changes when KGSVM gets created."
Steven Ross [Mon, 10 Oct 2011 23:28:36 +0000 (16:28 -0700)]
Merge "Fixes
5429869 Only displaying FaceUnlock when window is focused"
Dianne Hackborn [Mon, 10 Oct 2011 23:08:05 +0000 (16:08 -0700)]
Merge "Fix issue #
5405788: Device continuously opening and closing..."
Svetoslav Ganov [Mon, 10 Oct 2011 23:05:53 +0000 (16:05 -0700)]
Merge "Accessibility text changed event text not populated."
The Android Open Source Project [Mon, 10 Oct 2011 22:39:41 +0000 (15:39 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I8642724549283dbcd3d104a35d5c659e5591682e
Romain Guy [Mon, 10 Oct 2011 22:24:06 +0000 (15:24 -0700)]
Merge "Don't call saveLayer() when it's not required Bug #
5435653"
James Dong [Mon, 10 Oct 2011 22:22:04 +0000 (15:22 -0700)]
Merge "Support AMR as a file type so that it can be imported into movie studio"
Gilles Debunne [Mon, 10 Oct 2011 22:18:35 +0000 (15:18 -0700)]
Merge "Bug
5437846: Crash in SpellChecker"
Justin Ho [Mon, 10 Oct 2011 21:43:35 +0000 (14:43 -0700)]
am
832c5485: Merge "Update screen lock/unlock sound Bug:
5416299" into ics-factoryrom
* commit '
832c54857519c405d7aa0d3bccfe74078f1a1abf':
Update screen lock/unlock sound Bug:
5416299
Justin Ho [Mon, 10 Oct 2011 21:43:33 +0000 (14:43 -0700)]
am
17249d64: Adding Pollux notification tone Bug:
5416299
* commit '
17249d6472b85e669c1b854fc413888e78af6def':
Adding Pollux notification tone Bug:
5416299
Amith Yamasani [Mon, 10 Oct 2011 21:37:25 +0000 (14:37 -0700)]
am
9e7caa0b: Tie the lockscreen sounds with the ringer volume.
* commit '
9e7caa0b270f8cea1fd2a61c5bffcf0df1037970':
Tie the lockscreen sounds with the ringer volume.
Marco Nelissen [Mon, 10 Oct 2011 21:37:23 +0000 (14:37 -0700)]
am
803ce0f9: (-s ours) Use SoundPool instead of Ringtone.
* commit '
803ce0f9fdd455dc4ec0c6ad9c141c76315fd4da':
Use SoundPool instead of Ringtone.
Romain Guy [Mon, 10 Oct 2011 21:07:10 +0000 (14:07 -0700)]
Merge "Make sure we have the correct GL context when grabbing a bitmap Bug #
5427391"
Jeff Brown [Mon, 10 Oct 2011 21:06:09 +0000 (14:06 -0700)]
Merge "Fix ownership of CursorWindows across processes. Bug:
5332296"
Derek Sollenberger [Mon, 10 Oct 2011 20:28:01 +0000 (13:28 -0700)]
Merge "Delay sending Plugin Draw event until the surface is ready."
John Reck [Mon, 10 Oct 2011 20:06:54 +0000 (13:06 -0700)]
Merge "Improve loadData JavaDoc"
Andreas Huber [Mon, 10 Oct 2011 19:45:02 +0000 (12:45 -0700)]
Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater"
Mathias Agopian [Mon, 10 Oct 2011 19:38:16 +0000 (12:38 -0700)]
Merge "enable EGL_IMG_context_priority for the omap4 platform"
Jeff Brown [Mon, 10 Oct 2011 18:48:58 +0000 (11:48 -0700)]
Merge "Fix Cursor leak in SettingsBackupAgent. Bug:
5434060"
Jeff Brown [Mon, 10 Oct 2011 18:48:53 +0000 (11:48 -0700)]
Merge "Always log StrictMode violations on ENG builds."
Jeff Brown [Mon, 10 Oct 2011 18:48:49 +0000 (11:48 -0700)]
Merge "Implement CloseGuard in ContentResolver."
Jeff Brown [Mon, 10 Oct 2011 18:48:39 +0000 (11:48 -0700)]
Merge "Clean up handrolled Binder proxies. Bug:
5332296"
Adam Powell [Mon, 10 Oct 2011 18:19:35 +0000 (11:19 -0700)]
Merge "Bug
5430909 - Overlay action bar should consume hover events"
Gilles Debunne [Mon, 10 Oct 2011 17:54:51 +0000 (10:54 -0700)]
Merge "Bug
5250788: LatinIME slows down as amount of Text increases"
Eric Fischer [Mon, 10 Oct 2011 17:29:17 +0000 (10:29 -0700)]
Merge "Import revised translations."
Justin Ho [Mon, 10 Oct 2011 17:08:55 +0000 (10:08 -0700)]
Merge "Update screen lock/unlock sound Bug:
5416299" into ics-factoryrom
Ben Murdoch [Mon, 10 Oct 2011 16:51:31 +0000 (09:51 -0700)]
Merge "Size Autocomplete drop down items correctly."
satok [Mon, 10 Oct 2011 08:08:27 +0000 (01:08 -0700)]
Merge "Add a hidden flag for the auto correction indicator in SuggestionSpan"
satok [Mon, 10 Oct 2011 07:59:41 +0000 (00:59 -0700)]
Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME"
Dianne Hackborn [Mon, 10 Oct 2011 00:14:49 +0000 (17:14 -0700)]
Merge "Calling close() outside of the main thread breaks stuff."
Jeff Sharkey [Mon, 10 Oct 2011 00:08:23 +0000 (17:08 -0700)]
Merge "Move battery stats to xt_qtaguid for data stats."