drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,398 Commits 1 Branch 0 Tags
Commit Graph

64398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
6d370ac037 am 8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '8646cd42df5edc5f5b9c52d6ab5309821e875656':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-21 17:58:42 -08:00
Romain Guy
f0401bc1fa am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 
* commit '8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
  Notify views when EGL resources are about to be destroyed Bug #5639899
 2011-11-21 17:58:40 -08:00
Mathias Agopian
8646cd42df Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-21 17:57:20 -08:00
Romain Guy
8cd39e3a10 Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 2011-11-21 17:57:05 -08:00
Adam Powell
5f9447b0fe am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 
* commit 'fb0784da5f602bf6410ef914d625c3cedfa11e9f':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views
 2011-11-21 17:37:08 -08:00
Adam Powell
fb0784da5f Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 2011-11-21 17:34:57 -08:00
Adam Powell
05c8277f34 Fix bug 5521467 - Monkeys and ActionBar custom tab views 
Remove custom tab views from old parents if applicable.

Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
 2011-11-21 17:14:56 -08:00
Nick Pelly
7dffeeefbb am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 
* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
 2011-11-21 16:05:33 -08:00
Nick Pelly
043a8b149d Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:40 -08:00
Jamie Gennis
834448eac5 am b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 
* commit 'b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54':
  EGL: Use cache sizes defined in the BoardConfig
 2011-11-21 15:56:17 -08:00
Jamie Gennis
9173eef644 am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 
* commit '53cf20202a3848a6c61b5229814268180a3d2f16':
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
 2011-11-21 15:56:15 -08:00
Jamie Gennis
b8d20d028c Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 2011-11-21 15:54:54 -08:00
Jamie Gennis
53cf20202a Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 
* changes:
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
 2011-11-21 15:54:40 -08:00
Eric Fischer
aa8b33070b am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '68f0d47e8ee045dffb5f59c67cc77f38598472c5':
  Import revised translations. DO NOT MERGE
 2011-11-21 15:31:32 -08:00
Eric Fischer
68f0d47e8e Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:29:06 -08:00
Eric Fischer
bf1b9778ce Import revised translations. DO NOT MERGE 
Change-Id: I4313e0fffeb72b5a78b49770932ad983cfb05f8b
 2011-11-21 15:23:51 -08:00
Chia-chi Yeh
556a757c67 am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1 
* commit 'bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
  SIP: turn off verbose logs.
 2011-11-21 15:21:49 -08:00
Chia-chi Yeh
bfd85f9aca Merge "SIP: turn off verbose logs." into ics-mr1 2011-11-21 15:19:35 -08:00
Nick Pelly
a5cb9f4217 Replace vendor specific NfcGoogle.apk with generic Nfc.apk 
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
 2011-11-21 14:55:29 -08:00
Jamie Gennis
caa4482a68 SurfaceTexture: fix a couple tests 
This change fixes some robustness issues with the
EglDestroySurfaceUnrefsBuffers and
EglDestroySurfaceAfterAbandonUnrefsBuffers tests.  The tests previously
depended upon GL implementation details that should not have been relied
upon.

Change-Id: I37fd43b56568efe1dbe69d85e892be8a1cf44d20
 2011-11-21 14:38:15 -08:00
Jamie Gennis
87f3265bb0 EGL: default to swap interval 1 
This change explicitly sets swap interval 1 on the window when an
EGLSurface is created to render to it.

Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
 2011-11-21 14:37:29 -08:00
John Reck
ced6262e93 am 0507ac4d: Use isHighEndGfx to determine texture pool 
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
  Use isHighEndGfx to determine texture pool
 2011-11-21 14:14:11 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool 
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
 2011-11-21 13:30:32 -08:00
Jamie Gennis
c10a94c4b8 SurfaceTexture: clean up some tests 
This change cleans a few things up in the SurfaceTexture tests:
- Wraps a few long lines.
- Refactors the multithreading portions of SurfaceTextureGLToGLTest into
  a new test fixture called SurfaceTextureGLThreadToGLTest.
- Changes some of the tests that were creating their own EGLSurface to
  use the SurfaceTextureGLToGLTest fixture.
- Reorders the test functions so that they are immediately below to the
  test fixture that they use.

Change-Id: I0491ce3528a7ff2b4f1e83602ba290269c087297
 2011-11-21 11:52:02 -08:00
