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

139510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
d82b45c1a4 docs: misc l-prev fixes 
Change-Id: I9e2e82d926ba81c8621b24aa10247e1231bb2b2d
 2014-06-16 15:26:20 -07:00
Alan Viverette
153976169e Merge "Fix tint filters in NinePatchDrawable and ShapeDrawable" 2014-06-16 15:39:47 +00:00
Alan Viverette
a2992f44bc Fix tint filters in NinePatchDrawable and ShapeDrawable 
BUG: 15678325
Change-Id: I57066e7a44498c88a270c76b7880f36825a25bb8
 2014-06-16 18:34:04 -07:00
Chris Craik
0732ba5756 am 88b1c9ad: am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." 
* commit '88b1c9ad87ca6d6faaf824bff4ee9d3c799362e5':
  Fix the texture ID reuse issue in HWUI.
 2014-06-17 01:31:21 +00:00
Chris Craik
11a8d4f8b9 am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" 
* commit '678886fde5cd779de79f8e38479aa6de82f8e755':
  hwui: fix possible null pointer de-refrence
 2014-06-17 01:31:16 +00:00
Tim Murray
658639c6bc am 9dad7d44: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit '9dad7d44d29d27afa802922abc52bfaddb4e83a0':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-17 01:30:58 +00:00
Robert Ly
c14f05cb30 am 90fd93c0: am d458e3f4: delete tv 
* commit '90fd93c0ef3d5f694bff8b8e94ccca9b2cb05b84':
  delete tv
 2014-06-17 01:30:52 +00:00
Robert Ly
17df2740aa am 3a437c78: am 208eb3e8: Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev 
* commit '3a437c784650930b770a9eb2e9a2620e08386725':
  Android TV DevGuide home fix (no pic)
 2014-06-17 01:30:46 +00:00
Robert Ly
e7eb35c61d am 2c7fefe3: am f5135c28: Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev 
* commit '2c7fefe339ffa411bcbf759b81f38c5d86cfbfc2':
  docs: Material design doc fixes from editorial review.
 2014-06-17 01:30:38 +00:00
Robert Ly
385d98efb2 am 605b00b9: am 13bc25bf: Merge "docs: misc l-prev fixes" into klp-modular-dev 
* commit '605b00b97f5746efb6c1d2397bc0666f84aa9d25':
  docs: misc l-prev fixes
 2014-06-17 01:29:29 +00:00
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Colin Cross
18cd9f5762 clean up native com.android.internal.os.Zygote 
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
 2014-06-16 12:22:56 -07: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
5d140e4b1b am 5406f59a: am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd." 
* commit '5406f59abd0cde826e8254fe628bea6d80769c8c':
  Move dex file pruning to installd.
 2014-06-16 13:58:39 +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
97df96d8eb am 2ecc4dc8: am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit '2ecc4dc88fc209f75f5dfe815d6a1fbb5fd49ef2':
  Track changes to libcore ICU apis.
 2014-06-16 11:10:00 +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
617a4c403f am 2b49f5b5: am d3843038: Merge "docs: Fixing the remaining issues with the Auto page" into klp-modular-dev 
* commit '2b49f5b5fa878a87871c7cc1e12c5f9bf816944c':
  docs: Fixing the remaining issues with the Auto page
 2014-06-16 10:11:50 +00:00
Joe Fernandez
7c820b4995 am 05b55aff: am b83765ff: Android TV Dev Guide for L-Prevew, round 2 
* commit '05b55afff4864d88489b1bd65b903b8e73d8c000':
  Android TV Dev Guide for L-Prevew, round 2
 2014-06-16 10:11:45 +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
5af1edc4bb am 5a44bdc8: am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code." 
* commit '5a44bdc828cba61aa055e2d71b3af62f39100179':
  Remove some pointless code.
 2014-06-16 10:03:19 +00:00
Narayan Kamath
2fbe737318 am 8966fd38: am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes." 
* commit '8966fd383b6a91426871784590e2cc8a79f4fa5b':
  Support deprecated language codes.
 2014-06-16 10:03:03 +00:00
Robert Ly
3238395b42 am 32b98210: am d73b0450: Merge "docs: fix index pages" into klp-modular-dev 
* commit '32b9821027e5f40f6954ca806f60f4a6703325da':
  docs: fix index pages
 2014-06-16 10:02:55 +00:00
Robert Ly
3a4532609c am e5fdd423: am 09e2459c: Merge "docs: Added info on customizing the status bar." into klp-modular-dev 
* commit 'e5fdd4236b8b5819c56b17ccc6c45540a6b3733d':
  docs: Added info on customizing the status bar.
 2014-06-16 10:02:50 +00:00
Ricardo Cervera
a2f572fe5b am 17e7903f: am d3e426be: docs: Review the User Interface section for the L API Preview 
* commit '17e7903f5a21a8bac3d5bf815b82c106af82ff65':
  docs: Review the User Interface section for the L API Preview
 2014-06-16 10:02:45 +00:00
Ricardo Cervera
2731fbfe05 am 7daf6955: am d6beebff: docs: Added the Compatibility page to the L Preview menu 
* commit '7daf6955bb02c4e7de79aa652b6b22eb33d35077':
  docs: Added the Compatibility page to the L Preview menu
 2014-06-16 10:02:30 +00:00
Robert Ly
82438a959a am cc55138e: am b8cabe9a: fix the index page 
* commit 'cc55138e4cc863aa3c6828ceceaf4da65d3630cb':
  fix the index page
 2014-06-16 10:02:20 +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
298a5f8ea7 resolved conflicts for merge of 65cb7696 to master 
Change-Id: Ib15b97dc2f9337861c8e9589d69e6af5328fe219
 2014-06-16 10:41:14 +01: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
Jessica Hummel
d7ccad9935 Remove unused icon. 
The icon was left there during a rename to allow easier merging between android branches.

Change-Id: Ia605e228be1eaebd235bd92100a14b8f5f46f1f8
 2014-06-16 09:55:41 +01:00
Joe Fernandez
b83765ff06 Android TV Dev Guide for L-Prevew, round 2 
Change-Id: I461a0fd34a695aaefe1211e079069ea0cf03eb2d
 2014-06-15 23:01:18 -07:00
Jinsuk Kim
6d97f5b91c A few more APIs for HdmiControlService 
Added following APIs in HdmiControlService:

- portSelect
- sendKeyEvent
- getPortInfo
- addDeviceEventListener

Some are not fleshed out yet. Will work on it in a follow up CL.

Change-Id: Ia8c635176c0378f6e8db589bf714d82bf21ce85d
 2014-06-16 14:01:45 +09: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