RoboErik
4120eaaad5
Merge "Add original_id definition for cal db v301"
2011-05-24 11:34:45 -07:00
Dianne Hackborn
3ae00fabc7
resolved conflicts for merge of bbca8133 to master
...
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
2011-05-24 11:27:11 -07:00
Kristian Monsen
f7636e9668
am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
...
* commit '18a259fe37861a78632a0667d746ea7d06356ced':
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
2011-05-24 11:22:39 -07:00
Kristian Monsen
3493a191b0
am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
...
* commit '36ac304c6e62dbb1caaf729c70d7aa956aff63be':
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
2011-05-24 11:19:00 -07:00
Kristian Monsen
4994521abe
Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2
2011-05-24 11:16:39 -07:00
John Reck
ea4384a2e6
am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
...
* commit 'dc8a53a7db91ac23d2b213dc5cf758d64bd880be':
Update the Desktop UA to Chrome
2011-05-24 11:10:00 -07:00
John Reck
f6fcd16afe
am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
...
* commit '2959916b13165f56431f3993bd6b16364032af14':
Update the Desktop UA to Chrome
2011-05-24 11:06:38 -07:00
John Reck
79b4767c7b
Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
2011-05-24 11:03:11 -07:00
Steve Block
0112f524e1
Merge "In DRT2, correctly handle the case of zero tests"
2011-05-24 10:55:17 -07:00
Steve Block
90011b69ff
Merge changes Ibe495cdc,I6f8e5745
...
* changes:
Update DRT2 to reflect WebKit code movement
Add extra error handling to DRT2 launcher script
2011-05-24 10:48:21 -07:00
Wink Saville
d910297ba5
am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE
...
* commit '543c3146cb011380e4328e049abf97bc797db95a':
Handle ProvideLocalInfo stk command.
2011-05-24 10:10:13 -07:00
Wink Saville
4069906902
Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE
2011-05-24 10:06:58 -07:00
Gilles Debunne
7573a45c2b
Merge "Made getOffsetForPosition public in TextView."
2011-05-24 09:26:44 -07:00
Gilles Debunne
9456922422
Merge "TextView uses floats for touch event positions."
2011-05-24 09:26:14 -07:00
Gilles Debunne
584cebdfee
Merge "Added a new flag in TextView to disable Suggestions."
2011-05-24 09:25:52 -07:00
TK MUN
30006daf18
am 98a8231e: (-s ours) am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received
...
* commit '98a8231e838d7d624c5862d81d1975ef4f8d0d57':
DO NOT MERGE SystemUI: update signal level when broadcast is received
2011-05-24 08:44:12 -07:00
Wink Saville
f14c9f7b90
am 9a8ea20d: am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
...
* commit '9a8ea20d4b3975d3f771364fb9f2272c32f8cad1':
Map multiple apnType to one DataConnection fixes.
2011-05-24 08:42:10 -07:00
Wink Saville
fb530441a4
am b1817383: am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE
...
* commit 'b1817383050986413805fbbf2c1cc5c03417574d':
Data Connection: Use Alarm for all delayed data retries.
2011-05-24 08:42:05 -07:00
Shimeng (Simon) Wang
af61137fab
am f55a00b1: am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
...
* commit 'f55a00b1b86c58d78a4c2812d00e1b61d03f520a':
Simplify browser pause/resume logic to avoid stuck timer.
2011-05-24 08:41:37 -07:00
James Dong
e09d1ae671
resolved conflicts for merge of d5762583 to master
...
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
2011-05-24 08:04:45 -07:00
Xavier Ducrohet
69a54910a3
am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
...
* commit '46e802e9c12befcd477e59437c5de3f0889aef4e':
Merge e57aa434 from honeycomb-mr1. do not merge.
2011-05-24 02:57:37 -07:00
Xavier Ducrohet
15498dbaa1
am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
...
* commit 'ea182704b60551a9bd7760aa9d206ca7a7e407b8':
Merge 05b7b69c from honeycomb-mr1. do not merge.
2011-05-24 02:57:31 -07:00
Xavier Ducrohet
48a1df1192
am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
...
* commit '162dd490cd0b502c717db59300b3fd902f76710a':
Merge 2fae858d from Honeycomb-mr1. do not merge.
2011-05-24 02:57:11 -07:00
Kazuhiro Ondo
0fcce06586
am 6056e326: am f96a6150: Data reconnection issue after airplane mode
...
* commit '6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e':
Data reconnection issue after airplane mode
2011-05-24 02:56:15 -07:00
Kazuhiro Ondo
24e3415293
am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links
...
* commit '8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e':
GSM DCT: Update poll stats to support multi-links
2011-05-24 02:56:08 -07:00
Wink Saville
7f5ed6d440
am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change
...
* commit '7abbf93c854cd7d272183b674373e989a05da6dd':
Tear down connection with unwanted linkproperty change
2011-05-24 02:38:17 -07:00
Wink Saville
bfa99fe863
am f7bc0e28: am 16e8d22b: Fix build.
...
* commit 'f7bc0e28bf66c20ef233a161cd1d50a009013ab0':
Fix build.
2011-05-24 00:39:54 -07:00
Irfan Sheriff
af981a43af
am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE
...
* commit '9a7376396ccd272d4be429373e06ae64fe096380':
Clear network id when invalid
2011-05-23 22:33:33 -07:00
Irfan Sheriff
88c0592727
Merge "Clear network id when invalid" into honeycomb-LTE
2011-05-23 22:30:33 -07:00
Wink Saville
d434d03193
am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
...
* commit 'f8d70b14e4285d17d83cc4853f50b44d6a55fbc7':
Notify RIL that PDP reset is triggered due to data stall
2011-05-23 20:49:05 -07:00
John Wang
29d17fa745
am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE
...
* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
Add UI to handle SIM swap.
2011-05-23 20:48:57 -07:00
Jim Miller
749e2669da
am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
...
* commit '59a3319ffce100d671145b5bfee7450038b250bf':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
2011-05-23 20:48:36 -07:00
Tadashi G. Takaoka
3336d13142
Merge "Add new imeFullscreenBackground for Theme.InputMethod.Holo"
2011-05-23 19:00:01 -07:00
Jeffrey Tinker
b152f82fa1
am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 " into honeycomb-mr2
...
* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
2011-05-23 18:47:17 -07:00
Jeff Sharkey
41c407ead7
Merge "Observe screen on/off events in NetworkPolicy."
2011-05-23 18:47:11 -07:00
Mike Lockwood
73bd833f1d
am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2
...
* commit 'c0d9834a1c6dd8d9cd0b7fe9b50495578c104405':
GPS: Change NTP polling interval from 4 to 24 hours
2011-05-23 18:45:17 -07:00
Mathias Agopian
4dc5b2bae2
Merge "fix x86 build"
2011-05-23 18:39:40 -07:00
Jeff Sharkey
a5d7f3ee26
Merge "APIs to profile network usage for current UID."
2011-05-23 18:38:04 -07:00
Wink Saville
9a74120bf2
am 0ba62525: am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE
...
* commit '0ba625259e8c4af3df2c7823fc1d18b42d760a44':
Fix broken data retry
2011-05-23 18:25:52 -07:00
Jeffrey Tinker
58b5ba395c
am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 " into honeycomb-mr2
...
* commit 'ef89cc14957ab631346564801841190346632ac9':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
2011-05-23 18:15:47 -07:00
Jeffrey Tinker
e56ab8987a
Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 " into honeycomb-mr2
2011-05-23 18:10:10 -07:00
Mike Lockwood
dad49d9f53
am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2
...
* commit '5d78e0b8ea548da3fa88ae2190a9334297b992b6':
GPS: Change NTP polling interval from 4 to 24 hours
2011-05-23 18:04:44 -07:00
Mike Lockwood
e8b9b1ad24
Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2
2011-05-23 18:01:50 -07:00
Mathias Agopian
1cadb25da1
fix x86 build
...
Change-Id: I03cfbfeaeb8b13842248856b14b4a23711036e10
2011-05-23 17:48:36 -07:00
Jeff Brown
1eb42cf6db
Refactor how timeouts are calculated. (DO NOT MERGE)
...
Added a timeout mechanism to EventHub and InputReader so that
InputMappers can request timeouts to perform delayed processing of
input when needed.
Change-Id: I89c1171c9326c6e413042e3ee13aa9f7f1fc0454
2011-05-23 17:20:42 -07:00
Jeff Brown
c5982b7bee
Improve VelocityTracker numerical stability. (DO NOT MERGE)
...
Replaced VelocityTracker with a faster and more accurate
native implementation. This avoids the duplicate maintenance
overhead of having two implementations.
The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation. This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.
The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.
The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces. The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.
Bug: 4086785
Change-Id: I95054102397c4b6a9076dc6a0fc841b4beec7920
2011-05-23 17:19:59 -07:00
Jeff Brown
247da72a5b
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
...
1. Single finger tap performs a click.
2. Single finger movement moves the pointer (hovers).
3. Button press plus movement performs click or drag.
While dragging, the pointer follows the finger that is moving
fastest. This is important if there are additional fingers
down on the touch pad for the purpose of applying force
to an integrated button underneath.
4. Two fingers near each other moving in the same direction
are coalesced as a swipe gesture under the pointer.
5. Two or more fingers moving in arbitrary directions are
transformed into touches in the vicinity of the pointer.
This makes scale/zoom and rotate gestures possible.
Added a native VelocityTracker implementation to enable intelligent
switching of the active pointer during drags.
Change-Id: I7b7ddacc724fb1306e1590dbaebb740d3130d7cd
2011-05-23 17:19:38 -07:00
Adam Powell
4757db3872
am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
...
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
2011-05-23 17:18:54 -07:00
Wink Saville
ae1975337e
am 61a5ab57: am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
...
* commit '61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
Change getLteOnCdmaModeStatic to dynamically determine its result.
2011-05-23 17:18:29 -07:00
Amith Yamasani
1ec44accb6
am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
...
* commit '5b00912e5844591a846e8ba3c4710d2daaa8069a':
DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
2011-05-23 17:12:00 -07:00