40146 Commits

Author SHA1 Message Date
Jason parks
8c3dc00a7d am 4a534fa8: am a3cdaa53: Revert "Remove the APIs for the old encryption scheme."
* commit '4a534fa899e0101e26e5b670383aa357c10483b8':
  Revert "Remove the APIs for the old encryption scheme."
2011-01-13 12:21:10 -08:00
Jason parks
4a534fa899 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
Romain Guy
7d3347fbc2 am 718153c7: am c15c7a79: Merge "Cleanup implementation of hardware layers." into honeycomb
* commit '718153c71704f18ddd6e436df2008eb5ef9f6a06':
  Cleanup implementation of hardware layers.
2011-01-13 12:17:56 -08:00
Jamie Gennis
0842576bc1 am c3693a10: am 5865c494: Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb
* commit 'c3693a10d4cbea80e06541735dc53f89d4030acc':
  Fix a bug in SurfaceTexture::dequeueBuffer.
2011-01-13 12:17:53 -08:00
Jason parks
a3cdaa5337 Revert "Remove the APIs for the old encryption scheme."
This reverts commit 1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
2011-01-13 14:15:43 -06:00
Romain Guy
718153c717 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
c3693a10d4 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
c15c7a79a6 Merge "Cleanup implementation of hardware layers." into honeycomb 2011-01-13 12:13:59 -08:00
Jamie Gennis
5865c494a5 Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb 2011-01-13 12:13:56 -08:00
Romain Guy
ada830f639 Cleanup implementation of hardware layers.
The new implementation relies on OpenGLRenderer's existing layer
code instead of duplicating it. The new code is much cleaner, with
simpler and better APIs and allows tracking of drawn regions inside
layers. Region tracking is not yet enabled but this will be done
in a future CL.

Change-Id: Ie826121a2227de8252c77b992a61218defea5143
2011-01-13 12:13:20 -08:00
Eric Laurent
d616aec74f am 345fb531: am 8eff4524: Merge "Fix issue 3302649." into honeycomb
* commit '345fb5313b0cf7da62f6fddb49e5d8d946824048':
  Fix issue 3302649.
2011-01-13 12:05:09 -08:00
Eric Laurent
345fb5313b am 8eff4524: Merge "Fix issue 3302649." into honeycomb
* commit '8eff45242180c7dec2b437c3929cb7ea3345f60c':
  Fix issue 3302649.
2011-01-13 12:02:35 -08:00
Eric Laurent
8eff452421 Merge "Fix issue 3302649." into honeycomb 2011-01-13 11:59:13 -08:00
Jamie Gennis
88d0738ef3 am c75d901c: am 9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
* commit 'c75d901cc4b50818f4bc601979da0be4204b277a':
  Add getTransformMatrix to the SurfaceTexture API.
2011-01-13 11:33:25 -08:00
Jamie Gennis
c75d901cc4 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
9aba2324ac Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb 2011-01-13 11:29:14 -08:00
Eric Fischer
7b5120fddb am a37d341b: am 39d80c38: Merge "Import revised translations." into honeycomb
* commit 'a37d341bf4a248d4cbb96d9cd8e42ee570bf5e25':
  Import revised translations.
2011-01-13 11:15:01 -08:00
Eric Fischer
a37d341bf4 am 39d80c38: Merge "Import revised translations." into honeycomb
* commit '39d80c3846972e6204dfd956263a3fb6a799444d':
  Import revised translations.
2011-01-13 11:03:47 -08:00
Eric Fischer
39d80c3846 Merge "Import revised translations." into honeycomb 2011-01-13 10:59:52 -08:00
Xavier Ducrohet
965c04f1c8 am b7f50928: am 310a4d81: LAyoutLib: Fix build by adding missing IWindowSession implementation.
* commit 'b7f50928a3e5ba233f3bbe8a35a2d65924802dc7':
  LAyoutLib: Fix build by adding missing IWindowSession implementation.
2011-01-13 10:49:21 -08:00
Xavier Ducrohet
b7f50928a3 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
310a4d815b LAyoutLib: Fix build by adding missing IWindowSession implementation.
Change-Id: I0af178d149b782cac3ae0c36fa5fc03f4dc6118b
2011-01-13 10:43:00 -08:00
Xavier Ducrohet
7c00e5438b am 5ab7ccdd: am 1f1957f5: Merge "LayoutLib: move MockView back into its original package." into honeycomb
* commit '5ab7ccdd37ad525a72392e9ae9d4960eba901bbd':
  LayoutLib: move MockView back into its original package.
2011-01-13 10:32:37 -08:00
Xavier Ducrohet
a496f6c031 am 2483d087: am 66a95e4d: Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
* commit '2483d087e22b64b5b16ba8141228910f0fd840f6':
  LayoutLib: Add getViewParent/getViewIndex on RenderSession.
