Commit Graph

26380 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Huahui Wu
051b995952 Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb 2011-01-13 17:02:33 -08:00
Kenny Root
7baf65a24f 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
2231929bec Merge "Deep clone settings for system package update" into honeycomb 2011-01-13 16:55:00 -08:00
Alex Sakhartchouk
dc5820949f 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
Alex Sakhartchouk
ce78a36d82 Merge "Docs plus removing some junk per API review." into honeycomb 2011-01-13 16:27:23 -08:00
Jaikumar Ganesh
e4952100ad am e77e9da8: Merge "Fix bug in handling connect/disconnect multiple devices." into honeycomb
* commit 'e77e9da84946a2833ef8b0d1d476d6325768a244':
  Fix bug in handling connect/disconnect multiple devices.
2011-01-13 16:23:18 -08:00
Jaikumar Ganesh
b4ac9515d0 Merge "Fix bug in handling connect/disconnect multiple devices." into honeycomb 2011-01-13 16:21:12 -08:00
Brad Fitzpatrick
2575dcaa4e am 52ea9898: Merge "Remove accidental StrictMode logging left in." into honeycomb
* commit '52ea989874160be47aad75b285503959c0e4c0bb':
  Remove accidental StrictMode logging left in.
2011-01-13 16:18:51 -08:00
Brad Fitzpatrick
dfcf73d96b Merge "Remove accidental StrictMode logging left in." into honeycomb 2011-01-13 16:16:46 -08:00
Dianne Hackborn
8c5fe6d116 am 8eca7a1e: Merge "Fix issue #3153930: orphan window left on screen" into honeycomb
* commit '8eca7a1e11d905e1d89d4c45adfe210536b5f521':
  Fix issue #3153930: orphan window left on screen
2011-01-13 15:47:58 -08:00
Dianne Hackborn
9006e65eac Merge "Fix issue #3153930: orphan window left on screen" into honeycomb 2011-01-13 15:45:37 -08:00
Guang Zhu
9743677195 am 2c037d14: Merge "remove runFinalizationSync calls" into honeycomb
* commit '2c037d14b8dab0d863c7d380216316d03caaefc3':
  remove runFinalizationSync calls
2011-01-13 15:40:31 -08:00
Guang Zhu
13d57720c8 Merge "remove runFinalizationSync calls" into honeycomb 2011-01-13 15:38:44 -08:00
Gilles Debunne
20a39d22ad am 783e6c8b: Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb
* commit '783e6c8b3ba7eecac3bdd796b53a1293f9cb1be4':
  fix for cts DuplicateParentStateEnabled bug with TextViews.
2011-01-13 14:54:45 -08:00
Adam Powell
001a530f48 am 379a51d9: Merge "Fix bug 3242262 - Add queryHint attribute for SearchView" into honeycomb
* commit '379a51d96f1dc9db2dcc3288d536594c32f4b514':
  Fix bug 3242262 - Add queryHint attribute for SearchView
2011-01-13 14:54:32 -08:00
Gilles Debunne
b5ea8a91b0 Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb 2011-01-13 14:51:33 -08:00
Adam Powell
f0d6539cd7 Merge "Fix bug 3242262 - Add queryHint attribute for SearchView" into honeycomb 2011-01-13 14:51:16 -08:00
Svetoslav Ganov
daec3658f0 am cecb1db6: Merge "Invisible of gone views fire accessibility events." into honeycomb
* commit 'cecb1db6accffaa4749b1b0e71c0ec842c5b7a1a':
  Invisible of gone views fire accessibility events.
2011-01-13 14:48:22 -08:00
Svetoslav Ganov
5951c33c3a Merge "Invisible of gone views fire accessibility events." into honeycomb 2011-01-13 14:46:27 -08:00
Christopher Tate
3f2fe9139e am 6458202a: Merge "Suppress orientation changes during drag operations" into honeycomb
* commit '6458202abe0c9df932f44223d05761673ba6e9fa':
  Suppress orientation changes during drag operations
2011-01-13 14:22:05 -08:00
Christopher Tate
558992649f Merge "Suppress orientation changes during drag operations" into honeycomb 2011-01-13 14:20:48 -08:00
Xavier Ducrohet
848bdc7651 am a6cbd728: Merge "LayoutLib: Use the new log tag constants from LayoutLog" into honeycomb
* commit 'a6cbd72816932239a9d7e5fe665d05d6d0eae3bb':
  LayoutLib: Use the new log tag constants from LayoutLog
2011-01-13 13:47:06 -08:00
Xavier Ducrohet
7f796ba933 Merge "LayoutLib: Use the new log tag constants from LayoutLog" into honeycomb 2011-01-13 13:45:38 -08:00
Jamie Gennis
9fd722c18a am 3defffe0: Merge "Fix remote GraphicBuffer allocation in SurfaceFlinger." into honeycomb
* commit '3defffe06e6989506698ecdce1be3149a33774c1':
  Fix remote GraphicBuffer allocation in SurfaceFlinger.
2011-01-13 13:00:10 -08:00
Jamie Gennis
586531e557 am 57ce3909: Merge "Add logging to SurfaceTextureClient." into honeycomb
* commit '57ce3909fc05b06585bf11b14a704340a0763401':
  Add logging to SurfaceTextureClient.
2011-01-13 12:58:09 -08:00
Jamie Gennis
b5dc8004f3 Merge "Fix remote GraphicBuffer allocation in SurfaceFlinger." into honeycomb 2011-01-13 12:57:21 -08:00
Jamie Gennis
c16387eb1d Merge "Add logging to SurfaceTextureClient." into honeycomb 2011-01-13 12:56:38 -08:00
Fabrice Di Meglio
72d3327baa am 27ac243e: Merge "Print currentDestinationString() for each backup transport" into honeycomb
* commit '27ac243e2dc4688b6e761edc3ee85eb7a3bf1f21':
  Print currentDestinationString() for each backup transport
2011-01-13 12:46:55 -08:00
Jeff Hamilton
0938c360c0 am 52d3203e: Add dispatching overrides for foreground apps.
* commit '52d3203ef69d4babbc4dd030a15c08c0b8d1d226':
  Add dispatching overrides for foreground apps.
2011-01-13 12:46:16 -08:00