Commit Graph

20747 Commits

Author SHA1 Message Date
Mike Lockwood
463e433f09 Merge "Tethering: Use UsbManager to enable/disable RNDIS" 2011-06-20 16:27:12 -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
Robert Greenwalt
7a652bc86a resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -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
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
Mike Lockwood
78452b4b4a Merge "USB: Support for new USB gadget drivers" 2011-06-17 20:54:00 -07:00
Adam Powell
b3721b9f7d Merge "Allow the action bar title to take on the role of "up" in the absence of a standard "home" icon." 2011-06-17 20:32:49 -07:00
Adam Powell
54c7d7e61c Allow the action bar title to take on the role of "up" in the absence
of a standard "home" icon.

Change-Id: Ie1a9adca674500a29da36956455667bbb55a616f
2011-06-17 20:31:10 -07:00
Jim Miller
94c9f39ece Merge "Handle dropped motion events in Pattern Unlock due to high system activity" 2011-06-17 19:39:49 -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
Jim Miller
9c8e735817 Merge "Update pattern unlock and assets to match new UX design spec." 2011-06-17 16:50:34 -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
Jim Miller
0d244193be Update pattern unlock and assets to match new UX design spec.
Fix bug with LockPatternView measurement.
Clean up forgotPassword/emergencyCall button code.
Lots of layout tweaks. Now uses new GridLayout for many of them.
New assets.

Updated after review.

Change-Id: I52d4ce65c6b6c644ac60eb55bb8eaff8bfeb1071
2011-06-17 16:48:57 -07:00
Jim Miller
aced12fd22 Handle dropped motion events in Pattern Unlock due to high system activity
This enables the pattern unlock screen to look at historical motion
events to make unlocking easier during high system load.

Change-Id: I74a9c2d0833e8bb6745b89e8d397116baebb24a1
2011-06-17 16:09:46 -07:00
Adam Powell
ec08cacd78 Merge "Fix bug 4689431 - PopupMenus too narrow on phones" 2011-06-17 16:03:40 -07:00
Adam Powell
38639b1d75 Fix bug 4689431 - PopupMenus too narrow on phones
Change-Id: I624b46d17c1d964fd6cb04abf96333c7a8474d75
2011-06-17 16:02:32 -07: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
Nick Pelly
17523abb45 NFC Adapter Extras API update.
Remove
o registerTearDownApdus()
o deregisterTearDownApdus()
They were already NO-OPS, and don't work in the general case.

Add
o authenticate(byte[] token)
This future proofs us for a more flexible access control scheme.

Change-Id: I4cb67ceeb63d61cbc333c9b244a96d8687402168
2011-06-17 14:51:40 -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
Chia-chi Yeh
72fba1caea Merge "VPN: move VpnDialogs related methods into VpnConfig." 2011-06-17 14:37:11 -07:00
Daisuke Miyakawa
cd0385bf8c Merge "Remove HanziToPinin.java" 2011-06-17 14:36:42 -07:00