Commit Graph

17039 Commits

Author SHA1 Message Date
Jaikumar Ganesh
1349030755 Merge "Fix crash during unpair." 2011-06-21 11:44:32 -07:00
Jaikumar Ganesh
f7bc4bd13d Fix crash during unpair.
Change-Id: I8901abbbb6593b78fb5df93ab5d0085b32b6ba94
2011-06-21 11:41:00 -07:00
Jaikumar Ganesh
337b27985a Merge "Fix failure of Opp." 2011-06-21 11:37:47 -07:00
Jaikumar Ganesh
421f010108 Fix failure of Opp.
Needed due to upgrade of the Bluez stack, we can now
depend on just called createDevice.

Change-Id: I9c547d2ca3ee275365a22447641199eeaf807eac
2011-06-21 11:36:19 -07:00
Gilles Debunne
31e92e4f19 Merge "Support for arbitrary ListAdapter in PreferenceActivity." 2011-06-21 11:16:35 -07:00
Philip Milne
e9bb84a920 Merge "Accomodate margins in child measurements." 2011-06-21 10:13:15 -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
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
bf68f833fe Don't draw a middle divider on the first visible view.
Change-Id: I44f81e473344c29ac1f1d4ad4c9be86464394b75
2011-06-20 18:25:05 -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
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
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
Philip Milne
09e2d4d0d5 Ensure measuredWidth > getSuggestedMinimumWidth(), same for height.
Change-Id: I7f2dc2e874d8aacf961e98fe41139ada7a992449
2011-06-20 10:59:16 -07: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
Mike Lockwood
78452b4b4a Merge "USB: Support for new USB gadget drivers" 2011-06-17 20:54:00 -07:00
Romain Guy
98769300af Merge "Add error checking to LayerRenderer::copyLayer" 2011-06-17 17:47:59 -07:00
Romain Guy
d6b2a00dd4 Add error checking to LayerRenderer::copyLayer
This method is invoked by TextureView.getBitmap() and failures must be
caught to avoid leaving the GL context in a potentially bad state.

Change-Id: I620de395ba1bc20154de58c81963223dc55cac78
2011-06-17 17:45:59 -07:00
Jeff Sharkey
1a81a16a96 Merge "Notify policy listeners about metered ifaces." 2011-06-17 16:57:28 -07:00
Jeff Sharkey
fdfef57f49 Notify policy listeners about metered ifaces.
Currently, kernel definition of metered networks is applied at the
interface level.  This change maintain list of those metered ifaces
and notifies policy listeners, like ConnectivityService.  (This gives
us a consistent picture of when a network would be blocked.)

Bug: 4601393
Change-Id: I277d5ca96ab967a1c1c3f1da8f9587557cd6d74c
2011-06-17 16:49:21 -07:00
Mike Lockwood
02e4569b5f USB: Support for new USB gadget drivers
Change-Id: Id08df50acb873a94f4765a991ee6a6f5b898ddf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Chet Haase
1790a10eea Merge "Invisible views can't start animations" 2011-06-17 16:00:57 -07:00
Romain Guy
ee452bcc06 Merge "Fix rendering issue with paths when the stroke width is 0" 2011-06-17 15:49:22 -07:00
Romain Guy
98029c825b Fix rendering issue with paths when the stroke width is 0
Change-Id: I5d8ac23dc69e9e17df4ef6b5195186b5207e2524
2011-06-17 15:47:07 -07:00
Philip Milne
405efeeeab Merge "Pass width/height specs in the standard way when measuring children." 2011-06-17 15:43:13 -07:00
Ben Dodson
3da3a4582c Parser for uri records
Change-Id: I4b71ba7938aa83a1c6344e3da72a9495bc1e9a16
2011-06-17 15:37:32 -07:00
Philip Milne
a789cafb06 Pass width/height specs in the standard way when measuring children.
Change-Id: I127b206cb677f8a09990b6852c98023d6c97112d
2011-06-17 15:35:46 -07:00
RoboErik
ea07d5f23c Merge "Fix typo in docs link" 2011-06-17 15:28:13 -07:00
RoboErik
f92ccfb8b0 Fix typo in docs link
Change-Id: I411d250629b828d07dd7adbdb20da71f0c4722f2
2011-06-17 15:24:02 -07:00
Dianne Hackborn
ca1e210dd6 Merge "Implement remaining infrastructure for user disabling apps." 2011-06-17 14:53:10 -07:00
Dianne Hackborn
0ac3031c15 Implement remaining infrastructure for user disabling apps.
Change-Id: If8135eb0e27ec36f8f159eb7b6397add7acd0299
2011-06-17 14:49:45 -07:00
RoboErik
dc4280419b Merge "Add docs for Calendars table" 2011-06-17 14:41:38 -07:00
Chet Haase
c8a9a70c5f Invisible views can't start animations
The invalidation logic was broken for invisible views, causing
a problem when an animation was set to start on an invisible view
(to fade it in), but the view would not propagate the invalidation
event that would trigger the start of the animation rendering.
Fix: reset the DRAWN flag when a view becomes invisible to allow
the invalidation logic to work as intended.

Change-Id: Ibf49c6e8b39506a92a6e5f45cb8a12626ae4f931
2011-06-17 14:35:09 -07:00
RoboErik
f4010c5768 Add docs for Calendars table
Change-Id: I4e445f730a4330f7c570efadb3051d28ca050402
2011-06-17 14:29:28 -07:00
Amith Yamasani
4f844e2636 Merge "Inform the InputMethodManager that a focused view has been attached." 2011-06-17 14:29:17 -07:00
Daisuke Miyakawa
18cc57fb93 Merge "Add API for auto-complete ranking improvement." 2011-06-17 13:10:40 -07:00