satok
aefc622d69
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
a4bb5c1e29
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
15572ff6e5
Merge "Save input method subtype even if the current IME is not running." into honeycomb
2011-01-14 00:13:16 -08:00
satok
ca83021e35
Save input method subtype even if the current IME is not running.
...
Bug: 3325103
Change-Id: I6dfd19a0d494526cdb4cfb4230a5376ce94ca94a
2011-01-14 17:06:53 +09:00
Jeff Hamilton
86fbc0144e
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
d7b3dde687
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
93ec68e6a9
resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp
...
Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f
2011-01-14 00:38:31 -06:00
Adam Powell
1afc64e29d
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
95ad5c54ea
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
2421cd4229
Merge "Fix bug 3352112 - crash in AbsListView.smoothScrollBy" into honeycomb
2011-01-13 22:21:15 -08:00
Adam Powell
79303750df
Fix bug 3352112 - crash in AbsListView.smoothScrollBy
...
Change-Id: I00b4e5855a1c0861993670a38ed2cd946fd18594
2011-01-13 22:06:49 -08:00
Dianne Hackborn
6260570382
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
002fa80d1a
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
8454370513
Merge "Fix issue #3330037 : Unnecessary orientations appear..." into honeycomb
2011-01-13 21:14:12 -08:00
Dianne Hackborn
94cb2ebfc3
Fix issue #3330037 : Unnecessary orientations appear...
...
...when the device's physical orientation is portrait.
We now hold off on computing app token orientation while preparing
to open or close app tokens.
Also clean up a few other little issues.
Change-Id: Iae125a975c7706fb4d068c872fd172e69854ff15
2011-01-13 21:11:09 -08:00
Jeff Brown
e74330f324
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
4f7a2d45f4
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
370f01bd42
Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb
2011-01-13 20:00:31 -08:00
Jeff Brown
00ae87d4fd
Fix NPE in interceptKeyBeforeDispatching.
...
Bug: 3349786
Change-Id: Ic2f969ff8a654fdcfeca06199acca531ae5596d3
2011-01-13 19:58:24 -08:00
Romain Guy
e84505c667
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
501053a16d
Move the main thread check to the appropriate place.
...
Change-Id: Ic9bcf209e9398ea05b293a8cc31ac7f234b9de16
2011-01-13 18:38:45 -08:00
Romain Guy
bd04922f8f
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
5b907be8f5
Merge "Move the main thread check to the appropriate place." into honeycomb
2011-01-13 18:36:13 -08:00
Xavier Ducrohet
ac2c3d1594
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
2991b37e99
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
428a731db9
Merge "LayoutLib: Fix multi-line text rendering." into honeycomb
2011-01-13 18:30:04 -08:00
Xavier Ducrohet
bbefc8662a
LayoutLib: Fix multi-line text rendering.
...
Stupid indices.
Change-Id: I1dbdd04b8f25a5769de8dc21e6c513cef3e35635
2011-01-13 18:02:08 -08:00
Mathias Agopian
fb4dcb1a67
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
72846dddd2
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
1e3a431d07
Remove debug code
...
Change-Id: Idbc54d16adb4d86185d7196ea0297b5019d14ae4
2011-01-13 17:47:15 -08:00
Romain Guy
c8b30a3e56
am 24bb317f: Merge "Remove debug code" into honeycomb
...
* commit '24bb317fe260300d03be42dcdd9aab210fbed45b':
Remove debug code
2011-01-13 17:46:37 -08:00
Romain Guy
24bb317fe2
Merge "Remove debug code" into honeycomb
2011-01-13 17:44:28 -08:00
Wink Saville
abea3b892b
Support RIL_REQUEST_SETUP_DATA_CALL version 5.
...
Change-Id: I091166f368f4641b514d51ec4ca281c9b526491c
2011-01-13 17:44:01 -08:00
Jason Sams
4d588cf899
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
6141bb20ca
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
290f4136ca
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
ffac7fc504
Add debug logs for display lists.
...
Change-Id: I7bae8fd96e9eccb51f29f73e4069b4d3e6bdbdd7
2011-01-13 17:22:58 -08:00
Romain Guy
fd160239a1
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
e9d3da1374
Merge "Re-implement img npot support in HC." into honeycomb
2011-01-13 17:21:02 -08:00
Romain Guy
7f5690bb10
Merge "Add debug logs for display lists." into honeycomb
2011-01-13 17:20:47 -08:00
Huahui Wu
65e8c42c53
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
4809e629a6
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
Jason Sams
9333e64f79
Re-implement img npot support in HC.
...
Change-Id: Iac56ec54e46c998ec14f71d8e85eccdc5fb3aa91
2011-01-13 17:02:35 -08:00
Huahui Wu
bfbb089c7f
Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb
2011-01-13 17:02:33 -08:00
Kenny Root
2ab7084f31
am ce2fb189: am 402438bb: Merge "Deep clone settings for system package update" into honeycomb
...
* commit 'ce2fb1894210aa851946b4586cadffce68125a33':
Deep clone settings for system package update
2011-01-13 16:59:07 -08:00
Kenny Root
ce2fb18942
am 402438bb: Merge "Deep clone settings for system package update" into honeycomb
...
* commit '402438bb40795a3608509f40bcff6245698185ad':
Deep clone settings for system package update
2011-01-13 16:57:31 -08:00
Kenny Root
402438bb40
Merge "Deep clone settings for system package update" into honeycomb
2011-01-13 16:55:00 -08:00
Huahui Wu
e838a42778
b/3133123 Pass touch point ids to WebKit.
...
This is the CL in framework side and it needs the WebKit part CL:
https://android-git.corp.google.com/g/#change,89627
Change-Id: I11d4ffa29fa106d918332e6983090b06726ebd36
2011-01-13 16:47:17 -08:00
Alex Sakhartchouk
b961887f17
am 037a3b57: am 49dc58bf: Merge "Docs plus removing some junk per API review." into honeycomb
...
* commit '037a3b575a78aa5b01e1fcc8701e612c783375a2':
Docs plus removing some junk per API review.
2011-01-13 16:31:02 -08:00
Alex Sakhartchouk
037a3b575a
am 49dc58bf: Merge "Docs plus removing some junk per API review." into honeycomb
...
* commit '49dc58bf1cb6ed971899cd8a9d43174723b14dcf':
Docs plus removing some junk per API review.
2011-01-13 16:29:14 -08:00