OSDN Git Service
Jeff Brown [Wed, 8 Jun 2011 21:04:33 +0000 (14:04 -0700)]
am
5f0b1721: am
25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
* commit '
5f0b1721eece5ca614044cda638f11fbec0eab0a':
Fix swipe gesture cosine calculation. Bug:
4124987
Jeff Brown [Wed, 8 Jun 2011 20:52:22 +0000 (13:52 -0700)]
am
25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
* commit '
25bd8abce993e17b382ea5c29a1cb68dd095cf45':
Fix swipe gesture cosine calculation. Bug:
4124987
Wink Saville [Wed, 8 Jun 2011 19:59:37 +0000 (12:59 -0700)]
am
a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
* commit '
a558fdf156601a477964139fee57da29de7f31b3':
Fix default preferred network.
Wink Saville [Wed, 8 Jun 2011 19:56:27 +0000 (12:56 -0700)]
Merge "Fix default preferred network." into honeycomb-LTE
Wink Saville [Wed, 8 Jun 2011 19:18:07 +0000 (12:18 -0700)]
Fix default preferred network.
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.
Some cleanup.
Bug:
4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
Jeff Brown [Tue, 7 Jun 2011 23:58:06 +0000 (16:58 -0700)]
Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 23:50:14 +0000 (16:50 -0700)]
Fix swipe gesture cosine calculation.
Bug:
4124987
Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.
Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
Adam Powell [Tue, 7 Jun 2011 23:37:35 +0000 (16:37 -0700)]
am
7ed8ff18: am
68b81434: Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '
7ed8ff18ce16312b86bd7da855e185b9ecc934a8':
Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector
Jake Hamby [Tue, 7 Jun 2011 23:32:10 +0000 (16:32 -0700)]
am
ae62b7b0: resolved conflicts for merge of
66040bbb to gingerbread-plus-aosp
* commit '
ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
Fixes for SMS Cell Broadcast support.
Jake Hamby [Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)]
resolved conflicts for merge of
66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
Adam Powell [Tue, 7 Jun 2011 23:22:32 +0000 (16:22 -0700)]
am
68b81434: Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '
68b81434963db90e0d5b14710e4edd86084ede3c':
Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector
Adam Powell [Tue, 7 Jun 2011 23:19:26 +0000 (16:19 -0700)]
Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
Adam Powell [Tue, 7 Jun 2011 23:13:08 +0000 (16:13 -0700)]
Fix bug
4533120 - rough handling of invalid event streams in
ScaleGestureDetector
Make ScaleGestureDetector a bit more tolerant of bogus event streams.
Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
John Wang [Tue, 7 Jun 2011 22:56:19 +0000 (15:56 -0700)]
am
fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
* commit '
fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
Make getDeviceId return null for Non-phone device.
Dianne Hackborn [Tue, 7 Jun 2011 22:56:05 +0000 (15:56 -0700)]
am
ee3de4a9: am
a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '
ee3de4a950a188c6a4d5fb732242249af4807837':
Remove compat mode dialog.
Dianne Hackborn [Tue, 7 Jun 2011 22:52:38 +0000 (15:52 -0700)]
am
b5b98f87: am
dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '
b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
DO NOT MERGE. Experimental compatibility mode UI.
John Wang [Tue, 7 Jun 2011 22:49:34 +0000 (15:49 -0700)]
Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
Dianne Hackborn [Tue, 7 Jun 2011 22:47:14 +0000 (15:47 -0700)]
am
a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '
a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
Remove compat mode dialog.
Dianne Hackborn [Tue, 7 Jun 2011 22:45:14 +0000 (15:45 -0700)]
Merge "Remove compat mode dialog." into honeycomb-mr2
Dianne Hackborn [Tue, 7 Jun 2011 22:44:22 +0000 (15:44 -0700)]
Remove compat mode dialog.
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
Dianne Hackborn [Tue, 7 Jun 2011 22:39:43 +0000 (15:39 -0700)]
am
dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '
dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
DO NOT MERGE. Experimental compatibility mode UI.
John Wang [Tue, 7 Jun 2011 22:37:09 +0000 (15:37 -0700)]
Make getDeviceId return null for Non-phone device.
For non-phone device, i.e. tablet doesn't have voice capability,
getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.
This behavior is suggested by developer scheme
http://android-developers.blogspot.com/2011/03/identifying-app-installations.html
and enforced by CTS testGetDeviceId.
bug:
4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
Dianne Hackborn [Tue, 7 Jun 2011 22:36:51 +0000 (15:36 -0700)]
Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
Xavier Ducrohet [Tue, 7 Jun 2011 22:09:39 +0000 (15:09 -0700)]
am
67f09cd0: (-s ours) am
d6ce6791: Merge "Cherrypick
d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '
67f09cd090adae6365ca36546b0a517e51255876':
Cherrypick
d1ed33c4 from hc-mr1. do not merge.
Xavier Ducrohet [Tue, 7 Jun 2011 22:09:31 +0000 (15:09 -0700)]
am
ab3f5779: (-s ours) am
ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit '
ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f':
Cherrypick
5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge
dba35f1b from honeycomb-mr1. do not merge.
Romain Guy [Tue, 7 Jun 2011 22:09:02 +0000 (15:09 -0700)]
am
fbef58fa: am
258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '
fbef58faad5a31faf36294e4d160cbd148ed5458':
Disable plugins if setPluginsEnabled(false) called.
Jake Hamby [Tue, 7 Jun 2011 22:03:51 +0000 (15:03 -0700)]
Merge "resolved conflicts for merge of
0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Mathias Agopian [Tue, 7 Jun 2011 22:02:53 +0000 (15:02 -0700)]
am
a6a4a9ed: am
f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
* commit '
a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63':
fix a surface leak introduced by a failed merge (DO NOT MERGE)
Jake Hamby [Tue, 7 Jun 2011 22:01:50 +0000 (15:01 -0700)]
resolved conflicts for merge of
0cb17a52 to honeycomb-plus-aosp
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
Mathias Agopian [Tue, 7 Jun 2011 21:58:02 +0000 (14:58 -0700)]
am
f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
* commit '
f6c8206735e7e078461e5f2aef6e1a1446fdd075':
fix a surface leak introduced by a failed merge (DO NOT MERGE)
Mathias Agopian [Tue, 7 Jun 2011 21:52:22 +0000 (14:52 -0700)]
fix a surface leak introduced by a failed merge (DO NOT MERGE)
Bug:
4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
Daniel Sandler [Tue, 7 Jun 2011 19:29:07 +0000 (15:29 -0400)]
DO NOT MERGE. Experimental compatibility mode UI.
♫ Just another button, for you and me, in the status bar. ♫
(cherry picked from commit
45c0401a0647a5fdc5f37168463c14ad57c5644b)
Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
Irfan Sheriff [Tue, 7 Jun 2011 20:44:40 +0000 (13:44 -0700)]
am
84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE
* commit '
84db79bb65bce5c1fd8a6e033cb7e4db4c04f9b1':
Clear IP configuration on lost network
Irfan Sheriff [Tue, 7 Jun 2011 20:40:38 +0000 (13:40 -0700)]
Merge "Clear IP configuration on lost network" into honeycomb-LTE
Andreas Huber [Tue, 7 Jun 2011 20:23:54 +0000 (13:23 -0700)]
am
8e973729: (-s ours) am
8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
* commit '
8e97372913c9236ffdee175c6da99dc00c22b3e1':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
Martijn Coenen [Tue, 7 Jun 2011 20:23:11 +0000 (13:23 -0700)]
am
ed1c8d7d: am
0aa1017f: Prevent allocation overflows by corrupt NDEF records.
* commit '
ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
Prevent allocation overflows by corrupt NDEF records.
John Wang [Tue, 7 Jun 2011 20:16:09 +0000 (13:16 -0700)]
am
71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
* commit '
71030e536522449f34dc584fda94f34e7be6ee19':
Add SIM PUK unlockscreen.
Robert Greenwalt [Tue, 7 Jun 2011 20:12:29 +0000 (13:12 -0700)]
am
5df69fad: resolved conflicts for merge of
8de47a2f to honeycomb-LTE
* commit '
5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
John Wang [Tue, 7 Jun 2011 19:56:49 +0000 (12:56 -0700)]
Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
Robert Greenwalt [Tue, 7 Jun 2011 19:45:41 +0000 (12:45 -0700)]
resolved conflicts for merge of
8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
Irfan Sheriff [Tue, 7 Jun 2011 19:29:59 +0000 (12:29 -0700)]
Clear IP configuration on lost network
Bug:
4391449
Change-Id: I574128083a5612f13fcccaf5ed091eae114b7943
Robert Greenwalt [Tue, 7 Jun 2011 19:00:37 +0000 (12:00 -0700)]
Merge "Reveal some network constants." into honeycomb-mr2
Adam Powell [Tue, 7 Jun 2011 18:36:32 +0000 (11:36 -0700)]
am
212d15c7: am
a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '
212d15c746f2611339026c16e5fa1aeb7f9090b7':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
Adam Powell [Tue, 7 Jun 2011 18:32:23 +0000 (11:32 -0700)]
am
a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '
a476813dccec241632810c1cbb11bcfbf17841b0':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
Wink Saville [Tue, 7 Jun 2011 18:03:25 +0000 (11:03 -0700)]
am
c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
* commit '
c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
Preferred network discrepancy after rild is restarted.
Robert Greenwalt [Tue, 7 Jun 2011 18:01:23 +0000 (11:01 -0700)]
am
350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '
350b78291de725a1607395055b6d28655d9e1080':
Fix NPE in the statusbar.
Wink Saville [Tue, 7 Jun 2011 17:58:09 +0000 (10:58 -0700)]
Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
Robert Greenwalt [Tue, 7 Jun 2011 17:57:20 +0000 (10:57 -0700)]
Merge "Fix NPE in the statusbar." into honeycomb-LTE
Wink Saville [Tue, 7 Jun 2011 17:44:43 +0000 (10:44 -0700)]
Preferred network discrepancy after rild is restarted.
If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.
bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
John Wang [Tue, 31 May 2011 18:20:55 +0000 (11:20 -0700)]
Add SIM PUK unlockscreen.
Puk unlockscreen is implemented as SimPukUnlockScreen.
Added config_enable_puk_unlock_screen to control the display of puk unlock screen.
Using config_voice_capable to control the display of emergency call button.
bug:
4384956
Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
Adam Powell [Fri, 3 Jun 2011 00:40:51 +0000 (17:40 -0700)]
Make Theme.Holo.Light.NoActionBar and
Theme.Holo.Light.NoActionBar.Fullscreen public.
Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:28 +0000 (10:01 -0700)]
am
c8410017: (-s ours) am
1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '
c8410017502dacff43ecd3e0926049b99fc186a8':
Remove discoverable timeout handler. DO NOT MERGE
Jeff Brown [Tue, 7 Jun 2011 04:11:44 +0000 (21:11 -0700)]
am
fd324486: am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
fd3244868dec40707039cd616dd37ada41774547':
Fix build.
Jeff Brown [Tue, 7 Jun 2011 04:08:25 +0000 (21:08 -0700)]
am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
5cb05eea289559b30cf4f84130cb6afba0921638':
Fix build.
Jeff Brown [Tue, 7 Jun 2011 04:06:30 +0000 (21:06 -0700)]
Merge "Fix build." into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 04:04:14 +0000 (21:04 -0700)]
Fix build.
Change-Id: I9ea07637058e2aa74d20d881bc21fea305cc869e
Jeff Brown [Tue, 7 Jun 2011 03:36:49 +0000 (20:36 -0700)]
am
bbbab26e: am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
Revert velocity damping. Bug:
4364920
Jeff Brown [Tue, 7 Jun 2011 03:36:41 +0000 (20:36 -0700)]
am
797dc698: am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
797dc698e9ff85c1a09874cc3f7bfe825b2ff0e1':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:34:38 +0000 (20:34 -0700)]
am
b3536145: am
ed48fa89: Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
* commit '
b3536145725250401d25ffa00cda85d222dfc21e':
Touch pad improvements. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:34:35 +0000 (20:34 -0700)]
am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
Revert velocity damping. Bug:
4364920
Irfan Sheriff [Tue, 7 Jun 2011 03:34:35 +0000 (20:34 -0700)]
am
b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '
b400184ad6277676048a30b042ed0667de662ad8':
Handle AsyncChannel disconnect in WifiService
Jeff Brown [Tue, 7 Jun 2011 03:34:33 +0000 (20:34 -0700)]
am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:32:25 +0000 (20:32 -0700)]
am
ed48fa89: Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
* commit '
ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
Touch pad improvements. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:32:18 +0000 (20:32 -0700)]
Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:32:02 +0000 (20:32 -0700)]
am
277bfd7c: am
c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '
277bfd7cdd889e4f59e57925b90d1899f7312c4e':
Improve browser scrolling when using the mouse wheel.
Irfan Sheriff [Tue, 7 Jun 2011 03:31:55 +0000 (20:31 -0700)]
Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
Jeff Brown [Tue, 7 Jun 2011 03:31:55 +0000 (20:31 -0700)]
Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:30:47 +0000 (20:30 -0700)]
Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:29:08 +0000 (20:29 -0700)]
am
c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '
c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
Improve browser scrolling when using the mouse wheel.
Jeff Brown [Tue, 7 Jun 2011 03:27:28 +0000 (20:27 -0700)]
Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:23:54 +0000 (20:23 -0700)]
Revert velocity damping.
Bug:
4364920
Velocity damping proved to be a bad idea because it would
cause a significant ramp in velocity at the beginning of
a gesture, instead of the desired smooth behavior. Oh well.
Change-Id: Ie631946f47ef2492bd71fbed1ab44bbb39a875a8
Jeff Brown [Tue, 7 Jun 2011 03:03:18 +0000 (20:03 -0700)]
Simplify spot tracking logic.
Bug:
4124987
Since spots are now one-to-one with the touch gesture points,
we can eliminate a lot of redundant logic that assumed they weren't.
Change-Id: Ic60d8d0898c285317f480bc8fb17fb9797770e69
Jeff Brown [Tue, 7 Jun 2011 02:23:05 +0000 (19:23 -0700)]
Touch pad improvements.
Bug:
4124987
Only show one spot per touch point instead of one spot per
finger for multitouch gestures.
Tweaked the pointer acceleration curves.
Dissociated the hover/tap timeouts from the "tap" timeout
since they mean very different things.
Change-Id: I7c2cbd30feeb65ebc12f6c7e33a67dc9a9f59d4c
Jeff Brown [Tue, 7 Jun 2011 01:59:41 +0000 (18:59 -0700)]
Improve browser scrolling when using the mouse wheel.
The way that smooth scrolling is implemented in the Browser,
repeated requests to scroll by a certain amount do not add up
to one large scroll by the cumulative amount. This makes
the mouse wheel unusable on large pages because the Browser
will scroll at a more or less constant rate no matter how often
the wheel is turned.
The fix is to not animate scrolls when using the mouse wheel.
Change-Id: I23c05cdd2383944b8730deb225b7f3f57f1729df
Jake Hamby [Fri, 3 Jun 2011 02:52:23 +0000 (19:52 -0700)]
Fixes for SMS Cell Broadcast support.
Add support for ETWS primary notification messages.
Add method for easy concatenation of GSM multi-part broadcasts.
Add test cases for SmsCbHeader, SmsCbMessage and IntRangeManager.
Change-Id: Ifc646a011e79ad6c7eace9afcf84b1216eb42b7a
Dianne Hackborn [Tue, 7 Jun 2011 01:18:34 +0000 (18:18 -0700)]
am
fc3fa5dc: am
1b405592: Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '
fc3fa5dc1045a8f25fc1982443e05873edf028df':
Fix issue #
4539687: At least one compatibility-mode app (Androminion)...
Xavier Ducrohet [Tue, 7 Jun 2011 01:11:33 +0000 (18:11 -0700)]
am
f6e47999: am
2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit '
f6e479993e7c85265692829990ceb3879fbce424':
Import the Layoutlib from hc-mr1.
Xavier Ducrohet [Tue, 7 Jun 2011 01:08:40 +0000 (18:08 -0700)]
am
d6ce6791: Merge "Cherrypick
d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '
d6ce6791f26fd0a7cf89ded2847011a4894013e1':
Cherrypick
d1ed33c4 from hc-mr1. do not merge.
Xavier Ducrohet [Tue, 7 Jun 2011 01:08:32 +0000 (18:08 -0700)]
am
ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit '
ee1b497648a0c3c03b09c4739619f23315d491fb':
Cherrypick
5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge
dba35f1b from honeycomb-mr1. do not merge.
Romain Guy [Tue, 7 Jun 2011 00:54:12 +0000 (17:54 -0700)]
am
258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '
258f32e2e3ff7f4f4b1395cae292098141047fde':
Disable plugins if setPluginsEnabled(false) called.
Dianne Hackborn [Tue, 7 Jun 2011 00:33:59 +0000 (17:33 -0700)]
am
1b405592: Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '
1b405592550c719aa5dd93178705ae08b4e84a2f':
Fix issue #
4539687: At least one compatibility-mode app (Androminion)...
Dianne Hackborn [Tue, 7 Jun 2011 00:30:50 +0000 (17:30 -0700)]
Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
Dianne Hackborn [Tue, 7 Jun 2011 00:27:54 +0000 (17:27 -0700)]
Fix issue #
4539687: At least one compatibility-mode app (Androminion)...
...will only launch when held in portrait mode.
There was a bug in the window manager that caused all of the careful code to
update the configuration in sync with movements between activities to break.
Now it is fixed, so this app works, and we no longer see the bad slow orientation
changes when switching between activities that want to be in different
orientations.
Change-Id: I5d93f99649849bdaca2e8bebade6b91b8b6cf645
Robert Greenwalt [Mon, 6 Jun 2011 22:28:45 +0000 (15:28 -0700)]
Fix NPE in the statusbar.
Happens for some reason when switching between LTE and CDMA. Filing separate
bug about why we see the null ServiceState in that case, but it revealed
this one use which wasn't checked for null.
bug:
4518551
Change-Id: If8f9a89658a7165d79f96cad7d99cbf670e96ae7
Romain Guy [Mon, 6 Jun 2011 23:23:25 +0000 (16:23 -0700)]
Merge "Disable plugins if setPluginsEnabled(false) called."
Xavier Ducrohet [Mon, 6 Jun 2011 23:20:16 +0000 (16:20 -0700)]
am
2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit '
2a6dc7f19d463c7c9f7aacd12eca5263afd25a90':
Import the Layoutlib from hc-mr1.
Xavier Ducrohet [Mon, 6 Jun 2011 23:17:44 +0000 (16:17 -0700)]
Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
Jake Hamby [Mon, 6 Jun 2011 22:33:37 +0000 (15:33 -0700)]
resolved conflicts for merge of
ab79ee4a to gingerbread-plus-aosp
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
Mathias Agopian [Mon, 6 Jun 2011 22:25:32 +0000 (15:25 -0700)]
am
c1cbf452: am
24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '
c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Mathias Agopian [Mon, 6 Jun 2011 22:21:44 +0000 (15:21 -0700)]
am
24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '
24855c09173a6caaec7dcedd0c2d7ce15121d39b':
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Irfan Sheriff [Mon, 6 Jun 2011 19:54:06 +0000 (12:54 -0700)]
Handle AsyncChannel disconnect in WifiService
Backport change I928544a0 to LTE branch and also handle
disconnect on WifiStateMachine channel
Bug:
4473750
Change-Id: I556330c10243a1805555f6bf6dcc7e43b78e3bfd
Mathias Agopian [Mon, 6 Jun 2011 16:55:15 +0000 (09:55 -0700)]
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Fix a race that could cause GL commands to be executed from the wrong thread.
RefBase subclasses can now decide how they want to be destroyed.
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
initial cherry-pick:
resolved conflicts for merge of
b9783b49 to honeycomb-plus-aosp
Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
Nick Pelly [Mon, 6 Jun 2011 18:52:21 +0000 (11:52 -0700)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
TK MUN [Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)]
am
cecb710a: am
94260caf: Allow control over search order for tethering upstream interface selection
* commit '
cecb710a6de249a3847da2f07464a1aecf9459ac':
Allow control over search order for tethering upstream interface selection
Eric Fischer [Mon, 6 Jun 2011 18:50:16 +0000 (11:50 -0700)]
am
e9d32283: am
b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
e9d32283e4eca1ee27218ed66f754a694678ac6d':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Mon, 6 Jun 2011 18:34:11 +0000 (11:34 -0700)]
am
58ada2f3: am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
58ada2f3bbab749fb5a813fb8f82eee347080405':
Require bonding and encryption for PBAP server
Jean-Baptiste Queru [Mon, 6 Jun 2011 18:33:52 +0000 (11:33 -0700)]
am
54ab72e1: am
038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
* commit '
54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
Eric Fischer [Mon, 6 Jun 2011 17:54:41 +0000 (10:54 -0700)]
am
b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
b16b020dd32147fbaaf7de47d5de16bfee10967a':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 6 Jun 2011 17:38:42 +0000 (10:38 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Marco Nelissen [Mon, 6 Jun 2011 16:55:15 +0000 (09:55 -0700)]
resolved conflicts for merge of
b9783b49 to honeycomb-plus-aosp
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643