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

6062 Commits

Author SHA1 Message Date
Chris Craik
4d4b3aa3d9 am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev 
* commit '91a40be04f8d1822c27888cc47124bf965633f4f':
  Account for alpha in hasShadow()
 2014-09-19 23:56:46 +00:00
Chris Craik
9e7c919191 Merge "Account for alpha in hasShadow()" into lmp-dev 2014-09-19 23:36:22 +00:00
Dan Albert
8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp 
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
 2014-09-19 16:13:49 -07:00
Chris Craik
9fa364dc72 Account for alpha in hasShadow() 
bug:17587220
Change-Id: Ic7f2dea95302b713dc93edb4a0193a7be77fb2eb
 2014-09-19 16:04:45 -07:00
Dan Albert
c04d92cac9 resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp 
Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
 2014-09-19 15:57:26 -07:00
Dan Albert
5648b12da1 resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp 
Change-Id: Ifedb15de5a4db6cb0238fec93aaa2d95f1844694
 2014-09-19 15:50:13 -07:00
Dan Albert
ece13f90ed resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp 
Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4
 2014-09-19 15:37:15 -07:00
Adam Lesinski
0fa7511db2 am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev 
* commit '9ee3ba23395bd1a13bbfd3fe523ee611a5ca001b':
  Fix backwards compat problem with AAPT public attrs
 2014-09-19 19:08:50 +00:00
Adam Lesinski
8d2556f0de am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev 
* commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7':
  Fix backwards compat problem with AAPT public attrs
 2014-09-19 18:37:15 +00:00
Adam Lesinski
b6812b64c4 Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev 2014-09-19 18:19:58 +00:00
John Reck
367e4c5f80 am 6fcaf93f: am 40d2705e: am a154d76e: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev 
* commit '6fcaf93f3ad73780bfe4392cd4d60e05cb463b8a':
  glFinish to flush deletes
 2014-09-19 18:05:14 +00:00
John Reck
ab41eee019 am 923ccf24: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev 
* commit '923ccf247415587a23e7be40eacf4cdb7b4f1503':
  glFinish to flush deletes
 2014-09-19 17:38:41 +00:00
John Reck
6cc6219f6f Merge "glFinish to flush deletes" into lmp-dev 2014-09-19 17:22:17 +00:00
John Reck
4ced2620b7 glFinish to flush deletes 
Bug: 17479800
Change-Id: I4d4a3eeda510e037f806052025184f3cde18c847
 2014-09-19 10:10:19 -07:00
Chris Craik
5e5668de71 am f9166c19: am 6975554d: am 5db573c7: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev 
* commit 'f9166c19773bbde04e1837327b85d5935530cfee':
  Fix garbage showing up beneath dialogs
 2014-09-19 16:15:25 +00:00
Chris Craik
4bc87627a4 am 658a7846: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev 
* commit '658a7846cac4235653fe264c09182302262971ae':
  Fix garbage showing up beneath dialogs
 2014-09-19 15:50:47 +00:00
Chris Craik
651486d018 Merge "Fix garbage showing up beneath dialogs" into lmp-dev 2014-09-19 15:31:18 +00:00
Chris Craik
284b243584 Fix garbage showing up beneath dialogs 
bug:17463894

Fixes the setViewport method to immediately affect the return values
of getViewportWidth/Height methods.

Also works around tiling extension issues observed on first frame
after window resize by disabling tiling for that frame.

Change-Id: Ie172d572d20d74a1be9cc58ad389af2cffa0e4b6
 2014-09-18 16:05:35 -07:00
Adam Lesinski
82a2dd8efe Fix backwards compat problem with AAPT public attrs 
AAPT has traditionally assigned resource IDs to public attributes,
and then followed those public definitions with private attributes.

--- PUBLIC ---
| 0x01010234 | attr/color
| 0x01010235 | attr/background

--- PRIVATE ---
| 0x01010236 | attr/secret
| 0x01010237 | attr/shhh

Each release, when attributes are added, they take the place of the private
attributes and the private attributes are shifted down again.

--- PUBLIC ---
| 0x01010234 | attr/color
| 0x01010235 | attr/background
| 0x01010236 | attr/shinyNewAttr
| 0x01010237 | attr/highlyValuedFeature

