Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,557 Commits 3 Branches 0 Tags
3526b00a53a2582a51ff8b98ac1400a48f351107
Commit Graph

62557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
3526b00a53 am c26e4d18: am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 
* commit 'c26e4d18a20ab0b3e769fb3e547994f1c27d6713':
  Notify views when EGL resources are about to be destroyed Bug #5639899
 2011-11-21 21:08:42 -08:00
Adam Powell
79de26ea20 am 516035f0: am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 
* commit '516035f0923aad612932327546e780c7c241ceda':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views
 2011-11-21 21:08:40 -08:00
Nick Pelly
082ccca5ff am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 
* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
 2011-11-21 21:08:29 -08:00
Jamie Gennis
08b7660f67 am 8b8c321c: am b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 
* commit '8b8c321c70687ace750e42b745b6e96258d739cd':
  EGL: Use cache sizes defined in the BoardConfig
 2011-11-21 21:08:23 -08:00
Jamie Gennis
07f062b627 am c2597295: am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 
* commit 'c25972950c2ea62fb085524dbe737c2bf0f08f4a':
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
 2011-11-21 21:08:21 -08:00
Eric Fischer
53d42cb7d3 am 281d1072: (-s ours) am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '281d1072b4d880f70016d4553c7fcc25c00c89d3':
  Import revised translations. DO NOT MERGE
 2011-11-21 21:08:20 -08:00
Chia-chi Yeh
98c54a3e06 am 0e67685e: am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1 
* commit '0e67685e53cbcf7682a0364cf34fd3ac0632596f':
  SIP: turn off verbose logs.
 2011-11-21 21:07:56 -08:00
John Reck
7b0fdc100e am 786513ab: am 0507ac4d: Use isHighEndGfx to determine texture pool 
* commit '786513aba608d958e69deee3fbdf003bdf5d9632':
  Use isHighEndGfx to determine texture pool
 2011-11-21 21:07:33 -08:00
Romain Guy
c26e4d18a2 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
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
516035f092 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:36:20 -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
Nick Pelly
cee040eb27 Merge "Throw a nicer error message when using an invalid context to create Nfc" 2011-11-21 17:31:45 -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
b04cce0eb5 Throw a nicer error message when using an invalid context to create Nfc 
This can happen when using getContext() instead of getTargetContext()
in an InstrumentationTestCase.

Bug: 5644274
Change-Id: I020a637c271e25bcf25ae2927fd878001d5fea0a
 2011-11-21 17:09:31 -08:00
satok
afb1a9e279 Merge "add sentence level spell checker hidden apis" 2011-11-21 16:30:07 -08:00
satok
0dc1f648a0 add sentence level spell checker hidden apis 
Change-Id: If65c89044bed064fd01a554e33176f64f7c21c0f
 2011-11-22 09:18:12 +09:00
Nick Pelly
4fb747f329 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:30 -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
8b8c321c70 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:12 -08:00
Jamie Gennis
c25972950c 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:11 -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
Jeff Brown
8eb4636705 Merge "Change desk dock to use accelerometer by default." 2011-11-21 15:40:22 -08:00
Eric Fischer
281d1072b4 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:36 -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
0e67685e53 am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1 
* commit 'bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
  SIP: turn off verbose logs.
 2011-11-21 15:22:00 -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
Irfan Sheriff
c15225f964 Merge "Add support for infinite dhcp lease time" 2011-11-21 14:34:47 -08:00
John Reck
786513aba6 am 0507ac4d: Use isHighEndGfx to determine texture pool 
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
  Use isHighEndGfx to determine texture pool
 2011-11-21 14:14:06 -08:00
Irfan Sheriff
b9c955664b Add support for infinite dhcp lease time 
Bug: 5649076
Change-Id: I29e3b41d8bd1173b155f3173e65a3b45ad17a45c
 2011-11-21 14:03:00 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool 
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
 2011-11-21 13:30:32 -08:00
Jeff Brown
48dc15cfc5 Change desk dock to use accelerometer by default. 
Change-Id: Ied528685c8db855bc2442574d0b80232aa38752c
 2011-11-21 13:30:01 -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
Steve Block
fc6cf28884 Add tests for array length bounds in WebView's Java Bridge 
Tests for https://android-git.corp.google.com/g/150320.

We test that when the legnth property of a JavaScript object is out of the
bounds for a Java array, we convert to null.

Also update a test in the case that the length property is not numeric.

Bug: 5626284
Change-Id: If41acb117eb4b786d671b5ffece2704c6f045d52
 2011-11-21 18:31:14 +00:00
Kristian Monsen
38bc731875 am 376e93fc: am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1 
* commit '376e93fcea19cd491af59631f3934ab036e1e846':
  Improving PictureListener deprecating comments
 2011-11-20 07:31:41 -08:00
Kristian Monsen
376e93fcea am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1 
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
  Improving PictureListener deprecating comments
 2011-11-20 07:29:09 -08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Daniel Sandler
711683cd96 am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1 
* commit '25a43adabb70aa769a097c6cb09d71b031431677':
  Dreams (now Screen Candy) development.
 2011-11-19 20:48:21 -08:00
Daniel Sandler
25a43adabb am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1 
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
  Dreams (now Screen Candy) development.
 2011-11-19 20:44:40 -08:00
Daniel Sandler
9b5d7a59f3 Merge "Dreams (now Screen Candy) development." into ics-mr1 2011-11-19 20:42:19 -08:00
Jesse Wilson
192d784e94 Merge "Fix the backups example to use a simpler lock." 2011-11-19 09:09:58 -08:00
Chia-chi Yeh
cb6ee06f62 SIP: turn off verbose logs. 
Bug: 5616713
Change-Id: Iaf2e6878731d10d7f4f2a7cd8af71f4517780642
 2011-11-18 16:57:21 -08:00
Fabrice Di Meglio
3d0b23a58a Merge "Fix TextLayoutCache Skia Typeface caching" 2011-11-18 16:32:43 -08:00