Matthew Xie
a5ca41e9cc
am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
...
* commit 'a4f5c425b822a46fc49bc87bba82688570584ff1':
Check the bluetooth state for getUuid call
2011-11-17 15:13:03 -08:00
Nick Pelly
f955d057dd
am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
...
* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
Fix NPE on devices that don't have NFC.
2011-11-17 15:12:56 -08:00
Dave Santoro
c5b057f423
am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
...
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
Unhide social stream permissions.
2011-11-17 15:12:52 -08:00
Michael Kolb
778f146cf4
am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
...
* commit '5397bb52fba04e8dc8496d731611210213847308':
Draw input field focus ring in WebTextView
2011-11-17 15:12:49 -08:00
John Reck
a93a7d6d15
am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1
...
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
Fix add single character check
2011-11-17 13:20:15 -08:00
John Reck
6810017f6a
am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
...
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
Undeprecate LayoutAlgorithm
2011-11-17 13:20:12 -08:00
Matthew Xie
2b9af44e40
am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
...
* commit '6da97a24e329851888890d4e380066037d08bcd7':
Check the bluetooth state for getUuid call
2011-11-17 13:10:14 -08:00
Nick Pelly
63b7360e9d
Merge "Fix NPE on devices that don't have NFC." into ics-mr1
2011-11-17 12:48:48 -08:00
Dave Santoro
9be4962060
Merge "Unhide social stream permissions." into ics-mr1
2011-11-17 12:26:17 -08:00
Michael Kolb
852585c034
Merge "Draw input field focus ring in WebTextView" into ics-mr1
2011-11-17 12:22:58 -08:00
Ben Murdoch
131ed03f30
am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
...
* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 11:46:30 -08:00
Nicolas Roard
0ecd89bce3
am e788fa84: am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
...
* commit 'e788fa84f1fac845e50922fc536694ce1cc2fbdb':
Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
2011-11-17 11:46:09 -08:00
Michael Kolb
edb39ce5b4
Draw input field focus ring in WebTextView
...
Bug: 5628053
Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
2011-11-17 11:08:59 -08:00
Dave Santoro
098d466a25
Unhide social stream permissions.
...
Bug 5569021
Change-Id: I35ee70418be0e0286294fef54e194831b5fa3b2c
2011-11-17 11:02:03 -08:00
Jesse Wilson
9ab5fa0aaa
Merge "Add a link from LruCache to the Android support package (compatibility library)."
2011-11-17 10:42:48 -08:00
Jesse Wilson
02db1b6c00
Add a link from LruCache to the Android support package (compatibility library).
...
Change-Id: Ibd16410856cd8a0a991b4a403fedd9ac4e1ecaad
2011-11-17 13:40:01 -05:00
John Reck
775e986ece
Merge "Fix add single character check" into ics-mr1
2011-11-17 08:48:04 -08:00
John Reck
1da3d65635
Merge "Undeprecate LayoutAlgorithm" into ics-mr1
2011-11-17 08:47:29 -08:00
Matthew Xie
1bce803f66
am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
...
* commit '37fb92fb634d10ca94731a73f2a60d86135baa6a':
Call notifyIncomingA2dpConnection with correct rejected status
2011-11-17 07:48:29 -08:00
Mangesh Ghiware
163994c1d4
am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
...
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
Revert change to setInitialScale() to take display density into account.
2011-11-17 07:48:24 -08:00
satok
8bc972a5a4
am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
...
* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
Clean up the spell checker framework
2011-11-17 07:48:17 -08:00
Daniel Sandler
28b23cdef4
am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1
...
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
Add a default Dreams component.
2011-11-17 07:48:15 -08:00
Marco Nelissen
5a1623b379
am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1
...
* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
Change MediaController look b/5584613
2011-11-17 07:48:01 -08:00
Dianne Hackborn
77c5f4def4
am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
...
* commit '9aa6bd1c34fe3583fe31f283a6415e84fec12567':
Add new ManagedEGLContext class to help apps participate in memory trimming.
2011-11-17 05:46:34 -08:00
Gilles Debunne
664d87ef01
am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
...
* commit 'b3272d297bb45e5cd3201766baef4fef7921ce05':
IME action (done, next...) correctly handled
2011-11-17 05:45:29 -08:00
Kristian Monsen
ec2b01e788
Merge "Fix fix for bug 2816327"
2011-11-17 05:43:40 -08:00
Ben Murdoch
fead0e14b4
Merge changes I59323dc5,I31a01aa3 into ics-mr1
...
* changes:
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 02:13:19 -08:00
Nicolas Roard
e88ca718ed
Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
2011-11-16 19:40:04 -08:00
Nicolas Roard
2bc0b01ffe
Hack to workaround the fact that the EGL context can be
...
removed from under us by framework in low memory condition.
bug:5627977
Change-Id: I3c138985e3e6c16f7c15497a1a11ffed93cd8e78
2011-11-16 19:31:00 -08:00
Matthew Xie
302afb93d4
Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
2011-11-16 18:20:50 -08:00
Mangesh Ghiware
4fdfdeedc6
Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
2011-11-16 18:01:35 -08:00
satok
e5febfd5bd
Merge "Clean up the spell checker framework" into ics-mr1
2011-11-16 17:35:54 -08:00
Matthew Xie
0901e601b5
Call notifyIncomingA2dpConnection with correct rejected status
...
notifyIncomingA2dpConnection was called with wrong rejected status.
Fix this.
bug 5626476
Change-Id: Ie8e4a8bdc6f6357a62172c86c21ee547376952a4
2011-11-16 17:14:36 -08:00
Daniel Sandler
f52a4482dd
Merge "Add a default Dreams component." into ics-mr1
2011-11-16 17:13:35 -08:00
John Reck
f9a6c91f75
Fix add single character check
...
Bug: 5618801
Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
2011-11-16 16:58:56 -08:00
Nick Pelly
a5193b24c1
Fix NPE on devices that don't have NFC.
...
We should return null instead of NPE.
Bug: 5622939
Change-Id: I802f4a99ea9f5e73453d5ea30da4e1d9fa279b9c
2011-11-16 16:49:01 -08:00
satok
060677f468
Clean up the spell checker framework
...
Change-Id: I64c0d813e53a4ebf8d7e63463e36f6900f1aa7d3
2011-11-17 09:40:56 +09:00
Matthew Xie
6da97a24e3
Merge "Check the bluetooth state for getUuid call" into ics-mr0
2011-11-16 15:31:03 -08:00
Marco Nelissen
e937da8314
Merge "Change MediaController look b/5584613" into ics-mr1
2011-11-16 14:54:20 -08:00
Dianne Hackborn
717a25dc2a
Add new ManagedEGLContext class to help apps participate in memory trimming.
...
This class provides an API for an application to know when it is time to
destroy its EGL context when memory is being trimmed. By having this in
the framework, we can still detect whether it will be useful to destroy
any EGL contexts (because we know if doing so will destroy all of them).
Change-Id: I1eac8d640052778052926b875c7928008f752182
2011-11-16 14:04:53 -08:00
Marco Nelissen
cbd4bcaa71
Change MediaController look
...
b/5584613
Change-Id: I6799753ffff3202e354039b85fdca72e48e6be5d
2011-11-16 13:43:11 -08:00
Mangesh Ghiware
e832b63c97
Revert change to setInitialScale() to take display density into account.
...
Updated WebView documentation to clarify this behavior.
Additionally, if target-densityDpi is specified in the meta viewport
tag, update the display density in ZoomManager.
Bug: 5477652
Bug: 5327492
Change-Id: I176e87489f76a2ee6595d76a006e302b07595de1
2011-11-16 13:31:56 -08:00
Fred Quintana
9a8f2b1057
Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
2011-11-16 12:45:14 -08:00
Matthew Xie
44b58ab89e
Check the bluetooth state for getUuid call
...
Donnot make the bluetoothservice.getUuids call if the bluetooth
is not on. Also get rid of all the necessary locks on BluetoothService
for get property call. It had a lock on BluetoothAdapterProperty.
bug5472114
Change-Id: I383472ae6006fc1f0129c960c8a44ed0df027a43
2011-11-16 12:27:57 -08:00
Kristian Monsen
9a77be5dac
Fix fix for bug 2816327
...
Remove native methods define for ANDROID_INSTRUMENT calls.
Need to that after the native registering is done in CL:
https://android-git.corp.google.com/g/#/c/148917/
Change-Id: Ic91aec54cb052c29aa06aee028cf8023cd69ed15
2011-11-16 19:59:27 +00:00
Ben Murdoch
cd0dd93d13
WebViewDatabase v11 for ICS.
...
Bump WebView database version to 11. This has the following effects:
- Removes the old webview cookie table on GB devices. Cookies are now
managed by the Chromium stack.
- Removes the old webview cache database on GB devices. Cache is now
managed by the Chromium stack.
- Autocomplete form data is now stored/retrieved based on
the URL minus the query string/fragment. Upgrade any existing
form URLs in the database to match this format, so we can
still use them. This will impact GB and HC devices.
This has an unfortunate side effect that we may end up with
duplicate URLs in the formurl table (say we had two URLS for the
same host but with different query strings). Currently we only take
the first url from the table - which is fine when they were
unique. The simplest way to work around this is just iterate all the
rows returned and use all the values we find.
Bug: 5560410
Change-Id: I59323dc5e523969e0a1c268b5936d6fa998d625c
2011-11-16 19:33:21 +00:00
John Reck
5a1ef4132f
Undeprecate LayoutAlgorithm
...
Bug: 5533078
There is no alternative and this is still useful and used. It should
not have been deprecated.
Change-Id: I641026cf76ea87738909827b7c48a556d9021d11
2011-11-16 11:08:44 -08:00
Eric Fischer
7dc81e06e4
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-16 10:57:45 -08:00
Ben Murdoch
f10daf6470
Fix a bug in the database upgrade process, and refactor slightly.
...
During upgrade from v9 -> v10 the database version was not
being updated.
Also remove conditionals based on what are effectively hardcoded
truth values to simplfiy the logic greatly.
Bug: 5560410
Change-Id: I31a01aa35a109a951d4e4c6d5b884bb666668b28
2011-11-16 18:47:59 +00:00
Gilles Debunne
de8c5ec889
Merge "IME action (done, next...) correctly handled" into ics-mr1
2011-11-16 10:31:40 -08:00