26672 Commits

Author SHA1 Message Date
Mangesh Ghiware
8d03007f80 Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 2011-11-21 23:14:05 -08:00
Romain Guy
1766b0e25d Fix the build
Change-Id: I3814c6c39eda2a4b56902e2044fbb121b4885e5d
2011-11-21 18:28:49 -08:00
Wu-cheng Li
e7005ec958 Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 2011-11-21 18:10:52 -08:00
Romain Guy
8cd39e3a10 Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 2011-11-21 17:57:05 -08:00
Adam Powell
fb0784da5f Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 2011-11-21 17:34:57 -08:00
Mangesh Ghiware
31f263db65 Update zoom (aka display) density from WebView thread.
Fixes bug 5639675.

Change-Id: I982ca0787f5c050c5d1a288cd8751299ee351214
2011-11-21 17:19:31 -08:00
Adam Powell
05c8277f34 Fix bug 5521467 - Monkeys and ActionBar custom tab views
Remove custom tab views from old parents if applicable.

Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
2011-11-21 17:14:56 -08:00
Nick Pelly
043a8b149d Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:40 -08:00
Eric Fischer
68f0d47e8e Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:29:06 -08:00
Eric Fischer
bf1b9778ce Import revised translations. DO NOT MERGE
Change-Id: I4313e0fffeb72b5a78b49770932ad983cfb05f8b
2011-11-21 15:23:51 -08:00
Nick Pelly
a5cb9f4217 Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
2011-11-21 14:55:29 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
2011-11-21 13:30:32 -08:00
Romain Guy
31f2c2e946 Notify views when EGL resources are about to be destroyed
Bug #5639899

Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
2011-11-21 10:55:41 -08:00
Wu-cheng Li
0cac6aa993 Move Camera.Sound to a stand-alone class CameraSound.
bug:5640219

Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926
2011-11-21 17:57:33 +08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Daniel Sandler
9b5d7a59f3 Merge "Dreams (now Screen Candy) development." into ics-mr1 2011-11-19 20:42:19 -08:00
Svetoslav Ganov
d8a3cabcb1 Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 2011-11-18 14:39:05 -08:00
Wei Huang
c2fff5ea39 Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 2011-11-18 14:00:09 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
84dd52e394 Text selection AccessibilityEvents are missing text.
The text selection change event was not added to the text
populating accessibility events in View.

bug:5638709

Change-Id: Ie7e319bc07d7e6c48f178a6c1bd22b1fe32ff515
2011-11-18 10:26:54 -08:00
Kristian Monsen
4aad1022eb Improving PictureListener deprecating comments
Change-Id: If189823962c49db9681845996e97eec31fedcca6
2011-11-18 17:09:12 +00:00
Daniel Sandler
2d54536d08 Dreams (now Screen Candy) development.
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"

Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
2011-11-18 08:00:04 -08:00
Wu-cheng Li
b838d8d4a2 Unlock camera AWB lock only when white-balance is changed.
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
2011-11-18 15:21:47 +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
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
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
George Mount
82ed95f410 Content and viewport rects set in one step.
Bug 5342918
 The content rect of the WebView was being retrieved during
 the draw while the viewport rect was being set when the
 draw functor was setup. During animations, the content
 rect was changing between the time the draw functor was
 retrieved and it was executed. The content rect is now
 being set with the viewport rect.

 Wekbkit Change: I05d68dcc

Change-Id: I1b0978eeb27d9f1deddfeba3ede869f735f74394
2011-11-17 08:31:55 -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
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
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