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

102406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
03fd756f2a am 06656913: am ab672ba6: Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev 
* commit '0665691376c3df35e55e8f2b72d674ccaa948a9d':
  Revert of Ifd0c4081a.  Turning off logging.
 2013-03-15 23:36:02 +00:00
Robert Greenwalt
0665691376 am ab672ba6: Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev 
* commit 'ab672ba66458e540062f824861303a484d3065fd':
  Revert of Ifd0c4081a.  Turning off logging.
 2013-03-15 23:33:10 +00:00
Robert Greenwalt
ab672ba664 Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev 2013-03-15 23:30:59 +00:00
Dianne Hackborn
1545d7c5f7 am 5e2552bd: am d468df73: Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev 
* commit '5e2552bd16ae09da826270363ac0f3f56af91922':
  Fix a bug where we could lose a loader content change.
 2013-03-15 23:14:17 +00:00
Dianne Hackborn
5e2552bd16 am d468df73: Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev 
* commit 'd468df73d59635aa0f3e0661b84093d02c4c6ca0':
  Fix a bug where we could lose a loader content change.
 2013-03-15 23:12:56 +00:00
Dianne Hackborn
d468df73d5 Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev 2013-03-15 23:10:47 +00:00
Chris Craik
9c6f0c9567 am 524f12c4: am f40b8a93: Merge "Fully deferred displaylist replay" into jb-mr2-dev 
* commit '524f12c4f82cddc05a9ee633828e3c359cca4f97':
  Fully deferred displaylist replay
 2013-03-15 22:58:46 +00:00
Chris Craik
524f12c4f8 am f40b8a93: Merge "Fully deferred displaylist replay" into jb-mr2-dev 
* commit 'f40b8a939fef0a19b40188f007a3364311d6dabf':
  Fully deferred displaylist replay
 2013-03-15 22:55:54 +00:00
Chet Haase
cbd449e2e6 am 08e84b6b: am 30527267: Merge "Reset reverse state when an animator ends" into jb-mr2-dev 
* commit '08e84b6b7d6a7eb6f14a731767caafecb78238e6':
  Reset reverse state when an animator ends
 2013-03-15 22:55:17 +00:00
Chet Haase
55161629f5 am 1c9f5875: am 2de8dac8: Merge "Log warning when animator detects NaN value" into jb-mr2-dev 
* commit '1c9f587582c584958af2d78bbc76a7dac9f2c6fc':
  Log warning when animator detects NaN value
 2013-03-15 22:55:14 +00:00
Chet Haase
b966327170 am e7955865: am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev 
* commit 'e7955865a17e3065bcaf56fa57bec0346ecc8d21':
  Use same default duration (300) for animator resources as for other animators
 2013-03-15 22:55:12 +00:00
Chris Craik
f40b8a939f Merge "Fully deferred displaylist replay" into jb-mr2-dev 2013-03-15 22:54:16 +00:00
Chet Haase
08e84b6b7d am 30527267: Merge "Reset reverse state when an animator ends" into jb-mr2-dev 
* commit '30527267d12d4338820d4ec2526c6bf81c7f7785':
  Reset reverse state when an animator ends
 2013-03-15 22:52:26 +00:00
Chet Haase
1c9f587582 am 2de8dac8: Merge "Log warning when animator detects NaN value" into jb-mr2-dev 
* commit '2de8dac82dfa23f2382a6f6b1f9a2a995ef366eb':
  Log warning when animator detects NaN value
 2013-03-15 22:52:23 +00:00
Chet Haase
e7955865a1 am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev 
* commit 'd2e1e4474dbdd87a51a8d75c946d1a027b6655e4':
  Use same default duration (300) for animator resources as for other animators
 2013-03-15 22:52:20 +00:00
