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

124155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
f9bf991cb5 am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit 'bcb433b43acb424ff7bc6afab03ce12d8cc9a198':
  libandroidfw: fix build error for 64-bit
 2014-02-20 21:28:09 +00:00
Scott Main
83b6e4b937 am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '5ef8d14d38654e6309babf46f64f5a296df5c169':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 21:27:47 +00:00
John Reck
2f2c0e75af Merge "Fix NPE in layer destruction" 2014-02-20 21:24:29 +00:00
Derek Sollenberger
674554fc36 Reapply "Refactor setting an SkPaint onto a hwui Layer." 
This reverts commit 90d0c75e94a32fb7d993fae69762820aabc2fcbb.

Change-Id: Ie807761231edf7c848b019931dccbf466208c0be
 2014-02-20 16:20:33 -05:00
John Reck
6b3c4113c4 Fix NPE in layer destruction 
Bug: 13111945
 Fixes an issue where a layer is destroyed after the GLRenderer
 lost its Surface. Instead just check that the context we want is
 current regardless of the active surface

Change-Id: I6537e6232b5c667b218b896ed5ef390fbe956344
 2014-02-20 13:18:42 -08:00
Derek Sollenberger
96f0369b25 Merge "Update framework to enable Skia to run in debug mode." 2014-02-20 21:14:50 +00:00
Michael Wright
40c3ddd3a2 Merge "Make deliverInputEvent tracing asynchronous" 2014-02-20 21:07:56 +00:00
Derek Sollenberger
2d5cf4f6db Update framework to enable Skia to run in debug mode. 
Change-Id: I8ba605cfae61b584dad27e3245c4482c8dfdff2e
 2014-02-20 14:47:54 -05:00
Baligh Uddin
17b7705afb am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fbb100c437d52db818e6e57c18ffe1e969ba46b0':
  Import translations. DO NOT MERGE
 2014-02-20 18:47:45 +00:00
Baligh Uddin
c87c6a2a46 am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a69996e45c7c40d971b05a56866b7ac5c7f617de':
  Import translations. DO NOT MERGE
 2014-02-20 18:47:43 +00:00
Baligh Uddin
fbb100c437 am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ea17c6365fd70b057a4c696d9eec2b5f70b6e476':
  Import translations. DO NOT MERGE
 2014-02-20 18:43:00 +00:00
Baligh Uddin
a69996e45c am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '701449e85395d7a81d244d4b115b9ef4ae2f06d9':
  Import translations. DO NOT MERGE
 2014-02-20 18:42:58 +00:00
Baligh Uddin
ea17c6365f am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4292ce5d0023551a6fa7a02b284bf9b02823b06b':
  Import translations. DO NOT MERGE
 2014-02-20 18:39:46 +00:00
Baligh Uddin
701449e853 am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c9443fc54caa789c4e3c64e7d9feaee8ac00506f':
  Import translations. DO NOT MERGE
 2014-02-20 18:39:43 +00:00
Deepanshu Gupta
09fcce52b4 Merge "Add ability to obtain themed Drawable from Context" 2014-02-20 18:37:50 +00:00
Baligh Uddin
4292ce5d00 am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '810267c309f018c5b58b0a2e787b8a6434faa0e0':
  Import translations. DO NOT MERGE
 2014-02-20 18:36:38 +00:00
Baligh Uddin
c9443fc54c am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
  Import translations. DO NOT MERGE
 2014-02-20 18:36:35 +00:00
Baligh Uddin
810267c309 am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '28009e8102aa91294362cc2d7770cab73d02e640':
  Import translations. DO NOT MERGE
 2014-02-20 18:33:18 +00:00
Baligh Uddin
8ca432c782 am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c2803d473ad180fa70e5000f0607795c92c4035d':
  Import translations. DO NOT MERGE
 2014-02-20 18:33:13 +00:00
Baligh Uddin
28009e8102 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 18:31:03 +00:00
Baligh Uddin
c2803d473a Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 18:30:49 +00:00
Baligh Uddin
46f1744acf am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2f07a7059f4471963c114b0ab944249e8746cbf9':
  Import translations. DO NOT MERGE
 2014-02-20 18:17:41 +00:00