2011-01-13 10:32:33 -08:00
Nick Pelly
a129b0209a am 02012b3a: am 18adceb4: am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '02012b3a4ba962598caec6ed59b112ea0a590d1b':
  New Intent defined for RF ON/OFF events
2011-01-13 10:32:24 -08:00
Brad Fitzpatrick
078481ffcf am b841fa63: am 54f428a6: am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit 'b841fa63026803093c093ad25ab0ccbd4c49e45b':
  Fix for crash when setting live wallpaper.
2011-01-13 10:32:20 -08:00
Kenny Root
04438fe667 am fad58bd4: am 47075079: (-s ours) am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit 'fad58bd4f0d18e439c6f83f1bcf6dbe715708edd':
  Add the {get,set}PackageObbPaths calls to API
2011-01-13 10:32:16 -08:00
James Dong
16c8518f70 am 089971ea: am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit '089971eaba92225aadec21d55d028df7948df012':
  Add audio encoding parameters check
2011-01-13 10:29:12 -08:00
Svetoslav Ganov
5f225280e3 am 575fbf61: am 06e32b43: Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
* commit '575fbf612a69715025de1fd543aa5b2aaa2d5ec4':
  Updating the WebView accessibility key bindings after discussion with the access-eng team
2011-01-13 10:28:48 -08:00
Xavier Ducrohet
5ab7ccdd37 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
2483d087e2 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
02012b3a4b 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
b841fa6302 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
Kenny Root
fad58bd4f0 am 47075079: (-s ours) am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '470750793b6e930a323ee63cbed05c43dc435ba1':
  Add the {get,set}PackageObbPaths calls to API
2011-01-13 10:26:13 -08:00
Jaikumar Ganesh
c7889131c0 am 56eaabd4: am b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
* commit '56eaabd4c51aee8d30b6785bcf6201048c8263ae':
  Phone crash when old callback func is woken up when enabling BT.
2011-01-13 10:25:32 -08:00
Alex Sakhartchouk
eea6382d04 am baa82f19: am d88ad4ab: Merge "Documentation" into honeycomb
* commit 'baa82f19eac147c6f0688961448184d817299d4d':
  Documentation
2011-01-13 10:25:29 -08:00
Robert Greenwalt
255362b604 am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65':
  Turn off DUN connection after tethering.
2011-01-13 10:25:25 -08:00
Gilles Debunne
be2f370f6a am 89d391a9: am b439221a: Merge "QuickContactBadge shows its pressed state" into honeycomb
* commit '89d391a978beb246cd00c12157a7cf0774019f1d':
  QuickContactBadge shows its pressed state
2011-01-13 10:25:20 -08:00
James Dong
089971eaba am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit 'c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
  Add audio encoding parameters check
2011-01-13 10:24:44 -08:00
Svetoslav Ganov
575fbf612a am 06e32b43: Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
* commit '06e32b434b62b22eeee900851ff56f2098ddc019':
  Updating the WebView accessibility key bindings after discussion with the access-eng team
2011-01-13 10:24:38 -08:00
Xavier Ducrohet
1f1957f50f Merge "LayoutLib: move MockView back into its original package." into honeycomb 2011-01-13 10:22:53 -08:00
Xavier Ducrohet
66a95e4dbe Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb 2011-01-13 10:22:43 -08:00
James Dong
c14b10c306 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Jaikumar Ganesh
56eaabd4c5 am b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
* commit 'b54fd91d1b843b7742bf6396cefa6c63b14dc6df':
  Phone crash when old callback func is woken up when enabling BT.
2011-01-13 10:21:15 -08:00
Alex Sakhartchouk
baa82f19ea am d88ad4ab: Merge "Documentation" into honeycomb
* commit 'd88ad4ab49280a19da6582ba6e776c296be79ec0':
  Documentation
2011-01-13 10:20:28 -08:00
Robert Greenwalt
4b43f94499 am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '495056ab6709bbf77879a4b556aa1d17446bfe48':
  Turn off DUN connection after tethering.
2011-01-13 10:19:39 -08:00
Gilles Debunne
89d391a978 am b439221a: Merge "QuickContactBadge shows its pressed state" into honeycomb
* commit 'b439221a5aa7c36fedb242ee9180ce46e4ad19b7':
  QuickContactBadge shows its pressed state
2011-01-13 10:19:30 -08:00
Svetoslav Ganov
06e32b434b Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb 2011-01-13 10:17:02 -08:00
Jaikumar Ganesh
b54fd91d1b Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb 2011-01-13 10:14:40 -08:00
Alex Sakhartchouk
d88ad4ab49 Merge "Documentation" into honeycomb 2011-01-13 10:14:14 -08:00