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
Mike Lockwood
dd47c337e4
am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
...
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:09:30 -07:00
Amith Yamasani
e5d0e60776
am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
...
* commit '51652f5674e266d62607324255517d41d225d9be':
DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
2011-05-23 17:08:48 -07:00
Mike Lockwood
ba53d912df
am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
...
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:06:47 -07:00
Amith Yamasani
793c8503d7
Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
2011-05-23 17:05:47 -07:00
Mike Lockwood
147079acee
Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
2011-05-23 17:04:01 -07:00
Dianne Hackborn
4068646b01
Merge "resolved conflicts for merge of 070a19e0 to master"
2011-05-23 16:59:20 -07:00
John Reck
57162780ea
am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
...
* commit '82de141db736b95b0e388ff060e2d2535192d769':
DO NOT MERGE Use previous version if version is a codename
2011-05-23 16:53:28 -07:00
John Reck
a59f1573e0
am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
...
* commit '4a74eb679917797bf77a20773e0c079f5cc808e4':
DO NOT MERGE Use previous version if version is a codename
2011-05-23 16:50:23 -07:00
John Reck
fe750a4010
Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
2011-05-23 16:47:32 -07:00
Dianne Hackborn
2f118cd350
am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
...
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
Add "television" mode.
2011-05-23 16:16:54 -07:00
Dianne Hackborn
14298e1c71
am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
...
* commit '40277df7c33c0fc381eec589c768fe86de4b4404':
Add "television" mode.
2011-05-23 16:07:43 -07:00
Dianne Hackborn
ac3311f484
Merge "Add "television" mode." into honeycomb-mr2
2011-05-23 15:18:20 -07:00
Dianne Hackborn
a6b34ef26a
Add "television" mode.
...
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
2011-05-23 15:11:08 -07:00
TK MUN
fafcebd0e2
am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received
...
* commit '59c87cb6074fe48dc0af20ef0082bdef0803dc45':
DO NOT MERGE SystemUI: update signal level when broadcast is received
2011-05-23 14:52:29 -07:00
TK MUN
c414a4660d
am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received
...
* commit '6f0394a3b4d6082c9cb01de4a220a3b082e1840a':
DO NOT MERGE SystemUI: update signal level when broadcast is received
2011-05-23 14:47:38 -07:00
Steve Block
8df959fe4f
Merge "Log a StrictMode violation when WebView methods are called on the wrong thread"
2011-05-23 14:34:00 -07:00
Dianne Hackborn
557e3dadda
resolved conflicts for merge of 070a19e0 to master
...
Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411
2011-05-23 14:10:26 -07:00
Wink Saville
15b729927a
am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
...
* commit '070eecef394175d7344cdadde675e8977a1609f0':
Map multiple apnType to one DataConnection fixes.
2011-05-23 13:42:14 -07:00
Wink Saville
eaa8373e3a
am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE
...
* commit 'd3924fe9f6c99bc92ed86195e07ba82d39043812':
Data Connection: Use Alarm for all delayed data retries.
2011-05-23 13:42:11 -07:00
Wink Saville
9e9b8e38a0
Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
2011-05-23 13:39:03 -07:00
Wink Saville
2a2f80d6d6
Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE
2011-05-23 13:38:36 -07:00
Shimeng (Simon) Wang
2d941d9261
am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
...
* commit 'de60ce66c117ebd224b9d3181e2184ec5cfe87f9':
Simplify browser pause/resume logic to avoid stuck timer.
2011-05-23 12:55:37 -07:00
Shimeng (Simon) Wang
45ae0d79ad
am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
...
* commit '358d2cd96403383cfb91bb68598a4cb2fe2e170e':
Simplify browser pause/resume logic to avoid stuck timer.
2011-05-23 12:14:04 -07:00
James Dong
65a38b6af4
am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 10:26:40 -07:00
Xavier Ducrohet
2bbb5c35c1
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
...
* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
Merge e57aa434 from honeycomb-mr1. do not merge.
2011-05-23 10:22:00 -07:00
Xavier Ducrohet
a81e01a111
am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
...
* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
Merge 05b7b69c from honeycomb-mr1. do not merge.
2011-05-23 10:21:57 -07:00
Xavier Ducrohet
8d54f983ba
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
...
* commit '9d9a7466cd051748ba656acd39265099294c4153':
Merge 2fae858d from Honeycomb-mr1. do not merge.
2011-05-23 10:21:49 -07:00
James Dong
9951acae07
am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 09:59:59 -07:00
Xavier Ducrohet
7e7703528c
am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
...
* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
Merge e57aa434 from honeycomb-mr1. do not merge.
2011-05-23 09:52:55 -07:00
Xavier Ducrohet
03f2861cae
am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
...
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
Merge 05b7b69c from honeycomb-mr1. do not merge.
2011-05-23 09:52:52 -07:00