23233 Commits

Author SHA1 Message Date
Jaikumar Ganesh
b38fa2a0ac Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 2011-06-21 11:23:51 -07:00
Gilles Debunne
31e92e4f19 Merge "Support for arbitrary ListAdapter in PreferenceActivity." 2011-06-21 11:16:35 -07:00
Irfan Sheriff
7dd1200589 DO NOT MERGE Revert "Fix lease duration handling"
This reverts commit 56878760c3f0255dbcc8d78572f784b96ee36cb0.
2011-06-21 11:01:54 -07:00
Philip Milne
e9bb84a920 Merge "Accomodate margins in child measurements." 2011-06-21 10:13:15 -07:00
Jaikumar Ganesh
d762f063be DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
2011-06-21 09:27:12 -07:00
Narayan Kamath
4d03462b37 New API for TTS settings.
Engines must declare a <meta-data> attribute in their
manifest with name "android.speech.tts". This must reference
an XML resource as per
com.android.internal.R.styleable.TextToSpeechEngine.

Change-Id: I56a6b9f1a360174f98c9f39da901ade83d0f38a7
2011-06-21 10:28:30 +01:00
Svetoslav Ganov
02e2f57dc7 Merge "ListView do not fire accessibility hover events." 2011-06-20 21:52:31 -07:00
Svetoslav Ganov
34e350daf8 ListView do not fire accessibility hover events.
1. AccessibilityEvent was incorrectly setting the
   connection of an owned AccessibilityRecord after
   the record is initialized since during initialization
   the record may become sealed.

bug:4724101

Change-Id: I39087dc8023c62252f31431ece23de901dc45972
2011-06-20 21:51:34 -07:00
Wu-cheng Li
fab0f58e9f Merge "Fix camera getMeteringAreas does not return areas correctly." 2011-06-20 21:20:32 -07:00
Wu-cheng Li
d8aab93f96 Fix camera getMeteringAreas does not return areas correctly.
bug:4494242
Change-Id: Ide5a44fc302ecda22557fc9eba5e7fcd8679712b
2011-06-21 12:15:50 +08:00
Jim Miller
b2dae831a3 Merge "Handle dropped motion events in MultiWaveView due to high system activity" 2011-06-20 20:58:44 -07:00
Philip Milne
b3a8c54389 Accomodate margins in child measurements.
Also:

. Cater for components that are GONE.
. Include code to draw component bounds and margins when in DEBUG mode.

Change-Id: I688f8b638469eb11987ebb207b7db1dc953e84e7
2011-06-20 18:47:54 -07:00
Adam Powell
cd8ad7c77f Merge "Don't draw a middle divider on the first visible view." 2011-06-20 18:29:25 -07:00
Adam Powell
bf68f833fe Don't draw a middle divider on the first visible view.
Change-Id: I44f81e473344c29ac1f1d4ad4c9be86464394b75
2011-06-20 18:25:05 -07:00
Dianne Hackborn
47d6ef5143 Merge "Stop the holo tabs from sqeezing in to each other." 2011-06-20 17:48:03 -07:00
Adam Powell
bad9d3a6b6 Merge "Fix bug 4738084 - Padding calculation regression" 2011-06-20 17:15:45 -07:00
Adam Powell
b53a68bbd9 Fix bug 4738084 - Padding calculation regression
Make sure user padding values aren't clobbered during construction.

Change-Id: I90d1610e0bf50ccb10f058fb2b6c6d8ff34eec3b
2011-06-20 16:29:05 -07:00
Mike Lockwood
463e433f09 Merge "Tethering: Use UsbManager to enable/disable RNDIS" 2011-06-20 16:27:12 -07:00
Eric Fischer
a0bc575b9d Merge "Import revised translations." 2011-06-20 16:02:21 -07:00
Nick Pelly
6ce7039482 am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.
* commit '6f1a8edcc00db40a8ad300e15a23f7f1de298c3b':
  NFC Adapter Extras API update.
