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

124132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tenghui Zhu
ecae1ffd77 am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit 'df36dd200c55a6ad463b46bab0ffff49d21206ff':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:18:51 +00:00
Tenghui Zhu
df36dd200c am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit '386caf6c8f276f1d03ea077bc799df2a937ef500':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:13:53 +00:00
Tim Murray
8197cc403a am 080671c5: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit '080671c5383f4b98303c143a685b9f5e75cfe781':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-16 17:01:29 +00:00
Tim Murray
080671c538 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-16 09:55:50 -07:00
Tenghui Zhu
386caf6c8f Merge "update parameters in uploadToTexture() for GLES20" 2014-06-16 15:49:03 +00:00
Robert Ly
208eb3e84a Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev 2014-06-16 15:46:16 +00:00
Joe Fernandez
38ed6b7b77 Android TV DevGuide home fix (no pic) 
Change-Id: If48d6c6d2973c2d4bcf97da503cb707144f33028
 2014-06-16 16:05:43 -07:00
Robert Ly
13bc25bf4c Merge "docs: misc l-prev fixes" into klp-modular-dev 2014-06-16 15:46:16 +00:00
Robert Ly
d82b45c1a4 docs: misc l-prev fixes 
Change-Id: I9e2e82d926ba81c8621b24aa10247e1231bb2b2d
 2014-06-16 15:26:20 -07:00
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Michael Kolb
a730881d76 Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev 2014-06-16 15:34:28 +00:00
Michael Kolb
ee028d502e DO NOT MERGE : Fix measuring with outset for orientation 
Bug: 14992865

Change-Id: Ie133d8010a394403e52512f4012632389bc32c4a
 2014-06-16 20:28:52 +00:00
Narayan Kamath
5406f59abd am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd." 
* commit '6a6411e3d8c533a40bfe1897e2c26e3d6f3b52e0':
  Move dex file pruning to installd.
 2014-06-16 13:54:10 +00:00
Narayan Kamath
6a6411e3d8 am 076dc013: Merge "Move dex file pruning to installd." 
* commit '076dc0135b153cbcedbe584645c93cfe4390cdb0':
  Move dex file pruning to installd.
 2014-06-16 13:50:37 +00:00
Narayan Kamath
2ecc4dc88f am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit 'f36fe3f85daaf9e3b3270143d6648394768bb324':
  Track changes to libcore ICU apis.
 2014-06-16 11:01:29 +00:00
Narayan Kamath
f36fe3f85d am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit '1083573c2feb6677ae5627a9ee41f82a697e22d4':
  Track changes to libcore ICU apis.
 2014-06-16 10:56:34 +00:00
Robert Ly
2b49f5b5fa am d3843038: Merge "docs: Fixing the remaining issues with the Auto page" into klp-modular-dev 
* commit 'd3843038b93e91681a6f40633efeca8b41edc055':
  docs: Fixing the remaining issues with the Auto page
 2014-06-16 10:07:04 +00:00
Joe Fernandez
05b55afff4 am b83765ff: Android TV Dev Guide for L-Prevew, round 2 
* commit 'b83765ff06afbc96f4ffc21f9350ef6650d70d94':
  Android TV Dev Guide for L-Prevew, round 2
 2014-06-16 10:06:57 +00:00
Narayan Kamath
5a44bdc828 am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code." 
* commit '8382b0d3c6639ee0eeadec02983bfceaf5ba0a32':
  Remove some pointless code.
 2014-06-16 09:54:49 +00:00
Narayan Kamath
8382b0d3c6 am ab9a19e3: Merge "Remove some pointless code." 
* commit 'ab9a19e38c685d0cb2952185af510322b26181a7':
  Remove some pointless code.
 2014-06-16 09:47:10 +00:00
Narayan Kamath
8966fd383b am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes." 
* commit '031dec4acd384ae6c5ab183139c7f91289a05f62':
  Support deprecated language codes.
 2014-06-16 09:44:03 +00:00
Narayan Kamath
031dec4acd am bfa6ddd0: Merge "Support deprecated language codes." 
* commit 'bfa6ddd02d699f43915cba8027ab324d234b4836':
  Support deprecated language codes.
 2014-06-16 09:39:57 +00:00
sean_lu
7c57d23371 [Asset Manager] Fix memory leakage bug 
Symptom: memory leakage
Root Cause: new SortedVector but not free it in native cpp
Solution: free the SortedVector
Project: AOSP
Note:

Change-Id: Iab5a7f2e8d8509631301e7231427927d4797c856
 2014-06-16 15:11:29 +08:00
Joe Fernandez
b83765ff06 Android TV Dev Guide for L-Prevew, round 2 
Change-Id: I461a0fd34a695aaefe1211e079069ea0cf03eb2d
 2014-06-15 23:01:18 -07:00
jiayuanr
4a473c7d94 Fix the texture ID reuse issue in HWUI. 
Issue: When the layer of previous frame is destroyed, it doesn't clear the
texture id in mBoundTextures[mTextureUnit], so in the next frame, if
glGenTexture returns same texture ID of the previous frame,
the new texture is not bound.

CRs-fixed: 671736

Change-Id: Ifc5fd2115fb1863b3c006ab14b0faabeaeb4eab4
 2014-06-16 09:29:22 +05:30
Robert Ly
32b9821027 am d73b0450: Merge "docs: fix index pages" into klp-modular-dev 
* commit 'd73b045090990d11da1648c695c4a81b99c5aa3b':
  docs: fix index pages
 2014-06-16 01:44:43 +00:00
