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
Eric Fischer
125407d62b
am 5a40b8ef: Merge "Add date format and map center resources for new locales." into gingerbread
...
* commit '5a40b8ef81034e00f886010c71dccd62b919028b':
Add date format and map center resources for new locales.
2011-01-13 13:11:39 -08:00
Eric Fischer
e6ec66185c
Merge "Add date format and map center resources for new locales." into gingerbread
2011-01-13 13:08:18 -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
Fabrice Di Meglio
f6562238fe
Merge "Print currentDestinationString() for each backup transport" into honeycomb
2011-01-13 12:45:27 -08:00
Svetoslav Ganov
bf2c956094
am 462433ae: Merge "DatePicker is calling back its listener on init." into honeycomb
...
* commit '462433ae94ff33f9591d910b662e63b821549cad':
DatePicker is calling back its listener on init.
2011-01-13 12:43:43 -08:00
Svetoslav Ganov
966938038f
Merge "DatePicker is calling back its listener on init." into honeycomb
2011-01-13 12:41:04 -08:00
Wei-Ta Chen
2fab5a3a1a
am 62cd5c97: (-s ours) am 61d9ffbf: Merge "Do not merge." into gingerbread
...
* commit '62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf':
Do not merge.
2011-01-13 12:38:38 -08:00
Gloria Wang
5dbe61d7d5
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
...
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
Initial OMA DRM forward lock contribution
2011-01-13 12:38:29 -08:00
Dan Morrill
f85c337dad
Merge "Fix merge conflict for 'c506ab89'" into honeycomb-plus-aosp
2011-01-13 12:21:07 -08:00
Jamie Gennis
9a78c90cd4
Fix remote GraphicBuffer allocation in SurfaceFlinger.
...
This change fixes a horrible hack that I did to allow application
processes to create GraphicBuffer objects by making a binder call to
SurfaceFlinger. This change introduces a new binder interface
specifically for doing this, and does it in such a way that
SurfaceFlinger will maintain a reference to the buffers until the app is
done with them.
Change-Id: Icb240397c6c206d7f69124c1497a829f051cb49b
2011-01-13 12:19:04 -08:00
Jamie Gennis
e5366c567a
Add logging to SurfaceTextureClient.
...
Change-Id: I984c3b9c88f8af613a50138188ff1b770e2de6b4
2011-01-13 12:19:03 -08:00
Jason parks
70a7cec0c4
am a3cdaa53: Revert "Remove the APIs for the old encryption scheme."
...
* commit 'a3cdaa5337fa573c4c61770195d6232c2e587090':
Revert "Remove the APIs for the old encryption scheme."
2011-01-13 12:18:40 -08:00
Jason parks
e36c415874
Revert "Remove the APIs for the old encryption scheme."
...
This reverts commit 1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
2011-01-13 14:15:43 -06:00
Romain Guy
301276c898
am c15c7a79: Merge "Cleanup implementation of hardware layers." into honeycomb
...
* commit 'c15c7a79a69733bd21d6548fd74c2874fdabe7e8':
Cleanup implementation of hardware layers.
2011-01-13 12:15:35 -08:00
Jamie Gennis
9a1754adcd
am 5865c494: Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb
...
* commit '5865c494a571a7e164218857d3b860004c50baf6':
Fix a bug in SurfaceTexture::dequeueBuffer.
2011-01-13 12:15:31 -08:00
Romain Guy
bd0ec24441
Merge "Cleanup implementation of hardware layers." into honeycomb
2011-01-13 12:13:59 -08:00
Jamie Gennis
0579d57502
Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb
2011-01-13 12:13:56 -08:00
Wei-Ta Chen
4f9c47d937
am 61d9ffbf: Merge "Do not merge." into gingerbread
...
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
2011-01-13 12:06:38 -08:00
Eric Laurent
0f033103f0
am 8eff4524: Merge "Fix issue 3302649." into honeycomb
...
* commit '8eff45242180c7dec2b437c3929cb7ea3345f60c':
Fix issue 3302649.
2011-01-13 12:02:35 -08:00
Wei-Ta Chen
4877837c2d
Merge "Do not merge." into gingerbread
2011-01-13 12:02:32 -08:00
Eric Laurent
a7196d2e83
Merge "Fix issue 3302649." into honeycomb
2011-01-13 11:59:13 -08:00
Dan Morrill
b34b504aff
Fix merge conflict for 'c506ab89'
...
Conflicts:
NOTICE
Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
2011-01-13 11:48:42 -08:00
Jamie Gennis
bb8721602e
am 9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
...
* commit '9aba2324ac8d7216732b42346bfcaf0be71eb22e':
Add getTransformMatrix to the SurfaceTexture API.
2011-01-13 11:31:03 -08:00
Jamie Gennis
e00b12aeeb
Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
2011-01-13 11:29:14 -08:00
Gloria Wang
17029ddb06
am a220a297: Merge "Initial OMA DRM forward lock contribution"
...
* commit 'a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
2011-01-13 11:11:51 -08:00
Eric Fischer
745781fc03
am 39d80c38: Merge "Import revised translations." into honeycomb
...
* commit '39d80c3846972e6204dfd956263a3fb6a799444d':
Import revised translations.
2011-01-13 11:03:47 -08:00
Eric Fischer
75dc53f237
Merge "Import revised translations." into honeycomb
2011-01-13 10:59:52 -08:00
Gloria Wang
afa4049617
Merge "Initial OMA DRM forward lock contribution"
2011-01-13 10:51:13 -08:00
Xavier Ducrohet
979b635068
am 310a4d81: LAyoutLib: Fix build by adding missing IWindowSession implementation.
...
* commit '310a4d815b693e358d151b9aa2823c5022993f9b':
LAyoutLib: Fix build by adding missing IWindowSession implementation.
2011-01-13 10:46:59 -08:00
Xavier Ducrohet
1c1ccdfc21
am 1f1957f5: Merge "LayoutLib: move MockView back into its original package." into honeycomb
...
* commit '1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f':
LayoutLib: move MockView back into its original package.
2011-01-13 10:28:05 -08:00
Xavier Ducrohet
36c284dfb1
am 66a95e4d: Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
...
* commit '66a95e4dbeb1c6d33ceb7c320033041e7f8e2aaa':
LayoutLib: Add getViewParent/getViewIndex on RenderSession.
2011-01-13 10:28:02 -08:00
Nick Pelly
562cae3549
am 18adceb4: am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
...
* commit '18adceb4273655b6cf8eaa9c6a2237d6fc1b8881':
New Intent defined for RF ON/OFF events
2011-01-13 10:26:28 -08:00
Brad Fitzpatrick
a3faee6937
am 54f428a6: am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
...
* commit '54f428a63f33f4722c09b7688e6ca7960394f81f':
Fix for crash when setting live wallpaper.
2011-01-13 10:26:19 -08:00