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

5804 Commits

Author SHA1 Message Date
Adam Lesinski
c51cc683bc am 056468ef: am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '056468ef3b9b63d251c4aac867ae634f813d18cf':
  Fix memory leak in ResTable
 2014-08-29 19:14:28 +00:00
Adam Lesinski
1be18d56a1 am 9e186ec3: am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '9e186ec3a0e87e612786b827c04b6c6e1b507196':
  Stamp platform version code into app Apks
 2014-08-29 19:14:01 +00:00
Adam Lesinski
ec187b726b am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '1ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb':
  Fix memory leak in ResTable
 2014-08-29 18:49:14 +00:00
Adam Lesinski
343cabb316 am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '60f193fbe905f65750503cdaf8616d31c85016d6':
  Stamp platform version code into app Apks
 2014-08-29 18:48:33 +00:00
Adam Lesinski
a9aa9f0458 Merge "Fix memory leak in ResTable" into lmp-dev 2014-08-29 05:27:49 +00:00
Adam Lesinski
b32063822b Merge "Stamp platform version code into app Apks" into lmp-dev 2014-08-29 01:54:15 +00:00
Adam Lesinski
7f668d03ce Fix memory leak in ResTable 
We were basically never cleaning any of the
cached bags... oops :S

Bug:16683269
Change-Id: Ic0a44218f660e16fbaac8df1d61ce6f1fdb0018b
 2014-08-28 18:32:32 -07:00
John Reck
1f9d2dffca am e310b356: am cfa308dc: am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'e310b35694e88b1d25eeea81204d3495c698d557':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:45:13 +00:00
John Reck
3296b922da am cfa308dc: am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'cfa308dc1e42320d31414fa7050db3ffb778cdc2':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:26:30 +00:00
John Reck
80068b735e Merge "Track buildLayer calls, destroy if unused" into lmp-dev 2014-08-28 23:04:32 +00:00
John Reck
998a6d8189 Track buildLayer calls, destroy if unused 
Bug: 17208461

Change-Id: Ibdb104a493285d77a6891c5e74e38a52c7014da9
 2014-08-28 15:55:26 -07:00
Chris Craik
8ef4bf20e5 am da573fa7: am c00a7298: am 19b7a03f: Merge "Update transform isolation to handle command chunks" into lmp-dev 
* commit 'da573fa7f1701359839cbf2659e171e4f7938a9b':
  Update transform isolation to handle command chunks
 2014-08-28 18:08:22 +00:00
Chris Craik
cdf4813881 am c00a7298: am 19b7a03f: Merge "Update transform isolation to handle command chunks" into lmp-dev 
* commit 'c00a7298d10781ee009f4f240e761bf84eccbe1b':
  Update transform isolation to handle command chunks
 2014-08-28 17:51:53 +00:00
John Reck
f76acc5ce3 am 22ad4f00: am d4e0267a: am f29b2624: Merge "Fix log line" into lmp-dev 
* commit '22ad4f00bf3a2e9aedf2c2a771b98a72f77df6f2':
  Fix log line
 2014-08-28 17:48:49 +00:00
John Reck
1e1d8a5e15 am d4e0267a: am f29b2624: Merge "Fix log line" into lmp-dev 
* commit 'd4e0267a61d2af8d275f59faea74a3e68945b1fd':
  Fix log line
 2014-08-28 17:36:44 +00:00
Chris Craik
bf939b2671 Merge "Update transform isolation to handle command chunks" into lmp-dev 2014-08-28 17:27:24 +00:00
John Reck
8df7949d48 am 0ed484c5: am 16c66174: am 2b21f462: Merge "Actually end animators on tree destruction" into lmp-dev 
* commit '0ed484c59b308080617037e11a6100e8176dc974':
  Actually end animators on tree destruction
 2014-08-28 17:22:17 +00:00
John Reck
778cef5b30 am 16c66174: am 2b21f462: Merge "Actually end animators on tree destruction" into lmp-dev 
* commit '16c661747022d0861d98a1d3145780912f5b809c':
  Actually end animators on tree destruction
 2014-08-28 17:09:34 +00:00
John Reck
c7e2993628 Fix log line 
Change-Id: I290491f559281c7b3d1d132495ea2fffcfaf4725
 2014-08-28 09:56:20 -07:00
