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

62691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Romain Guy
421458aad7 Draw in the correct FBO after invoking a GL functor 
Bug #5650514

After invoking a GL functor, libhwui restores a few OpenGL states
including the current FBO. The renderer was however making the
wrong assumption that the FBO to restore to was the base layer
instead of the FBO associated with the current canvas state.

Change-Id: Ie565500832ebffd673f6a43b83422d6cc05470a0
 2011-11-21 15:14:37 -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
James Dong
96af14d9b0 Fix log spamming during time lapse video recording 
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f

related-to-bug: 5626569
 2011-11-21 12:09:51 -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
Wu-cheng Li
0cac6aa993 Move Camera.Sound to a stand-alone class CameraSound. 
bug:5640219

Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926
 2011-11-21 17:57:33 +08: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
The Android Automerger
1bca8f88bc merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 22:01:43 -08:00
Chia-chi Yeh
cb6ee06f62 SIP: turn off verbose logs. 
Bug: 5616713
Change-Id: Iaf2e6878731d10d7f4f2a7cd8af71f4517780642
 2011-11-18 16:57:21 -08:00
satok
e36657e541 Merge "Do not merge. Fix a memory leak of a Binder in SpellCheckerService" into ics-mr0 2011-11-18 16:39:20 -08:00
Fabrice Di Meglio
3d0b23a58a Merge "Fix TextLayoutCache Skia Typeface caching" 2011-11-18 16:32:43 -08:00
The Android Open Source Project
528d963007 am 73b02758: am 0e2c2f39: Reconcile with ics-mr0-release 
* commit '73b02758485b8a938318c608fcf828f660cced0d':
 2011-11-18 15:56:59 -08:00
The Android Open Source Project
73b0275848 am 0e2c2f39: Reconcile with ics-mr0-release 
* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':
 2011-11-18 15:53:25 -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 Open Source Project
5191d69487 Reconcile with ics-mr0-release ics-mr1-release 
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
 2011-11-18 15:42:32 -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
240941cd21 am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != bool 
* commit 'a1cd09e0e6a239eafa5112c0e8a09b7efc154a78':
  status_t != bool
 2011-11-18 15:35:00 -08:00
Fabrice Di Meglio
a4f5aa87c7 Fix TextLayoutCache Skia Typeface caching 
- fix reference passing for globals

Change-Id: I806dd4406d455b98c6be733847419b06b6774ccc
 2011-11-18 15:23:53 -08:00
Svetoslav Ganov
e9dc7c9f03 am bdc2912d: am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 
* commit 'bdc2912da64e5e6402c73997d637224d905ae825':
  Text selection AccessibilityEvents are missing text.
 2011-11-18 15:23:19 -08:00
Wei Huang
2e5f5c973f am bcedde3c: am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 
* commit 'bcedde3cd614e2a241f4c4dad626b840fd9c2424':
  Unlock camera AWB lock only when white-balance is changed.
 2011-11-18 15:23:17 -08:00
The Android Open Source Project
ed94e3dbcf am 45b27a43: am d5280e51: Reconcile with ics-mr0-release 
* commit '45b27a438cb23de8b4facda67d8ea6804f93f62c':
 2011-11-18 15:23:01 -08:00
Mathias Agopian
36bd710a60 am d0df44b5: am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1 
* commit 'd0df44b5c979e00a19187cea35768ba26557e447':
  attempt to fix bug 5313580
 2011-11-18 15:22:59 -08:00
Bart Sears
3f6114164f am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
  Content and viewport rects set in one step.
 2011-11-18 15:22:57 -08:00
Svetoslav Ganov
556ac0b217 am 322f884d: am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 
* commit '322f884dfda201f7bcb5b8cbff80d0ae5122ced3':
  Add the support libraries to the platform documentation (build).
 2011-11-18 15:22:37 -08:00
Joe Fernandez
31659f05f3 am 0c778cdd: am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit '0c778cdd9cfdb8007b15eef2eca91f3089590f98':
  docs: Camera Features for developers
 2011-11-18 15:22:31 -08:00
Marco Nelissen
a1cd09e0e6 am 7ff7821a: am d4b22ab4: status_t != bool 
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
  status_t != bool
 2011-11-18 15:10:54 -08:00
Marco Nelissen
7ff7821a60 am d4b22ab4: status_t != bool 
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
  status_t != bool
 2011-11-18 15:07:21 -08:00
Scott Main
a629de0b71 am e17a4a02: am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit 'e17a4a02617dbefbc870df8280ffa1cd82fff2a0':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 15:06:31 -08:00
Daniel Sandler
6686effc61 am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1 
* commit '2e56995e9e19f18958167a28911120f31b096756':
  Tie screen saver to the screen off timeout.
 2011-11-18 14:47:58 -08:00
Adam Powell
74b7c892cb am 65035d2a: am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 
* commit '65035d2a72fd8c847aa9c78c0e97058535ec18a5':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
 2011-11-18 14:47:55 -08:00
Jim Miller
b32f5037e9 Merge "resolved conflicts for merge of 1a783be3 to master" 2011-11-18 14:44:50 -08:00
Svetoslav Ganov
bdc2912da6 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:29 -08:00