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

96780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
54b946fe3c am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit 'f46900c5eaeff0fbba7f20466be87db67002d6bf':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:43:16 +00:00
Deepanshu Gupta
f46900c5ea am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '87a54055e61918986021eb5e1e3dbefe40839367':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:38:15 +00:00
Deepanshu Gupta
eff94bc364 am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '8c19c6a17d8a019086a36988937462acfb6b830f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:36:24 +00:00
Deepanshu Gupta
87a54055e6 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '5878115a6e19041439b335efae066862e21775a1':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:33:30 +00:00
Deepanshu Gupta
8c19c6a17d am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '16f3a6167bdcbd49e47d843fcb43fe9ffd461531':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:30:39 +00:00
Deepanshu Gupta
5878115a6e resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 2014-05-13 13:29:07 -07:00
Deepanshu Gupta
16f3a6167b am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'c0e9c66d7d59873443714cc19e5cea8c044931bb':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:27:46 +00:00
Deepanshu Gupta
06ca4c6a46 am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '1281853a17d24756223c8043b53225ffe8c8f03d':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:47:30 +00:00
Deepanshu Gupta
29171d5a9a am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit 'eb0360267a122680c5ccfb3312555811aeed5a38':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:47:27 +00:00
Deepanshu Gupta
c0e9c66d7d resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 2014-05-13 11:43:45 -07:00
Deepanshu Gupta
1281853a17 am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '2de8509e30555594e9f39c410f458d5ffc8e7917':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:42:00 +00:00
Deepanshu Gupta
eb0360267a am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '14788ef3e70faed432b7bf643771d126d50a59c7':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:41:57 +00:00
Deepanshu Gupta
2de8509e30 am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '7d5299c28618b10c00c7e452d34d9b2485e478fe':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:36:14 +00:00
Deepanshu Gupta
14788ef3e7 am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit 'f8c568586d1affdfe61ec9f510e7b259d585e56b':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:36:12 +00:00
Deepanshu Gupta
7d5299c286 am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '0f26b5102574f0a989023485f4d63a9ac50107d2':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:30:46 +00:00
Deepanshu Gupta
0d76fd64a1 am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '3e7f0a20f7297c599c0ce5840c182668a15b207d':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:16:12 +00:00
Deepanshu Gupta
0c11327b3c am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'd4d66df6054ccd515cf5029bd5bd3b40de340883':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:16:09 +00:00
Deepanshu Gupta
8a505e5c6f am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '74d2a533a4d815e1ef5c709837cc8f8484b715d4':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:16:06 +00:00
Deepanshu Gupta
5db08e87a1 am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'ce68e782e8cdfa8007b88b2461dd6e78bccc6fe9':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:16:03 +00:00
Deepanshu Gupta
e74d437a17 am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit 'c5c49dcd5c2fbb4463663d83cfd3eff8e05bba44':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:16:00 +00:00
Deepanshu Gupta
3e7f0a20f7 am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '776c192379bcfa25d09d0881afca49f2e6f5edb5':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:11:28 +00:00
Deepanshu Gupta
d4d66df605 am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '26dd61c55ad515c0d4b14b8f799723a0f9985972':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:11:25 +00:00
Deepanshu Gupta
74d2a533a4 am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'bb7cfa1e1984342d896e664d0c8e2ed654e838cc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:11:23 +00:00
Deepanshu Gupta
ce68e782e8 am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'e535ff28728ad8edce7587110860963c0e571791':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:11:20 +00:00
Deepanshu Gupta
c5c49dcd5c am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit '8b78a1d7e31355a3ba08e8905e45aefd905ef501':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:11:17 +00:00
Deepanshu Gupta
81ac665ca5 am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '060836bdf742cc790014cf0f2eaa80b4ace92841':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 18:09:09 +00:00
Deepanshu Gupta
fd8af67302 am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '9e614b25db75950d6b08f937f15c0bc0df74803f':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:09:06 +00:00
Deepanshu Gupta
be0c94ea6b am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'be2184e425bae9212d81fd90e4d7cc4f67ca9d0e':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:09:02 +00:00
Deepanshu Gupta
dbfd29d855 am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '81ff5ba73f5c5c098cf4d2f46f360852bccf63da':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:08:59 +00:00
Deepanshu Gupta
776c192379 am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '3c9fceaeb4a00c1f9b9728fa703d97894e718e81':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:05:48 +00:00
Deepanshu Gupta
26dd61c55a am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '07009057fee65896114a3c83bd762f6b22e1b645':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:05:46 +00:00
Deepanshu Gupta
bb7cfa1e19 am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '85c5cdcd587c64a9e80ac51beb134d9547faae54':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:05:44 +00:00
Deepanshu Gupta
e535ff2872 am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '488f624798837cf4fa441dce8675da7e8cb67788':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:05:41 +00:00
Deepanshu Gupta
8b78a1d7e3 am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit '9f00e655db5b2b7c3527c20b60dc816eee6eff1d':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:05:39 +00:00
Deepanshu Gupta
f8c568586d resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 2014-05-13 11:04:29 -07:00
Deepanshu Gupta
060836bdf7 am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit 'fed25eb8b316d968154c204271ac0d239afd805e':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 18:03:44 +00:00
Deepanshu Gupta
9e614b25db am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '204316c5ac8b605a2389d898dfdf5d6a897b6f4d':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:03:41 +00:00
Deepanshu Gupta
be2184e425 am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'cfc9e4ed5df8c1bc9280d48b855fc48c54927064':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:03:38 +00:00
Deepanshu Gupta
81ff5ba73f am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '72e3fc1d37d38fcc09134be786e0f64a174a6ece':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:03:36 +00:00
Deepanshu Gupta
3c9fceaeb4 am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '627cab1257bbd80e74ad5db1963aeedbe056b462':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:02:38 +00:00
Deepanshu Gupta
07009057fe am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'effef17297dffc05511597ccc0f437deb278647f':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:02:35 +00:00
Deepanshu Gupta
85c5cdcd58 am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'c3a0c9f679cf18a512ca194e14a74dde852af831':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:02:32 +00:00
Deepanshu Gupta
488f624798 am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '835cbaa192f324ec14361afc700cc44a6bfa47b7':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:02:29 +00:00
Deepanshu Gupta
fed25eb8b3 am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit 'c233bb65bc10c20fa74fac55461a35c290cfb5f9':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 17:57:58 +00:00
Deepanshu Gupta
204316c5ac am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '8cf3343dc3e174f2459c21a1f75cf869c36f02c2':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 17:57:56 +00:00
Deepanshu Gupta
cfc9e4ed5d am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'd62dcc2958b75ec855f93f2b116ce47b1c5d8ecf':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 17:57:52 +00:00
Deepanshu Gupta
72e3fc1d37 am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '6f58831c64d01df7e0a80bcb47b54ea7a53a2e14':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 17:57:41 +00:00
Deepanshu Gupta
74503f66e0 am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 17:56:55 +00:00
Deepanshu Gupta
9f00e655db resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
Change-Id: I6d3a92e8d3853069c1d8cb3399d6dfcb5b58da83
 2014-05-13 10:55:56 -07:00
Deepanshu Gupta
c233bb65bc am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '8a4f39351f5784c81501462fc84d6fe199bdedca':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 17:54:29 +00:00