64272 Commits

Author SHA1 Message Date
satok
0427550509 am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework
2011-11-16 17:37:47 -08:00
satok
e5febfd5bd Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Daniel Sandler
83ae021c5d am f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit 'f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
  Add a default Dreams component.
2011-11-16 17:16:57 -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
70cfd3afe9 am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '5311917df5fe9804105ff6070346b8fac4b102df':
  Remove day of week from phone notification panel.
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
Daniel Sandler
5311917df5 Merge "Remove day of week from phone notification panel." into ics-mr1 2011-11-16 17:13:16 -08:00
John Reck
f9a6c91f75 Fix add single character check
Bug: 5618801

Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
2011-11-16 16:58:56 -08:00
Mathias Agopian
47ab60e93f be a bit more defensive when parsing extension strings
hopefully this will fix a crash in the emulator.

Bug: 5624674
Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b
2011-11-16 16:49:25 -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
Mathias Agopian
908d56171f am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
2011-11-16 16:16:17 -08:00
Mathias Agopian
69c17a11a2 Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 2011-11-16 16:13:38 -08:00
Mathias Agopian
db5494c406 Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450
2011-11-16 15:59:13 -08:00
Matthew Xie
6da97a24e3 Merge "Check the bluetooth state for getUuid call" into ics-mr0 2011-11-16 15:31:03 -08:00
Fred Chung
6cf8f73586 Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
Change-Id: I23f7d4ece831ea449ecfc848dbb5733021107350
2011-11-16 15:28:35 -08:00
Marco Nelissen
0da3dfde0f am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1
* commit 'e937da83143d67fbd709d37bd7418f9807e72baa':
  Change MediaController look b/5584613
2011-11-16 14:57:24 -08:00
Marco Nelissen
e937da8314 Merge "Change MediaController look b/5584613" into ics-mr1 2011-11-16 14:54:20 -08:00
Jason Simmons
2a2c8b72c8 Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-aah 2011-11-16 14:51:17 -08:00
Dianne Hackborn
56caf7751b am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '717a25dc2a411edb548859cd6870363346c71b01':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
2011-11-16 14:37:51 -08:00
Dianne Hackborn
61ecac1a37 am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '4c6a65bc319feab120d40553d93b160908db2f6d':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
2011-11-16 14:06:06 -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
Dianne Hackborn
4c6a65bc31 Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 2011-11-16 14:03:09 -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
Dianne Hackborn
ee9aef0b42 Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
...through setup wizard after wipe data

Deal with finish() being called when there are no running activities
on the stack.

Also some improved debugging output.

Change-Id: Ia1d3f3f7e7b79c06ca95c738081322fc80282e0d
2011-11-16 13:21:46 -08:00
Jason Simmons
ddf541fc6e Unlink the Binder DeathRecipient when removing a Bluetooth service record
Change-Id: Ib8a9e254d7c9ebe9d54f5c10b3daa31d062b4df0
2011-11-16 12:52:45 -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
Robert Greenwalt
78efa1d14e am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '33fe4a36b7d1ef84b13447f2a765db465ef96e56':
  Fix TelephonyManager to grab the best context
2011-11-16 12:08:34 -08:00
Robert Greenwalt
33fe4a36b7 Merge "Fix TelephonyManager to grab the best context" into ics-mr1 2011-11-16 12:06:53 -08:00
Jamie Gennis
51a23606e8 am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit 'fd6b64f6ad040b4d550a5219a2576997e2c0e85d':
  SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
2011-11-16 11:36:42 -08:00
Robert Greenwalt
8f4f814beb Fix TelephonyManager to grab the best context
It may not be called from an app so the app context may not exist.
Check and grab the best one.
Also remove the log that nobody paid attention to if the constructor
is called again from the same process.  One context seems to be as
useful as another.

bug:5572369
bug:5622514
Change-Id: Iad23b30c7c8fe5b8d1f81a1e060eaf0cd0e3019d
2011-11-16 11:36:08 -08:00
Mike Lockwood
b0e6d4f87f Merge "AudioManager: Add wrapper methods for master volume support" into ics-aah 2011-11-16 11:35:23 -08:00
Jamie Gennis
fd6b64f6ad Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 2011-11-16 11:34:30 -08:00
Daniel Sandler
532a0bbfa4 Activate Dreams (screen saver) when desk-docked.
SystemUI's DreamsDockLauncher now responds to low-level dock
events (Intent.ACTION_DOCK_EVENT) by immediately invoking
the user's selected screen saver.

(The high-level DESK_DOCK behavior is no longer enabled; see
change I7884f65.)

Bug: 5591015
Change-Id: I01a9bc6b181d55493f891ccc220631ddc461808a
2011-11-16 11:34:09 -08: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
Mike Lockwood
c614df9650 AudioManager: Add wrapper methods for master volume support
Change-Id: Ibfc24f052d05824175f71c2138ba041c94c3def7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-16 11:30:47 -08:00
Daniel Sandler
11ddf533a2 Disable desk dock apps.
When a device is attached to a desk dock, the
CATEGORY_DESK_DOCK intent will no longer be fired.
As a side effect, the "dock home" behavior (which captures
the home key for the dock app as long as the device is
docked) is now disabled for desk docks.

Car docks are unchanged.

Bug: 5591015
Change-Id: I7884f655913c31cf53b88cb2e2b371987be27f64
2011-11-16 11:10:03 -08: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
d842391ad9 am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '7dc81e06e4d0554683595e8d2e318837548e249a':
  Import revised translations.  DO NOT MERGE
2011-11-16 11:01:06 -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
Andreas Huber
22cf4b0c5f Make sure not to cancel pending seek/EOS notifications on a cache underrun...
or they are lost for good.

Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug: 5544907
2011-11-16 10:46:05 -08:00
Gilles Debunne
f0f5f853f1 am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit 'de8c5ec88982b836b2c50d4f685f4e05b29bdd0d':
  IME action (done, next...) correctly handled
2011-11-16 10:37:30 -08:00
Gilles Debunne
de8c5ec889 Merge "IME action (done, next...) correctly handled" into ics-mr1 2011-11-16 10:31:40 -08:00
Eric Fischer
2f8e2e805d Import revised translations. DO NOT MERGE
Change-Id: I4ef67d81f61028da84c51ed0e48231f9cdc62679
2011-11-16 09:55:52 -08:00
Alex Sakhartchouk
bbbb37a01c am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '4c593010dddc6d2972bab87b30bd1b11987a09e1':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
2011-11-16 09:42:31 -08:00
Alex Sakhartchouk
4c593010dd Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 2011-11-16 09:40:11 -08:00
Fred Chung
e18b577d72 am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
  Bluetooth HDP sample.
2011-11-16 09:34:46 -08:00
The Android Open Source Project
ac60f61a24 am 816e68e2: No-op merge from ics-mr0
* commit '816e68e2fddd56c34f864dc5647801117a51720b':
2011-11-16 09:34:33 -08:00