Chet Haase
30527267d1 Merge "Reset reverse state when an animator ends" into jb-mr2-dev 2013-03-15 22:51:07 +00:00
Chet Haase
2de8dac82d Merge "Log warning when animator detects NaN value" into jb-mr2-dev 2013-03-15 22:50:51 +00:00
Chet Haase
d2e1e4474d Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev 2013-03-15 22:50:06 +00:00
kmccormick
29beae6952 am 963d1002: am ec6c2059: am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '963d1002bb462112194fdf7807bab97e08e4b245':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 22:39:21 +00:00
kmccormick
963d1002bb am ec6c2059: am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit 'ec6c2059f99e3d8035ec05be0bf9885dea1f7b35':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 22:36:26 +00:00
kmccormick
ec6c2059f9 am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '3e32923425d20a77f5597af844758de395e69813':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:34:36 -07:00
kmccormick
3e32923425 am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '088aef975808497caf90f03b7eb0a0175d43e01f':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:33:13 -07:00
kmccormick
088aef9758 am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '96a6063943d725c9febc2bc525cb8be648c34fa5':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:31:53 -07:00
kmccormick
96a6063943 am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit 'eb46c95c8094e4dd09b5f99a362e55921d259bac':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:30:38 -07:00
kmccormick
eb46c95c80 am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '4758e3e7c824bc5cb8b11b6536c5236145f2670f':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:28:48 -07:00
kmccormick
4758e3e7c8 Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 2013-03-15 22:26:45 +00:00
kmccormick
7571542c9d Doc update: Add memory mgt lesson to bitmaps class 
Change-Id: If780ad8bfabd66de21842bdb465d86ab24b2940c
 2013-03-15 15:10:37 -07:00
Jeff Sharkey
47d07fde90 am 20a1cf34: am 93b04b91: Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 
* commit '20a1cf345f5f7952677d5f9cd97efe1a9a197930':
  Avoid warnings about synthesized IDs.
 2013-03-15 21:51:29 +00:00
Jeff Sharkey
20a1cf345f am 93b04b91: Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 
* commit '93b04b91bc58f31e5900999849b3555065e4faa0':
  Avoid warnings about synthesized IDs.
 2013-03-15 21:49:08 +00:00
Chris Craik
ff78583d8a Fully deferred displaylist replay 
bug:8037003

A recursive drawDisplayList call is now entirely deferred before
playing back to the screen and issuing GL commands. This way, the
entire stream can be inspected, optimized, and batch work (such as
uploading textures) before issuing commands.

Additionally, this fixes an issue where operations draw could move
across restores corresponding to saveLayer(alpha). Those and other
similar cases (such as complex clipping, requiring the stencil) are
now treated as batching barriers, with the operations that change
renderer state in a way that's difficult to defer are just re-issued
at flush time.

Change-Id: Ie7348166662a5ad89fb9b1e87558334fb826b01e
 2013-03-15 14:48:18 -07:00
Jeff Sharkey
93b04b91bc Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 2013-03-15 21:47:58 +00:00
Jeff Sharkey
47b50333c1 Avoid warnings about synthesized IDs. 
Bug: 8153518
Change-Id: I5d638e17581f63c6d4a10ff6bc2c1bf9997a78b3
 2013-03-15 14:46:52 -07:00
Nick Kralevich
f5e187522b am ac63ba15: am fdc62ee6: am 57eed5b4: am 38bfb5a7: Merge "app_process: don\'t pollute the environment" 
* commit 'ac63ba15ddcf88eb969cb04a71615d5007cff8a1':
  app_process: don't pollute the environment
 2013-03-15 21:42:51 +00:00
Nick Kralevich
ac63ba15dd am fdc62ee6: am 57eed5b4: am 38bfb5a7: Merge "app_process: don\'t pollute the environment" 
* commit 'fdc62ee6098b4fa0b7fae9731e200abd9a886218':
  app_process: don't pollute the environment
 2013-03-15 21:41:20 +00:00
Nick Kralevich
fdc62ee609 am 57eed5b4: am 38bfb5a7: Merge "app_process: don\'t pollute the environment" 
* commit '57eed5b416bd72d4111a0aead2f5c71f24fde07b':
  app_process: don't pollute the environment
 2013-03-15 14:39:08 -07:00
