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

6132 Commits

Author SHA1 Message Date
ztenghui
79ef48239d am 3fb45865: am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit '3fb458653e50e350e9e377d071cb79573d531748':
  + correcting shadow visual appearance (b/17610926)
 2014-10-02 13:37:47 +00:00
Adam Powell
e18d68d6ab am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-02 12:38:21 +00:00
ztenghui
5f243860a7 am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit '9ad17521ac073562991cddb78f14d6df8d5fd05a':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:41:00 +00:00
Chris Craik
c5b5f0556b Account for colorfilter transparency in determining paint opacity 
bug:17765601
Change-Id: I90d76ee199bb357c71fc8f537c1abfa20d848416
 2014-10-01 16:40:16 -07:00
ztenghui
6d0eaf45a9 am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit 'f903304896809039430c5e52bd0c24052f51b14f':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:33:51 +00:00
ztenghui
8def74de33 + correcting shadow visual appearance (b/17610926) 
+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290

Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
 2014-10-01 16:12:28 -07:00
Adam Powell
e4275843fe am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:37:27 +00:00
Adam Powell
8628387c60 am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:15:56 +00:00
Chris Craik
059476a245 Avoid creating Caches instance with gfxinfo dump 
bug:17509891
Change-Id: I182851068ba04926d60226b3ace95efea59eac45
 2014-10-01 11:14:55 -07:00
Adam Powell
908c748096 Revert "Fix issue with using locally defined attrs in a shared lib" 
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
 2014-10-01 18:11:18 +00:00
Adam Lesinski
7923da5f5d am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit '06f380e9efa4698c223077cacaa2df80a704ef96':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 17:11:10 +00:00
Adam Lesinski
95731abeae am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit 'bb7b51978eb5341e9a1204a447c8340bfb248504':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 15:16:02 +00:00
Chris Craik
edb3ebfd3f am bb5f8f5c: am 08897806: Merge "Add tracing for saveLayer" into lmp-mr1-dev 
* commit 'bb5f8f5c94610f8eb23a6f74c3f0a5a7dd402606':
  Add tracing for saveLayer
 2014-10-01 01:42:24 +00:00
Adam Lesinski
d388b1fdde am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit 'cd8e73817d14798f9d2031ffd301a03a096b7907':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 00:44:31 +00:00
Adam Lesinski
5069dd6989 Fix issue with using locally defined attrs in a shared lib 
The attribute name resource IDs were never fixed up with
the runtime package ID so we weren't finding attributes
whenever the runtime package ID was different than the build
time one, which happened to be when a shared lib referenced itself
(0x00 vs 0x02).

Bug:17666947
Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
 2014-09-30 16:18:09 -07:00
Chris Craik
a8bea8edde Add tracing for saveLayer 
bug:17702227

Change-Id: Ia9cbf31b360c93f712e021bea406cb63e4cc4c2a
 2014-09-29 17:19:05 -07:00
Chris Craik
3bf8c64d78 am 808583ff: am 1918d884: am a0d0798a: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit '808583ffbbb461c429a8308034dba632d167f2c6':
  Reject transparent draws more conservatively
 2014-09-23 15:51:57 +00:00
Chris Craik
ed2f0f53df am fd0a1df1: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit 'fd0a1df16fba712fb569eb637d960a7e78e3e62c':
  Reject transparent draws more conservatively
 2014-09-23 03:07:05 +00:00
Chris Craik
bc341912b1 Reject transparent draws more conservatively 
bug:17600162

Transparent draws are not safe to reject for all xfermodes other than
clear. Now, to be safe, only perform the rejection for SrcOver draws
since other modes are fairly uncommon.

We could specifically determine whether the xfermode could change the
output given a transparent input, but there's little to be gained from
the additional complexity.

Change-Id: Ia699ac4bdc4da3353955840b53f1922d3cb1d85d
 2014-09-23 01:22:00 +00:00
Chris Craik
f1c91fec09 am 30dca470: am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev 
* commit '30dca470d6b261433f0ad11117e5dff7d9124d9e':
  Account for alpha in hasShadow()
 2014-09-20 00:19:38 +00:00
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