64301 Commits

Author SHA1 Message Date
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
Bill Gruber
89d6c9d689 Filters docs: removes references to forward-locking
Bug 3055286

Change-Id: Idb64984a1f3437749d9a865885bf4e0b258e60d3
2011-11-16 10:05:04 -08:00
Eric Fischer
2f8e2e805d Import revised translations. DO NOT MERGE
Change-Id: I4ef67d81f61028da84c51ed0e48231f9cdc62679
2011-11-16 09:55:52 -08:00
Bill Gruber
80ef329341 Licensing docs: clarifies server response for draft apps
Bug 2900690

Change-Id: Ibd1f14739e553bdc237fdb67322e43bef30dfd17
2011-11-16 09:44:43 -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
Fred Chung
15fe377c7c Merge "Bluetooth HDP sample." into ics-mr1 2011-11-16 09:31:54 -08:00
The Android Open Source Project
816e68e2fd No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
2011-11-16 09:28:00 -08:00
The Android Open Source Project
d28bb28e08 Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
2011-11-16 08:55:43 -08:00
Gilles Debunne
efbad5fb90 IME action (done, next...) correctly handled
Bugs 5599728 and 5319237.

mInputContentType should be set for a "modern" cupcake
environment says a comment in TextView.

However, it is possible to call onEditorAction on a
TextView that didn't use any of the method that lazily
create that field. This is for instance achieved using
the extracted mode in landscape (Done, Next actions)
or in Contacts, that feature a Next/Done button in the
IME.

As a result, the action is ignored.

The patch is to force the creation of the mInputContentType
when the EditText is associated to the IME.

Change-Id: I5beec5a52e9eec0c209af37d68791bb6ff83d6f6
2011-11-16 17:38:48 +01:00
Mike Lockwood
47a0a8832f Merge "AudioManager: Add support for master mute" into ics-aah 2011-11-16 07:41:21 -08:00
The Android Open Source Project
4ef2ee7d1b am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
2011-11-16 07:38:47 -08:00
The Android Open Source Project
c740325852 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
2011-11-16 07:33:59 -08:00
Mathias Agopian
f98ab8b140 remove hack that hardcoded the refresh rate
Change-Id: Ibdd40b337c547e80ef8541856015f1380c8d58ed
2011-11-16 00:08:08 -08:00
Daniel Sandler
c224f76303 Add a default Dreams component.
Currently set to DeskClock's screensaver, but since it's a
(private) string in f/b/c/r/r/values/config.xml any product
could overlay this.

Bug: 5611008
Change-Id: I7a4623c9c667a6cff8ed80ad600a8a4460bfafb7
2011-11-15 22:55:03 -08:00
Daniel Sandler
589f3624e0 Remove day of week from phone notification panel.
It was added to the tablet, but was never intended for use
on the phone, where it can cause the label to get too wide,
preventing access to settings / clear-all.

Bug: 5621955
Change-Id: Ic023391aa22d7ba3edd815f602afcb3357eb2501
2011-11-15 21:28:55 -08:00
Jake Hamby
a92a672201 am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit 'bd7836846c1e5d3610ba6c26686674d429a4316c':
  Fix 3GPP SMS send failure for 7-bit national language tables.
2011-11-15 20:19:34 -08:00
Bill Gruber
8d7a4cb8ae am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
* commit 'c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
  IAB Doc Fix: Error in code snippet Bug 5221766
2011-11-15 20:19:33 -08:00
Adrian Ludwig
43b0acbf95 am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit 'cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
  Adding new "Security Best Practices" to the html docs.
2011-11-15 20:19:30 -08:00
James Dong
541e2e6695 am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
2011-11-15 20:16:45 -08:00
Jake Hamby
bd7836846c am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
  Fix 3GPP SMS send failure for 7-bit national language tables.
2011-11-15 20:16:12 -08:00
Bill Gruber
c7b354810e am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
  IAB Doc Fix: Error in code snippet Bug 5221766
2011-11-15 20:16:02 -08:00
Adrian Ludwig
cbc96549c9 am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
  Adding new "Security Best Practices" to the html docs.
2011-11-15 20:15:57 -08:00
James Dong
4fdc36e6d6 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Adam Powell
a2c5baedbb am 45f05c95: Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '45f05c9580739ffe2d665cec50efb0bb57d757ba':
  Fix bug 5623642 - Status bar background incompatible with some legacy apps
2011-11-15 19:53:10 -08:00
Adam Powell
45f05c9580 Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 2011-11-15 19:51:56 -08:00
Jeff Brown
eba508a537 am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
  Eliminate hw.keyboards system properties.
2011-11-15 19:19:04 -08:00
Jeff Brown
3e7497b4ec Merge "Eliminate hw.keyboards system properties." into ics-mr1 2011-11-15 19:17:09 -08:00