Nick Kralevich
57eed5b416 am 38bfb5a7: Merge "app_process: don\'t pollute the environment" 
* commit '38bfb5a7bfc0eeab68f25afad43245efd062caef':
  app_process: don't pollute the environment
 2013-03-15 14:36:30 -07:00
Chet Haase
f5472fc8ca am 2c250474: am e8918c57: Merge "Fix errors in Canvas.EdgeType docs" into jb-mr2-dev 
* commit '2c2504744e2659af9fa8df68eb93de290e99b82d':
  Fix errors in Canvas.EdgeType docs
 2013-03-15 21:33:36 +00:00
Chet Haase
d9e4a5c2e5 Use same default duration (300) for animator resources as for other animators 
Issue #7492926 Animator resources should use same default duration as code-created Animators

Change-Id: I337a2c37ff26ebb6cb8b2fb2b58523c464af518b
 2013-03-15 14:33:24 -07:00
Chet Haase
2c2504744e am e8918c57: Merge "Fix errors in Canvas.EdgeType docs" into jb-mr2-dev 
* commit 'e8918c57bde0152a109ac05386b21c8127523018':
  Fix errors in Canvas.EdgeType docs
 2013-03-15 21:30:50 +00:00
Chet Haase
e8918c57bd Merge "Fix errors in Canvas.EdgeType docs" into jb-mr2-dev 2013-03-15 21:29:09 +00:00
Chet Haase
d320001807 Fix errors in Canvas.EdgeType docs 
Issue #7722363 Fix Canvas EdgeType docs

Change-Id: I2908ff22879eb5996da73a37dae1a4cabf82fffb
 2013-03-15 14:25:54 -07:00
Nick Kralevich
38bfb5a7bf Merge "app_process: don't pollute the environment" 2013-03-15 20:55:53 +00:00
Chet Haase
2076316ce1 Log warning when animator detects NaN value 
Issue #8350458 Add exception to Animators when NaN detected

Change-Id: I926c3f35b661b0bb1d9e3c7c0df55e7513734589
 2013-03-15 13:50:54 -07:00
Fabrice Di Meglio
f72b5c920a am cf60cc9a: am 261f82ca: Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 
* commit 'cf60cc9adedf032c6c97cd2cbb9ff211deaaf3ae':
  Revert "Clean Paint.mBidiFlags as it is no longer used"
 2013-03-15 20:39:31 +00:00
Fabrice Di Meglio
8315891b4e am 2db91af6: am 2d93475c: Merge "Revert "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"" into jb-mr2-dev 
* commit '2db91af6a6f50e693163808e5a29f11232c89dbd':
  Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"
 2013-03-15 20:39:28 +00:00
Fabrice Di Meglio
c50fbd0531 am 42490501: am fe099074: Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev 
* commit '424905012677ad35aff9a4b903f208647d4509ba':
  Revert "fix argument mismatches in Paint JNI"
 2013-03-15 20:39:25 +00:00
Fabrice Di Meglio
cf60cc9ade am 261f82ca: Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 
* commit '261f82ca996a4b192b56350dd2eda6016f9d5203':
  Revert "Clean Paint.mBidiFlags as it is no longer used"
 2013-03-15 20:37:07 +00:00
Fabrice Di Meglio
2db91af6a6 am 2d93475c: Merge "Revert "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"" into jb-mr2-dev 
* commit '2d93475c693dd2ac8555a19e0d8e7a689d3a22c3':
  Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"
 2013-03-15 20:37:05 +00:00
Fabrice Di Meglio
4249050126 am fe099074: Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev 
* commit 'fe099074c49b795c2ea8cf3ae9da8799bd0c6b09':
  Revert "fix argument mismatches in Paint JNI"
 2013-03-15 20:37:02 +00:00
Fabrice Di Meglio
261f82ca99 Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 2013-03-15 20:34:06 +00:00