2011-06-20 15:58:40 -07:00
Nick Pelly
6f1a8edcc0 am 17523abb: NFC Adapter Extras API update.
* commit '17523abb45b7f77f35af53e895d74be13f2314e0':
  NFC Adapter Extras API update.
2011-06-20 15:54:07 -07:00
Jim Miller
b35e372bf4 Handle dropped motion events in MultiWaveView due to high system activity
This change causes MultWaveView to look at historical motion events to make
unlocking easier during high system load.

Updated after review.

Change-Id: Ibfc3cb513936e3b8488aa4390164bf5e214c982f
2011-06-20 15:19:32 -07:00
Eric Fischer
6d470b7176 Import revised translations.
Change-Id: Ie30d36d7416f687f2d84b0bdf6547cda96446f37
2011-06-20 14:40:53 -07:00
Dianne Hackborn
9812c56b1e Stop the holo tabs from sqeezing in to each other.
Change-Id: I8925daf5c7c21e65f17cc6bc308b1b867047e745
2011-06-20 14:02:18 -07:00
Adam Powell
1be495683c Merge "Match legacy theme colors with gingerbread" 2011-06-20 13:07:39 -07:00
Adam Powell
0adb443ad5 Match legacy theme colors with gingerbread
Change-Id: I57904c0271953fc55d08a8a51be3dfc9ee02e416
2011-06-20 13:06:42 -07:00
Robert Greenwalt
7a652bc86a resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -07:00
Eric Fischer
3106a9b7f5 Merge "Add map center resources for new locales." 2011-06-20 12:03:01 -07:00
Jamie Gennis
fd0ffd2a4e Merge "SurfaceTexture: attach to Dalvik when needed." 2011-06-20 11:54:34 -07:00
Fabrice Di Meglio
466ebb1d8a Merge "Add View paddingStart and paddingEnd" 2011-06-20 11:35:36 -07:00
Nick Pelly
a665ae0a77 Merge "Parser for uri records" 2011-06-20 11:32:28 -07:00
Eric Fischer
672c5b4662 Add map center resources for new locales.
Change-Id: I892bc8262eb31ea9671e54f84ce91281b9e3c762
2011-06-20 11:27:17 -07:00
Philip Milne
d63205230a Merge "Ensure measuredWidth > getSuggestedMinimumWidth(), same for height." 2011-06-20 11:12:38 -07:00
Fabrice Di Meglio
d8703a9824 Add View paddingStart and paddingEnd
- use a lazy padding resolution (because layout direction is lazyly resolved too)
- cache resolved layout direction as getResolvedLayoutDirection() will be more called
- enable resetting layout direction cache if needed
- update unit tests

Change-Id: I30ce19e3100cc137f84e60163b60e1577ff61819
2011-06-20 11:11:05 -07:00
Robert Greenwalt
ccf83af101 Fix tethering upstream determination.
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116

Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
2011-06-20 11:09:23 -07:00
Philip Milne
09e2d4d0d5 Ensure measuredWidth > getSuggestedMinimumWidth(), same for height.
Change-Id: I7f2dc2e874d8aacf961e98fe41139ada7a992449
2011-06-20 10:59:16 -07:00
Adam Powell
15a16a835e Fix bug 4729242 - Crash while launching browser app.
Change-Id: Id049bcc53943b0cbe17e9f345af67adc2b10bdef
2011-06-20 10:50:17 -07:00
satok
eaddb89486 Create TextServiceManager and SpellCheckerService
Bug: 4176026

Spec of TextServiceManager
- Chooses the most applicable TextService(e.g. SpellCheckerService, WordBreakIteratorService..)
    for each locale

Spec of SpellCheckerService
- Returns whether the given string is a correct word or not
- Returns Suggestions for the given string