Baligh Uddin
2f07a7059f am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '50d0afa43af2b215ddddbc7a3adfb8b5d85cb549':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:52 +00:00
Baligh Uddin
e16fe1aa7c am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '13e850160d21008597239dc974c805df057d4e1b':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:43 +00:00
Baligh Uddin
e9a5424cc6 am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a935d31ca87146990010121b576506faef803404':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:40 +00:00
Baligh Uddin
54de3ec25b am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '72edb1b78d0316055b40931138ee75a99766995d':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:38 +00:00
Baligh Uddin
50d0afa43a am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2f5347ee46766134848586d67d2dd86bdc9d1952':
  Import translations. DO NOT MERGE
 2014-02-20 18:10:15 +00:00
Baligh Uddin
13e850160d am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '749e6b9cf21799aefe9accc50c60f6bfddf1545a':
  Import translations. DO NOT MERGE
 2014-02-20 18:09:59 +00:00
Baligh Uddin
a935d31ca8 am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bf2226ec7f9fcb0a2fc169df170c770363d9a3f5':
  Import translations. DO NOT MERGE
 2014-02-20 18:09:56 +00:00
Baligh Uddin
72edb1b78d am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '699991c8a296834e8fe843bce85529b018d12af8':
  Import translations. DO NOT MERGE
 2014-02-20 18:09:54 +00:00
Baligh Uddin
2f5347ee46 am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1af20cc5764a38d0713a292fd63bf6a628f2f5eb':
  Import translations. DO NOT MERGE
 2014-02-20 18:07:02 +00:00
Baligh Uddin
749e6b9cf2 am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5da96060e61c3076d0a5cbd87a3f17254414afeb':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:24 +00:00
Baligh Uddin
bf2226ec7f am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8b297fb6ef42650a1126287aa0b610aa9a503167':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:21 +00:00
Baligh Uddin
699991c8a2 am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '08394af265b02db7a76c4f4f4ae16b9d238e7580':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:17 +00:00
Baligh Uddin
1af20cc576 am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '554b43a066b6a084dbb9b7dba014de4b12ba1175':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:38 +00:00
Baligh Uddin
5da96060e6 am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:07 +00:00
Baligh Uddin
8b297fb6ef am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8027100fdb13c046838f9af12ef7bf2bc3ad511f':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:05 +00:00
Baligh Uddin
08394af265 am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e69b7b3474c356438fbd65e43438e72ebda0bacb':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:02 +00:00
Baligh Uddin
f887a67dbd am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'aa20b27472552ebc812dfbb3cbe260115ee43db1':
  Import translations. DO NOT MERGE
 2014-02-20 17:59:50 +00:00
Baligh Uddin
8027100fdb am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e9adafd1b95a7934bb813cb168e33a85a762a504':
  Import translations. DO NOT MERGE
 2014-02-20 17:59:47 +00:00
Baligh Uddin
e69b7b3474 am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e':
  Import translations. DO NOT MERGE
 2014-02-20 17:59:45 +00:00
Baligh Uddin
554b43a066 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:59:40 +00:00
Xavier Ducrohet
7d23619918 am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:55:44 +00:00
Deepanshu Gupta
7b5d0a82f6 am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'c139177b13427ea3ea1bc88364136439125848af':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:55:41 +00:00
Baligh Uddin
aa20b27472 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:33 +00:00
Baligh Uddin
e9adafd1b9 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:23 +00:00
Baligh Uddin
46a02249d7 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:13 +00:00
Xavier Ducrohet
21c5c8e600 am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '9edf7a1159b528afa056e0d61ee4487ed310fe4c':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:53:20 +00:00
Deepanshu Gupta
c139177b13 am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '65521c3cf169808cd02ce09a7344bc633d51c1fc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:53:17 +00:00
Xavier Ducrohet
9edf7a1159 am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '2cb9147fc49e6474eaf30fd833e43df10e42b899':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:49:32 +00:00