Merge commit 'dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp
* commit 'dc2e5208e2b448a2c481d726818de79ea6a49783':
Do not release the wifi lock if the screen is off.
Bug 3064925
Instead of always passing the menu item to the original TextView, do that only
for the 'Select word' option. More ExtractEditText magic, but this ZBB so...
Change-Id: Ic4cb0526dbb9711e2f13a916b997f480307dcad1
Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp
* commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread
* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9' into gingerbread-plus-aosp
* commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9':
Other improvements to text cursor movement.
Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp
* commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd':
DO NOT MERGE Limit the height of the pull glow.
Event when the user keeps pulling, should NEVER get bigger than
the max height (~2list items tall).
Fixes b/3074337 Overscroll glow can be stretched indefinitely
Change-Id: Ifc30d4c907d432faf9ee10ddc20bcc8f50b21f81
Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp
* commit '3d265b5775a74b1d5eb726238f13cf63e8465594':
docs: a few style adjustments to admin doc
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread
* commit '50f86c65206072be0ca924f03b8d460365199bcd':
docs: a few style adjustments to admin doc
Merge commit '7255288755661587958d384338d4808e76959d86' into gingerbread-plus-aosp
* commit '7255288755661587958d384338d4808e76959d86':
docs: remove old "new" tags from side nav
Merge commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread
* commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
docs: remove old "new" tags from side nav
Paste happened on pressed position instead of current cursor location
when triggered by a long touch.
Change-Id: I86900f2bbb93390d3efa756aeebb424c4ae7e19b
Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp
* commit 'beffefa24f398b610d58dd583d9f5613dc529c28':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
Merge commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4' into gingerbread-plus-aosp
* commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4':
docs: new web apps dev guides
Merge commit '65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread
* commit '65e62f4f908394fc469cf535fef7c16035a428a2':
docs: new web apps dev guides
Make a member final, line up some comments, and also cache the
expected stat size, not just the mtime.
Change-Id: Ifcc37bd3ab99787280e506deb682200a16da512e
Merge commit '62d8874eb74045b37140857ea3b31f198f0adffa' into gingerbread-plus-aosp
* commit '62d8874eb74045b37140857ea3b31f198f0adffa':
Fix retaining of granted permissions when updating of system app.
Merge commit 'db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp
* commit 'db56b9bd39e739474684987b83f386f50596aa5d':
Maybe fix#3076572: phone process crashes in SipService, trying to get wifi lock
Merge commit 'd8d60da616343b3520b666c385d0005db860be83' into gingerbread-plus-aosp
* commit 'd8d60da616343b3520b666c385d0005db860be83':
Update DownloadManager API to support bulk actions.
WifiService needs to keep the calling identity cleared while
it is doing all of its internal work.
Change-Id: I2bd720e26efcf5ad5839693307d61e51f0658ace
This includes querying by ID, removing and restarting downloads (the
latter is not a public API). The methods all use varargs to support
this without undue syntactic pain.
Change-Id: I768005c539d2395cf26587d3a8c425cd01ad9cd2
Merge commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead' into gingerbread-plus-aosp
* commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead':
Fix issue #3074745: Crash in system process
Insertion cursor handle no longer appears on empty text views (Bug 3075988).
Tapping on an unfocused TextView moves the insertion point at tapped position.
Bug fixes for trackball initiated text selection.
Change-Id: Ief246fd9a9f1eb745dcf9f0605e2ce53b5563f01
Merge commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10' into gingerbread-plus-aosp
* commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
Merge commit 'd00b4386aed2ef58077490ca7de7d93b98ed51fb' into gingerbread-plus-aosp
* commit 'd00b4386aed2ef58077490ca7de7d93b98ed51fb':
Clarify some comments on individual key codes.
