Ben Murdoch
5ff2aa1590
am c69d5f3b: Merge "Hook up CacheManager for the Chromium HTTP stack" into honeycomb
...
* commit 'c69d5f3b536a56da9120ace34e05b9878ed164c6':
Hook up CacheManager for the Chromium HTTP stack
2011-01-14 09:41:44 -08:00
Ben Murdoch
26280d874f
Merge "Hook up CacheManager for the Chromium HTTP stack" into honeycomb
2011-01-14 09:40:13 -08:00
Wink Saville
2e3e63e55b
Merge "Support RIL_REQUEST_SETUP_DATA_CALL version 5."
2011-01-14 06:36:14 -08:00
Shih-wei Liao
14dbab7887
am 804e66a5: am 076b770c: bcc interface fixed.
...
* commit '804e66a543c0dd89455b35049072a8977d080a3f':
bcc interface fixed.
2011-01-14 06:31:34 -08:00
Shih-wei Liao
371b0f3cf1
am 076b770c: bcc interface fixed.
...
* commit '076b770c2a9a72af768e41738e9e1b282acd4669':
bcc interface fixed.
2011-01-14 06:29:41 -08:00
Shih-wei Liao
f6164796d2
am 6907cf18: am c458106f: Merge "Retire librslib_rt." into honeycomb
...
* commit '6907cf188e2cd2d7ac543124b7b991d6f7f9543f':
Retire librslib_rt.
2011-01-14 05:07:07 -08:00
Shih-wei Liao
61b9d57618
am dacc0cf2: am 0c19b834: Merge "Move linking stuff to libbcc." into honeycomb
...
* commit 'dacc0cf24b6b45fa0374f6a99f90b87aa596cf0a':
Move linking stuff to libbcc.
2011-01-14 05:07:04 -08:00
Shih-wei Liao
3c121da9df
am c458106f: Merge "Retire librslib_rt." into honeycomb
...
* commit 'c458106f0eeda65706897352acbc0c11be43f0ad':
Retire librslib_rt.
2011-01-14 05:05:33 -08:00
Shih-wei Liao
3889efe617
am 0c19b834: Merge "Move linking stuff to libbcc." into honeycomb
...
* commit '0c19b834f7a56d051d06556a54454a7af36ca674':
Move linking stuff to libbcc.
2011-01-14 05:05:30 -08:00
Shih-wei Liao
73b8ffe170
Merge "Retire librslib_rt." into honeycomb
2011-01-14 05:03:28 -08:00
Shih-wei Liao
f5199748fb
Merge "Move linking stuff to libbcc." into honeycomb
2011-01-14 05:03:09 -08:00
Shih-wei Liao
78893171ab
am 50b65aa2: am 47fcc7ee: Merge "Avoid converting rslib.bc to things like rslib.h. So we are less error-prone." into honeycomb
...
* commit '50b65aa29f32230b8b94b367f0f33a4a8c4a5cf5':
Avoid converting rslib.bc to things like rslib.h. So we are less error-prone.
2011-01-14 04:41:33 -08:00
Shih-wei Liao
b2ef7480eb
am 47fcc7ee: Merge "Avoid converting rslib.bc to things like rslib.h. So we are less error-prone." into honeycomb
...
* commit '47fcc7ee7e5efd3200773ddb50755f0c4071e801':
Avoid converting rslib.bc to things like rslib.h. So we are less error-prone.
2011-01-14 04:39:53 -08:00
Steve Block
35cb4b3884
am 39bc608b: am 1916e7f3: Adds a new WebViewFragment class
...
* commit '39bc608bb1d88895cb73ea8144f0240fe1cee26e':
Adds a new WebViewFragment class
2011-01-14 04:38:27 -08:00
Shih-wei Liao
ed1c9c62c9
Merge "Avoid converting rslib.bc to things like rslib.h. So we are less error-prone." into honeycomb
2011-01-14 04:37:59 -08:00
Steve Block
1bc4187820
am 1916e7f3: Adds a new WebViewFragment class
...
* commit '1916e7f3a341f9b25571ca4bde8ea1d8a22d815a':
Adds a new WebViewFragment class
2011-01-14 04:36:46 -08:00
Hung-ying Tyan
b92c6bd382
Merge "Fix VPN notification helper."
2011-01-14 01:57:06 -08:00
satok
0cc12b8792
am a4bb5c1e: am 15572ff6: Merge "Save input method subtype even if the current IME is not running." into honeycomb
...
* commit 'a4bb5c1e29bc479ff571d22d89f47503c11b5f8b':
Save input method subtype even if the current IME is not running.
2011-01-14 00:17:23 -08:00
satok
0b12784720
am 15572ff6: Merge "Save input method subtype even if the current IME is not running." into honeycomb
...
* commit '15572ff6e57a5e60d57f4e16c1e196d9203559d9':
Save input method subtype even if the current IME is not running.
2011-01-14 00:15:41 -08:00
satok
073322d46a
Merge "Save input method subtype even if the current IME is not running." into honeycomb
2011-01-14 00:13:16 -08:00
Jeff Hamilton
dc154a1817
am d7b3dde6: Merge "resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'd7b3dde6870f00c461f92798534d639669632184':
Add dispatching overrides for foreground apps.
2011-01-13 23:00:00 -08:00
Jeff Hamilton
96aa8e9865
Merge "resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-13 22:58:08 -08:00
Jeff Hamilton
5573e5583b
resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp
...
Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f
2011-01-14 00:38:31 -06:00
Adam Powell
9436edad45
am 95ad5c54: am 2421cd42: Merge "Fix bug 3352112 - crash in AbsListView.smoothScrollBy" into honeycomb
...
* commit '95ad5c54ea83832f3d71218531cb23a791f4248f':
Fix bug 3352112 - crash in AbsListView.smoothScrollBy
2011-01-13 22:25:33 -08:00
Adam Powell
fe9fe94ec7
am 2421cd42: Merge "Fix bug 3352112 - crash in AbsListView.smoothScrollBy" into honeycomb
...
* commit '2421cd42292b3593716407847d2957f71c92c1fe':
Fix bug 3352112 - crash in AbsListView.smoothScrollBy
2011-01-13 22:23:41 -08:00
Adam Powell
568e54b2a7
Merge "Fix bug 3352112 - crash in AbsListView.smoothScrollBy" into honeycomb
2011-01-13 22:21:15 -08:00
Dianne Hackborn
9d18608623
am 002fa80d: am 84543705: Merge "Fix issue #3330037 : Unnecessary orientations appear..." into honeycomb
...
* commit '002fa80d1ab0a85c40d0e1a9b1abaff282c028a1':
Fix issue #3330037 : Unnecessary orientations appear...
2011-01-13 21:17:50 -08:00
Dianne Hackborn
802c5d0713
am 84543705: Merge "Fix issue #3330037 : Unnecessary orientations appear..." into honeycomb
...
* commit '84543705138ed67494b9ecd64fadf4ab0bf46a0e':
Fix issue #3330037 : Unnecessary orientations appear...
2011-01-13 21:15:56 -08:00
Dianne Hackborn
f6cb9b6ffb
Merge "Fix issue #3330037 : Unnecessary orientations appear..." into honeycomb
2011-01-13 21:14:12 -08:00
Jeff Brown
84e041eb23
am 4f7a2d45: am 370f01bd: Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb
...
* commit '4f7a2d45f47c72a20888719d711f734ee5a90546':
Fix NPE in interceptKeyBeforeDispatching.
2011-01-13 20:05:18 -08:00
Jeff Brown
2245581025
am 370f01bd: Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb
...
* commit '370f01bd42377dc1b150fa09515c4871ab763698':
Fix NPE in interceptKeyBeforeDispatching.
2011-01-13 20:02:35 -08:00
Jeff Brown
dfb6d06ca6
Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb
2011-01-13 20:00:31 -08:00
Romain Guy
a001c4424e
am bd04922f: am 5b907be8: Merge "Move the main thread check to the appropriate place." into honeycomb
...
* commit 'bd04922f8fe08e132667da41fe55dad2e8044d0b':
Move the main thread check to the appropriate place.
2011-01-13 18:41:00 -08:00
Romain Guy
63f557661e
am 5b907be8: Merge "Move the main thread check to the appropriate place." into honeycomb
...
* commit '5b907be8f5c387e7580a8e43935250adabc408c8':
Move the main thread check to the appropriate place.
2011-01-13 18:38:25 -08:00
Romain Guy
fa65927287
Merge "Move the main thread check to the appropriate place." into honeycomb
2011-01-13 18:36:13 -08:00
Xavier Ducrohet
8d91ee256d
am 2991b37e: am 428a731d: Merge "LayoutLib: Fix multi-line text rendering." into honeycomb
...
* commit '2991b37e9929b9e1508187941352b5ec14a9eb69':
LayoutLib: Fix multi-line text rendering.
2011-01-13 18:33:43 -08:00
Xavier Ducrohet
c477005213
am 428a731d: Merge "LayoutLib: Fix multi-line text rendering." into honeycomb
...
* commit '428a731db9a2e5bb273f122cc103ec32ad802f90':
LayoutLib: Fix multi-line text rendering.
2011-01-13 18:32:10 -08:00
Xavier Ducrohet
19bcfd28db
Merge "LayoutLib: Fix multi-line text rendering." into honeycomb
2011-01-13 18:30:04 -08:00
Mathias Agopian
ad456f9878
fix [3312683] Camera mirroring problem after switching from back to front camera
...
the crop as well as buffer orientation can change at every frame, when that happens
we need to reset the hwc HAL (ie: set the GEOMETRY_CHANGED flag).
currently we achieve this by taking the same code path than an actual geometry change
which is a bit more heavy than necessary.
Change-Id: I751f9ed1eeec0c27db7df2e77d5d17c6bcc17a24
2011-01-13 17:53:01 -08:00
Romain Guy
a58e5932e6
am c8b30a3e: am 24bb317f: Merge "Remove debug code" into honeycomb
...
* commit 'c8b30a3e56b49f6a10539eeaa8c24fa57e65814e':
Remove debug code
2011-01-13 17:48:26 -08:00
Romain Guy
c68a4d7b32
am 24bb317f: Merge "Remove debug code" into honeycomb
...
* commit '24bb317fe260300d03be42dcdd9aab210fbed45b':
Remove debug code
2011-01-13 17:46:37 -08:00
Romain Guy
0484494c2c
Merge "Remove debug code" into honeycomb
2011-01-13 17:44:28 -08:00
Jason Sams
0c9999438f
am 290f4136: am e9d3da13: Merge "Re-implement img npot support in HC." into honeycomb
...
* commit '290f4136caced21565886dba7438f88528ca6d69':
Re-implement img npot support in HC.
2011-01-13 17:26:53 -08:00
Romain Guy
018692b38b
am fd160239: am 7f5690bb: Merge "Add debug logs for display lists." into honeycomb
...
* commit 'fd160239a1b156a61d5803ea4bebf76df086592c':
Add debug logs for display lists.
2011-01-13 17:24:44 -08:00
Jason Sams
fc2819b558
am e9d3da13: Merge "Re-implement img npot support in HC." into honeycomb
...
* commit 'e9d3da1374a4ce06610675f1f9b578b62fc23449':
Re-implement img npot support in HC.
2011-01-13 17:24:12 -08:00
Romain Guy
7c91abbb79
am 7f5690bb: Merge "Add debug logs for display lists." into honeycomb
...
* commit '7f5690bb1089980a73ad5d6dea2177cb74e8c9e7':
Add debug logs for display lists.
2011-01-13 17:22:06 -08:00
Jason Sams
ec399ba4c7
Merge "Re-implement img npot support in HC." into honeycomb
2011-01-13 17:21:02 -08:00
Romain Guy
8e01f93712
Merge "Add debug logs for display lists." into honeycomb
2011-01-13 17:20:47 -08:00
Huahui Wu
18bec19b55
am 4809e629: am bfbb089c: Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb
...
* commit '4809e629a62a0c2f44c4ad8f833b7f0602afcd64':
b/3133123 Pass touch point ids to WebKit.
2011-01-13 17:07:20 -08:00
Huahui Wu
f10955d430
am bfbb089c: Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb
...
* commit 'bfbb089c7fcb2bc74f55fe3c171ef1b6df78b2da':
b/3133123 Pass touch point ids to WebKit.
2011-01-13 17:04:39 -08:00