--- PRIVATE ---
| 0x01010238 | attr/secret
| 0x01010239 | attr/shhh

Platform code may look for private attributes set in a theme. If an app
compiled against a newer version of the platform uses a new public
attribute that happens to have the same ID as the private attribute
the older platform is expecting, then the behavior is undefined.

We get around this by detecting any newly defined attributes (in L),
copy the resource into a -v21 qualified resource, and delete the
attribute from the original resource. This ensures that older platforms
don't see the new attribute, but when running on L+ platforms, the
attribute will be respected.

We still need to address this problem in the platform moving forward,
as this will only help us in the transition from pre L to L.

Bug:17520380
Change-Id: Ia2a985798b50006c21c7c3431d30d9598f27cd91
 2014-09-18 14:05:24 -07:00
John Reck
b2ccc61820 am c619b9d2: am 1d935afd: am e905b4ff: am fd340229: Merge "Special case EGL_BAD_SURFACE" into lmp-dev 
* commit 'c619b9d2315b28f6cebe68adbf18f4453ce1cd7d':
  Special case EGL_BAD_SURFACE
 2014-09-18 00:17:26 +00:00
John Reck
623d798c24 am a19867e1: am fd340229: Merge "Special case EGL_BAD_SURFACE" into lmp-dev 
* commit 'a19867e1b279239579a88002c86b63cdb2ad8a58':
  Special case EGL_BAD_SURFACE
 2014-09-17 23:53:02 +00:00
John Reck
f16b4940e6 Merge "Special case EGL_BAD_SURFACE" into lmp-dev 2014-09-17 23:30:44 +00:00
John Reck
2cdbc7d228 Special case EGL_BAD_SURFACE 
Bug: 17516789

Change-Id: I3dcb10360c2aef6326f7dbbff6815866d4c143b6
 2014-09-17 16:09:57 -07:00
John Reck
2135d189e3 am 39647161: am 0eda5660: am 5c19146f: am 8523ad90: Merge "Change default fbo cache size to 0" into lmp-dev 
* commit '39647161e1ec5521afd159054c1237a80300e0e4':
  Change default fbo cache size to 0
 2014-09-17 22:18:23 +00:00
John Reck
6101f8bcfc am d0738f9c: am 8523ad90: Merge "Change default fbo cache size to 0" into lmp-dev 
* commit 'd0738f9c1e049ebd881ea9c5fb93076e0aeb81cc':
  Change default fbo cache size to 0
 2014-09-17 21:54:54 +00:00
John Reck
5083943ff8 Merge "Change default fbo cache size to 0" into lmp-dev 2014-09-17 21:35:02 +00:00
John Reck
e9cd97ee88 Change default fbo cache size to 0 
Bug: 17479800

 FBO cache is very expensive and no longer necessary, disable
 it by just setting size to 0.

Change-Id: I664616f262c8339919e1d20baaafa5de2b628d7e
 2014-09-17 14:09:26 -07:00
Chris Craik
6dda2381a5 am da9a0122: am 43572931: am c7f97b61: am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev 
* commit 'da9a01228cb490a3da545dc2af75f8d3a15e002f':
  Handle premultiplication correctly for ColorMatrixColorFilters
 2014-09-17 18:29:33 +00:00
Chris Craik
cd4f28e999 am befbdaba: am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev 
* commit 'befbdaba72a2c1502ff6135a8214f7434a6b2ea7':
  Handle premultiplication correctly for ColorMatrixColorFilters
 2014-09-17 17:27:02 +00:00
Chris Craik
73821c8d2b Handle premultiplication correctly for ColorMatrixColorFilters 
bug:17405627

Previously, the input content to the color matrix computation was left
premultiplied. Since the color matrix could reduce the alpha channel,
the alpha was re-multiplied, but this was incomplete, and incorrect.

Instead, apply the color matrix in unpremultiplied space.

Change-Id: I87b8e03d2e228e6ded81f7bbfea952605d7a095c
 2014-09-17 10:00:34 -07:00
Jorim Jaggi
027eb7c874 am fb2fa955: am 185055cb: am dc29e524: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'fb2fa955e92e6066e21badebf16259acdcebae12':
  Use RenderThread for navigation bar ripples
 2014-09-17 05:14:49 +00:00
