53220 Commits

Author SHA1 Message Date
Jim Miller
b2dae831a3 Merge "Handle dropped motion events in MultiWaveView due to high system activity" 2011-06-20 20:58:44 -07:00
David Brown
932368e1ec Merge "Use a static flag to enable/disable CallerInfo "geoDescription" lookup" 2011-06-20 19:20:46 -07:00
Mike Lockwood
10c24ea0a4 Merge "USB: Make MTP/PTP toggle in the USB preferences set the default mode" 2011-06-20 18:56:26 -07:00
Mike Lockwood
422bf6702f USB: Make MTP/PTP toggle in the USB preferences set the default mode
Change-Id: I438f7f24f06298ad41a99199c26c45bd7884afdd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-20 21:54:55 -04: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
Scott Main
935ccfd9fe Merge "cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 docs: fix typos" 2011-06-20 17:59:05 -07:00
Fabrice Di Meglio
8fbe6786a1 Merge "Update BiDiTest app for adding more unit tests" 2011-06-20 17:56:07 -07:00
Scott Main
68e5ea8973 cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
docs: fix typos

Change-Id: I1e821f9455ee9fcb01d345226f3b606621fdcd8e
2011-06-20 17:55:59 -07:00
Dianne Hackborn
47d6ef5143 Merge "Stop the holo tabs from sqeezing in to each other." 2011-06-20 17:48:03 -07:00
Fabrice Di Meglio
53a73bcddf Update BiDiTest app for adding more unit tests
- add some menu that will show up in compatibility mode
- add more unit tests for padding and background drawable

Change-Id: I90db23c68d2371c35913b039a10f9d9f34c3931e
2011-06-20 17:38:41 -07:00
Jason Sams
1a3b2f627c Merge "First cut at RSTextureView." 2011-06-20 17:26:48 -07:00
Adam Powell
bad9d3a6b6 Merge "Fix bug 4738084 - Padding calculation regression" 2011-06-20 17:15:45 -07:00
Jason Sams
faa32b33b5 First cut at RSTextureView.
Change-Id: I920950f33079b6bb7e48bb8970201ab9737bb021
2011-06-20 16:58:04 -07:00
Bill Napier
5f9b178e5a Merge "Fixed MonkeyRunner documentation" 2011-06-20 16:35:30 -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
David Brown
2ef46c6587 Use a static flag to enable/disable CallerInfo "geoDescription" lookup
...and disable the lookup for now, since we don't have the latest
PhoneNumberOfflineGeocoder (from the libphonenumber library) integrated
into our tree yet.

Bug: 4595580
Change-Id: I7391cbf1558b5a23eebfff6c4ad1f6363213c9a3
2011-06-20 16:24:19 -07:00
Andreas Huber
02392b41de Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData()." 2011-06-20 16:08:06 -07:00
Ying Wang
03dbfbb5cf Merge "Output Proguard options for also overlay layouts." 2011-06-20 16:06:51 -07:00
Eric Fischer
a0bc575b9d Merge "Import revised translations." 2011-06-20 16:02:21 -07:00
Ying Wang
45ccfa5870 Output Proguard options for also overlay layouts.
Change-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b
2011-06-20 15:41:08 -07:00
Jamie Gennis
c972c795cf Merge "SurfaceTexture: fix a NULL ptr dereference." 2011-06-20 15:34:00 -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
Jamie Gennis
aff7405418 SurfaceTexture: fix a NULL ptr dereference.
This change adds a NULL check when searching the slot list in
SurfaceTextureClient for the slot corresponding to a buffer being
queued or canceled.

Bug: 4645023
Change-Id: I806cbc1e34da118ea33a83c4f25ce8193ba1c3ad
2011-06-20 14:16:49 -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
James Dong
b2af97e9a1 Merge "When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF." 2011-06-20 13:23:14 -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
James Dong
32bb368a51 When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF.
When this happens, default value of 0 will be used for the "decoding" time for these output buffers.
These buffers do not contain valid media data anyway.

related-to-bug: 4725803

Change-Id: I0eaf248bb2ac022ff072eaffd0ed3f21171f824e
2011-06-20 12:09:49 -07:00
Eric Fischer
3106a9b7f5 Merge "Add map center resources for new locales." 2011-06-20 12:03:01 -07:00
Stephen Hines
3c0618be2f Merge "Add support for more vector types to RS." 2011-06-20 12:00:50 -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
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
Glenn Kasten
df02afe835 Merge "Remove unneeded #include <sys/resource.h>" 2011-06-20 07:47:51 -07:00
Dongwon Kang
48810fdda5 OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData().
BUG:4689872
Change-Id: I483bf230b5571a8d1815b954dce2c52e9a5f1f37
2011-06-20 17:35:19 +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