Robert Ly
e5fdd4236b am 09e2459c: Merge "docs: Added info on customizing the status bar." into klp-modular-dev 
* commit '09e2459cc347696297062454e4a6bdccadb056e4':
  docs: Added info on customizing the status bar.
 2014-06-15 23:15:22 +00:00
Ricardo Cervera
17e7903f5a am d3e426be: docs: Review the User Interface section for the L API Preview 
* commit 'd3e426bebd7c3c65c16456353f521d9d9e0f72b8':
  docs: Review the User Interface section for the L API Preview
 2014-06-15 23:15:19 +00:00
Ricardo Cervera
d3e426bebd docs: Review the User Interface section for the L API Preview 
Change-Id: Ied0002d5c4b0a29919be28f2feb04a419c563160
 2014-06-15 16:01:28 -07:00
Ricardo Cervera
7daf6955bb am d6beebff: docs: Added the Compatibility page to the L Preview menu 
* commit 'd6beebffe440fd5579db994023236095331a8bb8':
  docs: Added the Compatibility page to the L Preview menu
 2014-06-15 22:06:03 +00:00
Ricardo Cervera
d6beebffe4 docs: Added the Compatibility page to the L Preview menu 
Change-Id: Ibe3d02cf37e72e830bf94db84cae0063d3100223
 2014-06-15 15:00:41 -07:00
Robert Ly
cc55138e4c am b8cabe9a: fix the index page 
* commit 'b8cabe9ae0b848ace8f6b20a9ecbf6c78a7643cb':
  fix the index page
 2014-06-15 21:57:44 +00:00
Robert Ly
b8cabe9ae0 fix the index page 
Change-Id: I84461a7ace1c6bde8e99534096cc9e485cecb4c4
 2014-06-15 14:49:02 -07:00
Joe Fernandez
65cb769671 am a4071291: Android TV Dev Guide for L-Preview 
* commit 'a4071291dd29d3efdf6340a7777f4542996cfc3c':
  Android TV Dev Guide for L-Preview
 2014-06-15 21:42:43 +00:00
Joe Fernandez
a4071291dd Android TV Dev Guide for L-Preview 
Change-Id: I46749538c927e1090c73e747e44e83aa703bdff1
 2014-06-15 14:17:23 -07:00
Quddus Chong
97f9323346 am d50a6f8e: docs: Updates to L Developer Preview Highlights. 
* commit 'd50a6f8ef27b793d2b0d65140bfeb5e824c3b103':
  docs: Updates to L Developer Preview Highlights.
 2014-06-15 19:27:29 +00:00
Quddus Chong
d50a6f8ef2 docs: Updates to L Developer Preview Highlights. 
Change-Id: Ifbacefe16a0048d6f19a468adb7a8b8712820c28
 2014-06-15 12:13:52 -07:00
Ian Rogers
7f8d94f411 Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp 2014-06-14 09:06:58 +00:00
Nick Kralevich
5f20e1ae8d am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver" 
* commit '23315095f1d1f647311ad0fcf05ddb152ad9452d':
  update mLastSlash for gdbserver
 2014-06-14 09:05:57 +00:00
Robert Ly
72f0f57a6d am 20555296: docs: squashed commit of i.o launches 
* commit '2055529600cda58bfcf9076b7c68467bbd5df7f8':
  docs: squashed commit of i.o launches
 2014-06-14 09:03:51 +00:00
Robert Ly
2055529600 docs: squashed commit of i.o launches 
Change-Id: I71bb6efb27f363dc6b47bf1e283369ae274caee8
 2014-06-14 00:39:05 -07:00
Nick Kralevich
23315095f1 am 748f4b8d: Merge "update mLastSlash for gdbserver" 
* commit '748f4b8d42541955850e76972b1ab3d9c98e226d':
  update mLastSlash for gdbserver
 2014-06-14 04:25:46 +00:00
Vinod Krishnan
61eb51b8f5 am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev 
* commit '1e6048e0158310ee31e0310661bed06a41ac7dd7':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
 2014-06-14 01:06:50 +00:00
smain@google.com
b06efc724c am aa1ecf5c: html cleanup. delete quickviews 
* commit 'aa1ecf5cdf70c5b76bd5e31d252735ba52a90b72':
  html cleanup. delete quickviews
 2014-06-14 00:55:40 +00:00
smain@google.com
aa1ecf5cdf html cleanup. delete quickviews 
Change-Id: Ifd71ca32848982919f37f8927acd8b66b0cf4438
 2014-06-13 17:47:15 -07:00
smain@google.com
80b69dc203 am b43eff80: adjust scroll position now that there\'s secondary nav bar 
* commit 'b43eff80e56c29b29ac3f77ee12150211539dcee':
  adjust scroll position now that there's secondary nav bar
 2014-06-14 00:35:48 +00:00
smain@google.com
b43eff80e5 adjust scroll position now that there's secondary nav bar 
Change-Id: I7aa237390066805bef210f2ed2f4ae1063e5e252
 2014-06-13 17:31:20 -07:00
Craig Mautner
916cd9770c am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly."" 
* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
 2014-06-14 00:30:47 +00:00
Craig Mautner
4019037540 am 6fe2184b: Do not treat the dummy animation as an animation 
* commit '6fe2184bf10362ac53db7e8f6a0be521ea59b054':
  Do not treat the dummy animation as an animation
 2014-06-14 00:22:36 +00:00
Craig Mautner
6335fbcba1 Revert "Revert "Close ActivityView and ActivityContainer cleanly."" 
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.
 2014-06-13 17:18:47 -07:00