Change-Id: Ia25e7b4f308778891929e31b8cbd741f6848cce4
2011-06-20 23:00:30 +09:00
Jeff Sharkey
79b1046f4e Merge "Teach NetworkIdentity about roaming." 2011-06-19 22:24:49 -07:00
Jeff Sharkey
5dc0c26cff Teach NetworkIdentity about roaming.
And correctly upgrade NetworkIdentitySet written to disk, assuming
that old values aren't roaming.

Bug: 4724762
Change-Id: Ic25897ebbaf43be2390174d8e5fd08386bc8a345
2011-06-19 22:21:05 -07:00
Jeff Sharkey
7553ecbe5b Merge "Persist "tagged" network stats along with UIDs." 2011-06-19 22:07:41 -07:00
Jeff Sharkey
d03fd3f004 Persist "tagged" network stats along with UIDs.
Now stores tags other than TAG_NONE (0x0), which are useful for app
debugging.  Combine UID and tag together into single long key, and
expose tag data through AIDL when requested.  Change NMS to track
TAG_NONE as total UID traffic, matching the kernel definition.

Added TAG_MAX_HISTORY to control how long tag-granularity statistics
are stored; overall UID usage is still kept for UID_MAX_HISTORY.  Fix
bug to trim NetworkStatsHistory outside normal polling loops to catch
non-active networks and UIDs.

Test to verify UID and tag packing, and to verify that UID traffic on
two networks are combined to match MOBILE_ALL template.

Change-Id: If0e039416d9e7f63b1a39e04cddfb1133b5a78ee
2011-06-19 21:58:39 -07:00
Mike Lockwood
3c2a2f6789 Tethering: Use UsbManager to enable/disable RNDIS
Remove obsolete RNDIS support from NetworkManagementService

This change fixes USB tethering, which broke after the new USB gadget driver
changes went in.

Change-Id: Idd987fb2c39c40e81ebc92e6d8dae9fe77ed4ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-19 20:50:46 -04:00
Jeff Sharkey
75a0e9c0f0 Merge "Handle removed UIDs in network stats and policy." 2011-06-19 01:12:01 -07:00
Jeff Sharkey
b09540f33a Handle removed UIDs in network stats and policy.
When UID_REMOVED, clean up any existing UID network policy so it
doesn't linger for future apps.  Also move any NetworkStatsHistory
to special UID_REMOVED tracking bucket.

Tests for new removal code.  Also test detailed UID stats, including
network changes to verify template matching logic.

Bug: 4584212
Change-Id: I9faadf6b6f3830eb45d86c7f1980a27cdbcdb11e
2011-06-19 01:08:12 -07:00
Jeff Sharkey
13e7d3fa07 Merge "Read "qtaguid" network stats, refactor templates." 2011-06-18 23:19:38 -07:00
Jeff Sharkey
1b5a2a96f7 Read "qtaguid" network stats, refactor templates.
Teach NMS to read qtaguid stats from kernel, but fall back to older
stats when kernel doesn't support.  Add "tags" to NetworkStats entries
to support qtaguid.  To work around double-reporting bug, subtract
tagged stats from TAG_NONE entry.

Flesh out stronger NetworkTemplate.  All NetworkStatsService requests
now require a template, and moved matching logic into template.

Record UID stats keyed on complete NetworkIdentitySet definition,
similar to how interface stats are stored.  Since previous UID stats
didn't have iface breakdown, discard during file format upgrade.

Change-Id: I0447b5e7d205d73d28e71c889c568e536e91b8e4
2011-06-18 22:23:11 -07:00
Adam Powell
b0cd4e2e7c Merge "Holo dialog formatting" 2011-06-17 21:41:08 -07:00
Adam Powell
6323642880 Holo dialog formatting
Change-Id: I6819871df9456130ec75516f8713af92c0e51750
2011-06-17 21:40:29 -07:00
Mike Lockwood
17b90780e2 Merge "USB connected notification and temporary USB options dialog" 2011-06-17 20:54:38 -07:00