Jamie Gennis
6f0f0b1865 EGL: Use cache sizes defined in the BoardConfig 
This change introduces two new BoardConfig variables to control the size
limits of the EGL blob cache.  MAX_EGL_CACHE_ENTRY_SIZE is the size
limit for values inserted into the cache, and MAX_EGL_CACHE_SIZE is the
size limit for all entries in the entire cache (including both keys and
values).  If either of these BoardConfig variables are not defined then
a default size limit is used instead.

Change-Id: I6703d93f966b6389c6499f23d841e42339f9c9d7
 2011-11-21 11:48:17 -08:00
Romain Guy
31f2c2e946 Notify views when EGL resources are about to be destroyed 
Bug #5639899

Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
 2011-11-21 10:55:41 -08:00
Kristian Monsen
98dbf35ff3 am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1 
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
  Improving PictureListener deprecating comments
 2011-11-20 07:28:35 -08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Daniel Sandler
75d8eb2a81 am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1 
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
  Dreams (now Screen Candy) development.
 2011-11-19 20:44:36 -08:00
Daniel Sandler
9b5d7a59f3 Merge "Dreams (now Screen Candy) development." into ics-mr1 2011-11-19 20:42:19 -08:00
Chia-chi Yeh
cb6ee06f62 SIP: turn off verbose logs. 
Bug: 5616713
Change-Id: Iaf2e6878731d10d7f4f2a7cd8af71f4517780642
 2011-11-18 16:57:21 -08:00
The Android Open Source Project
4a8a67950e am 0e2c2f39: Reconcile with ics-mr0-release 
* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':
 2011-11-18 15:53:14 -08:00
The Android Open Source Project
0e2c2f3971 Reconcile with ics-mr0-release 
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51
 2011-11-18 15:49:39 -08:00
The Android Automerger
0cd1fe7304 merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 15:37:45 -08:00
Marco Nelissen
5b381ec95f am 7ff7821a: am d4b22ab4: status_t != bool 
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
  status_t != bool
 2011-11-18 15:10:38 -08:00
Marco Nelissen
7ff7821a60 am d4b22ab4: status_t != bool 
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
  status_t != bool
 2011-11-18 15:07:21 -08:00
Svetoslav Ganov
44e3a8a4ac am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
  Text selection AccessibilityEvents are missing text.
 2011-11-18 14:41:09 -08:00
Svetoslav Ganov
d8a3cabcb1 Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 2011-11-18 14:39:05 -08:00
Marco Nelissen
d4b22ab488 status_t != bool 
b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
 2011-11-18 14:21:34 -08:00
Wei Huang
2361032a4d am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 
* commit 'c2fff5ea39027d017dc15ce285961afa17a7b4a7':
  Unlock camera AWB lock only when white-balance is changed.
 2011-11-18 14:02:15 -08:00
Wei Huang
c2fff5ea39 Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 2011-11-18 14:00:09 -08:00
Mathias Agopian
e2fa30cba0 enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices 
this flag should be enabled for all targets, but currently
some have issues with it, so we're turning it on only for
tested targets.

this will hopefully resolve some performance issues.

Bug: 5553562, 5631630
Change-Id: I54c7a9e2068586898ab13e405d95534669260537
 2011-11-18 13:50:35 -08:00
The Android Open Source Project
b3ec8b5325 am d5280e51: Reconcile with ics-mr0-release 
* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
 2011-11-18 13:16:16 -08:00
The Android Open Source Project
d5280e51aa Reconcile with ics-mr0-release 
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
 2011-11-18 13:12:33 -08:00
Mathias Agopian
6166318fd5 am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1 
* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
  attempt to fix bug 5313580
 2011-11-18 12:13:55 -08:00
Mathias Agopian
4d71053b07 Merge "attempt to fix bug 5313580" into ics-mr1 2011-11-18 12:11:15 -08:00
Bart Sears
29df4a87a7 am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
  Content and viewport rects set in one step.
 2011-11-18 11:49:40 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
84dd52e394 Text selection AccessibilityEvents are missing text. 
The text selection change event was not added to the text
populating accessibility events in View.

bug:5638709

Change-Id: Ie7e319bc07d7e6c48f178a6c1bd22b1fe32ff515
 2011-11-18 10:26:54 -08:00
Svetoslav Ganov
803d2e21b5 am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 
* commit '0358787f68c48fb10f2d8067fd53f0471481320a':
  Add the support libraries to the platform documentation (build).
 2011-11-18 10:13:57 -08:00