John Reck
d0cd9db316 Actually end animators on tree destruction 
Bug: 17313962

Change-Id: I66b86d50b415f9aa33da23297f22e2cf7f96f565
 2014-08-28 08:43:39 -07:00
John Reck
d21fb2fe93 am 7a86c785: am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '7a86c7859b2ccdb4f424c4b9bd946ebf0b4cdf3f':
  Animator stuff
 2014-08-28 04:17:37 +00:00
John Reck
59f71093fe am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '969f3860d940bdcaa66441d561448cca92ebd8ea':
  Animator stuff
 2014-08-28 03:39:21 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00
Adam Lesinski
ad2d07d2d9 Stamp platform version code into app Apks 
The versionCode of theframework resources that an app is built against
gets stamped inside an app's AndroidManifest.xml in the <manifest>
tag as "platformBuildVersionCode" and "platformBuildVersionName"
attributes.

Bug:17207635
Change-Id: Id573c3dffcbca38eec9c0eb3e89f4a547e3361d3
 2014-08-27 18:28:49 -07:00
John Reck
119907cd25 Animator stuff 
Bug: 17228458

Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
 2014-08-27 17:44:25 -07:00
Chris Craik
c3e75f9d54 Update transform isolation to handle command chunks 
bug:15570351

Prevent drawing transformations on a ViewGroup's canvas from directly
affecting the transformation of the children through the renderer,
since it's already baked into mTransformFromParent at record time.

Change-Id: I6310a2260dfe4def0bde1fd2c5b93791a645d586
 2014-08-27 15:43:42 -07:00
Torne (Richard Coles)
46a807f4eb Also allow + in stringToFloat. 
Some resource files also use a + prefix; allow that as well as -.

Change-Id: I79cf13841849633f8fa49ee7e23698079d890489
 2014-08-27 12:36:44 +01:00
Torne (Richard Coles)
463a7c3add Fix stringToFloat test to allow '-'. 
Check was incorrectly disallowing negative values; allow '-' as the
first character.

Change-Id: I6002c38b4a5141c3ab3e385c4e5fc8c55d285f82
 2014-08-27 11:57:50 +01:00
Chris Craik
4be698fad5 am 11ed894a: am f55719bc: am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 
* commit '11ed894a043a193baa5ec004e0cf376eab9f21eb':
  Crash instead of leaking layers/textures between GL contexts
 2014-08-27 04:34:26 +00:00
Chris Craik
287d2314da am f55719bc: am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 
* commit 'f55719bcbaeb3b5b57759211e3ea0c99d21c27aa':
  Crash instead of leaking layers/textures between GL contexts
 2014-08-27 04:20:30 +00:00
Deepanshu Gupta
795c1789ef Merge "Fix invalid conditional check in ResourceTypes." 2014-08-27 00:36:43 +00:00
Chris Craik
1d47742333 Crash instead of leaking layers/textures between GL contexts 
bug:17208461
Change-Id: I4d58f301cf0f5e8145e808a5d6ade4de7801970b
 2014-08-26 17:30:15 -07:00
Deepanshu Gupta
71909a62c5 Fix invalid conditional check in ResourceTypes. 
The check was always false. This wasn't really a problem since the regex
check later took care of it. But it's just wrong to leave such mistakes
in the code once they are noticed.

Change-Id: Id3dd602318d8c64d466bd0f102aa3af0a1c80189
 2014-08-26 17:23:19 -07:00
ztenghui
8abc808479 am 9b7e3ef5: am acd21c96: am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev 
* commit '9b7e3ef5bc00552939b544eacef7e6568cdeb1cd':
  Correctly detect the wrong Z value for the light
 2014-08-26 18:42:04 +00:00
ztenghui
a0b6f1c236 am acd21c96: am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev 
* commit 'acd21c96a5c7734d3fd949b0ccbba3b910e48d95':
  Correctly detect the wrong Z value for the light
 2014-08-26 18:31:37 +00:00
ztenghui
bed17d21b0 Merge "Correctly detect the wrong Z value for the light" into lmp-dev 2014-08-26 18:18:31 +00:00
ztenghui
3bd3fa1f1d Correctly detect the wrong Z value for the light 
b/17221975

