OSDN Git Service
Deepanshu Gupta [Tue, 13 May 2014 18:57:01 +0000 (18:57 +0000)]
am
41b3ef3a: am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
41b3ef3ae266ea766ef38947e2d5f01c55006735':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:51:47 +0000 (18:51 +0000)]
am
29171d5a: am
eb036026: am
14788ef3: am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
29171d5a9ae0f406128cf6c8cdf6ceeed0a0be49':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:47:27 +0000 (18:47 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:41:57 +0000 (18:41 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:36:12 +0000 (18:36 +0000)]
am
f8c56858: resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
* commit '
f8c568586d1affdfe61ec9f510e7b259d585e56b':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:26:16 +0000 (18:26 +0000)]
am
2d84de2f: am
0d76fd64: (-s ours) 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 '
2d84de2fe7e38a626571c0464a70eacc52c4ac55':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:26:13 +0000 (18:26 +0000)]
am
f29a0516: am
0c11327b: (-s ours) 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 '
f29a05164708a3f37bad94c79bea81aa4c840afc':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:26:11 +0000 (18:26 +0000)]
am
41764152: am
8a505e5c: (-s ours) 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 '
417641521487ad408c6cb32a2913ba3806fb49f7':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:26:08 +0000 (18:26 +0000)]
am
28c76e3e: am
5db08e87: (-s ours) 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 '
28c76e3e84c64bc68bb110a3924db826a78ae6e4':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:26:05 +0000 (18:26 +0000)]
am
471061ce: am
e74d437a: am
c5c49dcd: am
8b78a1d7: am
9f00e655: resolved conflicts for merge of
ce9e87f7 to jb-mr1.1-dev
* commit '
471061ce3dc4133549263bde3bd5e661b69f17fc':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:21:13 +0000 (18:21 +0000)]
am
0d76fd64: (-s ours) 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 '
0d76fd64a1a4b0fa569d7b2a3ba4232415d75634':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:21:10 +0000 (18:21 +0000)]
am
0c11327b: (-s ours) 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 '
0c11327b3c2053cfbc0ee267708df9affa4dbb41':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:21:07 +0000 (18:21 +0000)]
am
8a505e5c: (-s ours) 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 '
8a505e5c6f8b677addca3bb27602416df95b66da':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:21:04 +0000 (18:21 +0000)]
am
5db08e87: (-s ours) 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 '
5db08e87a1f3e2f7b2bac9dc55c81e84133923c1':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:21:01 +0000 (18:21 +0000)]
am
e74d437a: am
c5c49dcd: am
8b78a1d7: am
9f00e655: resolved conflicts for merge of
ce9e87f7 to jb-mr1.1-dev
* commit '
e74d437a172e69e0d758b2df055fea55a14009e4':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:12 +0000 (18:19 +0000)]
am
2f8da100: am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
2f8da100eff9245c37042c962af39d21d27c06b1':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:09 +0000 (18:19 +0000)]
am
1eadb79e: am
fd8af673: (-s ours) am
9e614b25: am
204316c5: am
8cf3343d: am
838e5482: am
94d33cfc: am
82d5bd98: am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
1eadb79e470cd86a1a32f9cdda997b054aa1efe0':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:07 +0000 (18:19 +0000)]
am
910c7153: am
be0c94ea: (-s ours) 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 '
910c7153fc5f225eb98209a4fd2d03f183833651':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:05 +0000 (18:19 +0000)]
am
48e3d0fa: am
dbfd29d8: am
81ff5ba7: am
72e3fc1d: am
6f58831c: resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
* commit '
48e3d0fac84657f14991cbb14b23fb229a4f6362':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:16:12 +0000 (18:16 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:16:09 +0000 (18:16 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:16:06 +0000 (18:16 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:16:03 +0000 (18:16 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:16:00 +0000 (18:16 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:14:14 +0000 (18:14 +0000)]
am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
81ac665ca522fcfd9135b4c6fde6e3c25791bdc3':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:14:11 +0000 (18:14 +0000)]
am
fd8af673: (-s ours) am
9e614b25: am
204316c5: am
8cf3343d: am
838e5482: am
94d33cfc: am
82d5bd98: am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
fd8af673020786080a9aeddf39383233f5f0d8f0':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:14:09 +0000 (18:14 +0000)]
am
be0c94ea: (-s ours) 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 '
be0c94ea6b6867948a074476cf39a1c4b04c55ff':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:14:06 +0000 (18:14 +0000)]
am
dbfd29d8: am
81ff5ba7: am
72e3fc1d: am
6f58831c: resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
* commit '
dbfd29d85503b4a9e4a75ae74186623705749bac':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:11:28 +0000 (18:11 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:11:25 +0000 (18:11 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:11:23 +0000 (18:11 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:11:20 +0000 (18:11 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:11:17 +0000 (18:11 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:09:09 +0000 (18:09 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:09:06 +0000 (18:09 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:09:02 +0000 (18:09 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:08:59 +0000 (18:08 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:05:51 +0000 (18:05 +0000)]
am
a1191b46: am
74503f66: am
0c98ce5a: am
f75f33d3: am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
a1191b467d9687cd34e0cec2d4ac827f6020c160':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:05:48 +0000 (18:05 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:05:46 +0000 (18:05 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:05:44 +0000 (18:05 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:05:41 +0000 (18:05 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:05:39 +0000 (18:05 +0000)]
am
9f00e655: resolved conflicts for merge of
ce9e87f7 to jb-mr1.1-dev
* commit '
9f00e655db5b2b7c3527c20b60dc816eee6eff1d':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:04:29 +0000 (11:04 -0700)]
resolved conflicts for merge of
727ad350 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 18:03:44 +0000 (18:03 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:03:41 +0000 (18:03 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:03:38 +0000 (18:03 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:03:36 +0000 (18:03 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:02:38 +0000 (18:02 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:02:35 +0000 (18:02 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:02:32 +0000 (18:02 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:02:29 +0000 (18:02 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:01:00 +0000 (18:01 +0000)]
am
74503f66: am
0c98ce5a: am
f75f33d3: am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
74503f66e0cb5a4ea617c4a66882e8c33e5cc888':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:57:58 +0000 (17:57 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:57:56 +0000 (17:57 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:57:52 +0000 (17:57 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:57:41 +0000 (17:57 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:56:55 +0000 (17:56 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:55:56 +0000 (10:55 -0700)]
resolved conflicts for merge of
ce9e87f7 to jb-mr1.1-dev
Change-Id: I6d3a92e8d3853069c1d8cb3399d6dfcb5b58da83
Deepanshu Gupta [Tue, 13 May 2014 17:54:29 +0000 (17:54 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:54:26 +0000 (17:54 +0000)]
am
838e5482: am
94d33cfc: am
82d5bd98: am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
838e54826bbb03cec41684340c63be993d2dc160':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:54:23 +0000 (17:54 +0000)]
am
df8a15b3: am
d4e6727d: am
d5de1bd6: am
30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
df8a15b31ec4c72042f80a90365867939bddffd1':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:51:28 +0000 (10:51 -0700)]
resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:49:56 +0000 (17:49 +0000)]
am
f75f33d3: am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
f75f33d33be9704a09de3de967c24ecb376ca4fb':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:44:40 +0000 (17:44 +0000)]
am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
dd8ebf1e15ffa78785307698551357fe80ea3775':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:35:04 +0000 (17:35 +0000)]
am
ebcbb283: am
0b2f4a18: (-s ours) am
20bec39e: am
f1517cc9: am
69bae787: am
2c167d0f: am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
ebcbb28319bea2674455c978cc8fb85b252863b3':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:35:00 +0000 (17:35 +0000)]
am
9ddb073b: am
c70ce72a: am
af9fde96: am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
9ddb073bf72d9ca587ecc626dcc9721dd33447c9':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:29:22 +0000 (17:29 +0000)]
am
0b2f4a18: (-s ours) am
20bec39e: am
f1517cc9: am
69bae787: am
2c167d0f: am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
0b2f4a18cc1c38d04d2efc7b47762a312d99c987':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:29:13 +0000 (17:29 +0000)]
am
c70ce72a: am
af9fde96: am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
c70ce72a986f029c9f8c43b4060001624176068d':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:24:13 +0000 (17:24 +0000)]
am
20bec39e: am
f1517cc9: am
69bae787: am
2c167d0f: am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
20bec39e3f72d198f06b6b0d4a7ac40f52dc2c0e':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:24:10 +0000 (17:24 +0000)]
am
af9fde96: am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
af9fde9680922f072981a4853e37ccfcf974920a':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:23:22 +0000 (10:23 -0700)]
resolved conflicts for merge of
520f585b to jb-mr1.1-dev
Change-Id: I3982d8cd6585e6d4a3a9cf5b1d78f01f0e4ced6b
Deepanshu Gupta [Tue, 13 May 2014 17:18:58 +0000 (17:18 +0000)]
am
f1517cc9: am
69bae787: am
2c167d0f: am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
f1517cc999cbbac99f7299d06ea4ffc4329b0b9f':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:18:55 +0000 (17:18 +0000)]
am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
425addb94428d6f17658256a4acd4b62189c8844':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:14:10 +0000 (17:14 +0000)]
am
69bae787: am
2c167d0f: am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
69bae78787a01b2fe4f2ba8e3c388c31f0989cb4':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:14:07 +0000 (17:14 +0000)]
am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:12:27 +0000 (17:12 +0000)]
am
2c167d0f: am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
2c167d0f6a370f9272ef24746222772586c1758c':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:51:51 +0000 (16:51 +0000)]
am
5974d229: am
0cbfde12: am
40b54563: am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
5974d229f9af39df149c8b0c4081826f9a65ce8c':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:49:18 +0000 (09:49 -0700)]
resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b
Deepanshu Gupta [Tue, 13 May 2014 16:46:48 +0000 (16:46 +0000)]
am
0cbfde12: am
40b54563: am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
0cbfde12fde85713f87d8c5ac0cc137c143dfd27':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:41:50 +0000 (16:41 +0000)]
am
40b54563: am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
40b54563743c3bab92ee7086f8a2b159ecef5453':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:53 +0000 (16:36 +0000)]
am
5594616c: am
9602fc1c: am
87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
5594616c4f4513dc97b08d6cabb6fd7127dde131':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:50 +0000 (16:36 +0000)]
am
45693e50: am
c9a4badb: am
d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
45693e50ecdae9b456e4974dd91758f9e25df2b4':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:48 +0000 (16:36 +0000)]
am
e3b43270: am
bdd8fbf6: am
877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '
e3b43270e87fd85a6281c91f2897233aac6b6397':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:45 +0000 (16:36 +0000)]
am
45ca5ba7: am
01cdd312: am
669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
45ca5ba7dc3b70dd39991217894eed114eefb1b8':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:42 +0000 (16:36 +0000)]
am
9f965258: am
d094742d: am
cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '
9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:39 +0000 (16:36 +0000)]
am
8c5c2410: am
7bb8de58: am
a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '
8c5c2410ae9df60d9462784370965a0417e06fa4':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:38 +0000 (16:36 +0000)]
am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
07f8da65e231142e6915d9aa7853dd4d772112a0':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:36 +0000 (16:36 +0000)]
am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:33 +0000 (16:36 +0000)]
am
94d33cfc: am
82d5bd98: am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
94d33cfce1f32af4480f941fdd6c9942bb203d2c':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:30 +0000 (16:36 +0000)]
am
d4e6727d: am
d5de1bd6: am
30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
d4e6727d02f7507fdfd6cbbabd03d6e922127e4b':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:28 +0000 (16:36 +0000)]
am
ed98abec: am
8a70bcef: resolved conflicts for merge
5a7b3b65 to jb-dev-plus-aosp
* commit '
ed98abecad359ab1765ac1f698c8ba06dbd00745':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:25 +0000 (16:36 +0000)]
am
2cbe100a: am
40fea8b1: am
4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '
2cbe100a9bc6d2b3bf828432a1527f0ac239e575':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:36:22 +0000 (16:36 +0000)]
am
632c9e2d: am
065ce2e8: am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
632c9e2dabc44b24f04c3418e4a3540b22db792b':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:59 +0000 (16:31 +0000)]
am
9602fc1c: am
87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
9602fc1c00e5e5cdf26cdc3fe22022ffcd115361':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:53 +0000 (16:31 +0000)]
am
c9a4badb: am
d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
c9a4badb54320f8c52d2da06a762b5e6eef00ee0':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:50 +0000 (16:31 +0000)]
am
bdd8fbf6: am
877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '
bdd8fbf6eae886dc3b2cd716745ede918773a2c4':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:47 +0000 (16:31 +0000)]
am
01cdd312: am
669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
01cdd3123f408dc41a2bd4786f3a943157ab6c69':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:44 +0000 (16:31 +0000)]
am
d094742d: am
cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '
d094742d2e19371291409886bb80f070df099533':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:31:41 +0000 (16:31 +0000)]
am
7bb8de58: am
a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '
7bb8de580a451621480913d7839fd7eb784ab689':
Optimize layout rendering in layoutlib [DO NOT MERGE]