Chris Craik
34d5990ec9 am f1455d71: am beb48ea3: am cd61f045: am e27790db: Merge "Force isolation of clip and matrix within layer" into lmp-dev 
* commit 'f1455d71f51869e6412d74a33f4690c15b791de0':
  Force isolation of clip and matrix within layer
 2014-09-16 21:03:39 +00:00
Jorim Jaggi
0768029b74 am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'd2420d39c03c17ec62b283e5a99c33ff1360926f':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:13:46 +00:00
Jorim Jaggi
072707dfad Use RenderThread for navigation bar ripples 
Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
 2014-09-16 17:51:55 +00:00
Chris Craik
1f8eb8caac am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within layer" into lmp-dev 
* commit '4dae506c27327a3ddced29fc15880c86abe3a3a5':
  Force isolation of clip and matrix within layer
 2014-09-15 22:04:10 +00:00
Chris Craik
025207b3cf Merge "Force isolation of clip and matrix within layer" into lmp-dev 2014-09-15 15:59:57 +00:00
Chris Craik
4ace730560 Force isolation of clip and matrix within layer 
bug:17379260

Unclipped save layers need to isolate their clips and matrices
so that the save time readout of background content matches clip and
position with the restore/compose step.

Change-Id: I2de474cda76e960d080852f1716d6ddfa8a512d4
 2014-09-14 15:49:54 -07:00
Chris Craik
2fea335b3e am b5f00ba9: am cceffe72: Merge "Correctly initialize animator asynchronousity" into lmp-dev 
* commit 'b5f00ba90ff201153de8386a3ebcd4eb5c06cb9e':
  Correctly initialize animator asynchronousity
 2014-09-13 03:13:01 +00:00
ztenghui
0099def245 am 35e78a38: am 84a7c1cc: Merge "Update the shadow strength" into lmp-dev 
* commit '35e78a38dc3a1080ef215b385dc96e67f6388791':
  Update the shadow strength
 2014-09-13 02:32:16 +00:00
Chris Craik
2f25901632 Merge "Correctly initialize animator asynchronousity" into lmp-dev 2014-09-13 00:46:11 +00:00
Chris Craik
572d9acd59 Correctly initialize animator asynchronousity 
bug:17483792
Change-Id: Icb6b6e6318d4c79ee94228806cb60b275424b9c9
 2014-09-12 17:40:20 -07:00
ztenghui
692737be4f Merge "Update the shadow strength" into lmp-dev 2014-09-12 23:02:32 +00:00
ztenghui
f7d76dffd8 Update the shadow strength 
b/17486691

Change-Id: I8e8f0b64e757772c18f038f6b329ef91a4e155a5
 2014-09-12 15:29:44 -07:00
Chris Craik
7f00c69b7c am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev 
* commit 'c168393b3ba99721be2c2d9629d687431aa6b9e0':
  Disable layer leak tracking
 2014-09-12 19:19:10 +00:00
Chris Craik
1aec711b2e Merge "Disable layer leak tracking" into lmp-dev 2014-09-12 17:41:13 +00:00
Chris Craik
21029ef131 Disable layer leak tracking 
bug:17208461
Change-Id: Ibbdf3ec79c4fd19e1935a559d425d074b611e162
 2014-09-12 09:29:31 -07:00
Chris Craik
db14386587 am c83a9ad6: am 3e39b8ad: Merge "Snap outline clipping to integer coordinates correctly" into lmp-dev 
* commit 'c83a9ad69474fdc75cdf5f84c47bd89b61640377':
  Snap outline clipping to integer coordinates correctly
 2014-09-12 05:47:41 +00:00
ztenghui
db848170b7 am 7c23eaa7: am 0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev 
* commit '7c23eaa73f6f03b1e3ec69c37b021d45fa387a5f':
  Finer tessellation can draw better looking shadows for circles.
 2014-09-12 05:44:14 +00:00
Chris Craik
93a0f8aa38 am 5707b4c6: am e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev 
* commit '5707b4c67898f3e828c08204da64a32240449165':
  Update HWUI paint filter to understand new location of skia bitmap filter preference
 2014-09-12 05:43:55 +00:00
Chris Craik
4340c260c0 Snap outline clipping to integer coordinates correctly 
bug:17403105
Change-Id: I65b5d7103aac58ba6feb4b021c276c67e9341716
 2014-09-11 18:58:45 -07:00