Change-Id: I2b46da95ad12ca5260d7fe9514a75558b6b6393b
 2014-08-26 10:45:27 -07:00
Adam Lesinski
48a5d5e52a am 097ea60e: am 1d3ecf16: am 1c959e92: Merge "Introduce anydpi density resource qualifier" into lmp-dev 
* commit '097ea60ed6eab4f48b34b186c4006dc305a72b49':
  Introduce anydpi density resource qualifier
 2014-08-26 17:33:55 +00:00
Adam Lesinski
6d41a45679 am 1d3ecf16: am 1c959e92: Merge "Introduce anydpi density resource qualifier" into lmp-dev 
* commit '1d3ecf16766d92ef3d847f1420b9a622e871f6cd':
  Introduce anydpi density resource qualifier
 2014-08-26 17:23:35 +00:00
Adam Lesinski
d691f31e51 Merge "Introduce anydpi density resource qualifier" into lmp-dev 2014-08-26 17:03:44 +00:00
John Reck
7dd9776fa8 am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev 
* commit 'd73a1aa3b97d9cd9792dec4a58ab6150b76afb31':
  DO NOT MERGE Copy shaders
 2014-08-26 15:13:50 +00:00
John Reck
1698297daf Merge "DO NOT MERGE Copy shaders" into lmp-dev 2014-08-26 14:53:34 +00:00
Chris Craik
c53e7c8578 am b0640084: am 6210c6dc: Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev 
* commit 'b06400847cdfae6da8d3d4d5b52e2ff29d06cb7a':
  Create z reordering boundaries around dispatchDraw
 2014-08-26 04:56:01 +00:00
Adam Lesinski
31245b4f06 Introduce anydpi density resource qualifier 
This is meant to be used with scaleable vector
drawables, and are chosen as the best match unless
there is a configuration that matches the density
requested exactly.

Bug:17007265
Change-Id: Ic3288d0236fe0bff20bb1599aba2582c25b0db32
 2014-08-25 17:47:30 -07:00
Chris Craik
8afd0f245c Create z reordering boundaries around dispatchDraw 
bug:16012254

This means rendernodes with a Z will no longer be drawn at the end of
their parent's DisplayList, but at the end of the associated reorder
region (DisplayListData::Chunk).

Change-Id: Ia033fee9d9a4db567b2a8d5e90fc57a4d0a64544
 2014-08-25 15:35:40 -07:00
John Reck
c1469f39b5 DO NOT MERGE Copy shaders 
Bug: 16733996

Change-Id: I84afc1b24a23dd6ddf5ab48fb2bfcbe779f8d3e3
 2014-08-25 15:27:11 -07:00
Jeff Sharkey
daa88714a1 am 9f3ddd55: am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev 
* commit '9f3ddd551393b4fbc421156b8f700cae7dbd6a3b':
  Installing splits into ASECs!
 2014-08-24 19:04:07 +00:00
Jeff Sharkey
941a8ba1a6 Installing splits into ASECs! 
Sessions can now zero-copy data directly into pre-allocated ASEC
containers.  Then at commit time, we compute the total size of the
final app, including any inherited APKs and unpacked libraries, and
resize the container in one step.

This supports both brand new ASEC installs and inheriting from
existing ASEC installs.  To keep things simple, it currently requires
copying any inherited ASEC contents, but this could be optimized in
the future.

Expose new vold resize command, and allow read-write mounting of ASEC
containers.  Move native library extraction into the installer flow,
since it needs to happen before ASEC is sealed.  Move multiArch flag
into NativeLibraryHelper, instead of making everyone pass it
around.  Migrate size calculation to shared location.

Separate "other" package name in public API, provide a path to a
storage device when relevant, and add more docs.

Bug: 16514385
Change-Id: I06c6ce588d312ee7e64cce02733895d640b88456
 2014-08-22 16:25:04 -07:00
ztenghui
e509e1d214 am 059c9a56: am 2758bafd: Merge "Improve the spot shadow computation." into lmp-dev 
* commit '059c9a56aac1e1cbe0366b1ec6edc729afbd5855':
  Improve the spot shadow computation.
 2014-08-22 21:24:07 +00:00
ztenghui
190ead730f Merge "Improve the spot shadow computation." into lmp-dev 2014-08-22 21:04:49 +00:00