Deepanshu Gupta
|
48931fcc0d
|
am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit 'a312214f736638486983874b4f266bb537bab723':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
|
2014-05-13 20:49:25 +00:00 |
|
Deepanshu Gupta
|
34aa1bd392
|
am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev
* commit '54b946fe3c0f86f4cba3bc5bc07d920b654a0ef0':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
|
2014-05-13 20:49:22 +00:00 |
|
Deepanshu Gupta
|
e5c518cbd0
|
am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev
* commit '4e8b055b2ad23f6e336872f775058bcf18c46dfd':
Add view cookies for action bar menus. [DO NOT MERGE]
|
2014-05-13 20:49:06 +00:00 |
|
Deepanshu Gupta
|
aab60856f9
|
am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit 'ebd909cca1f69028878f15e6fb0ece6e8c8da584':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
|
2014-05-13 20:48:06 +00:00 |
|
Deepanshu Gupta
|
e0105901ea
|
am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
* commit '52b49665f526c7b4de977f3c424dc85d1b9a5d1f':
Action bar rendering in layoutlib [DO NOT MERGE]
|
2014-05-13 20:46:41 +00:00 |
|
Deepanshu Gupta
|
4e8b055b2a
|
am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev
* commit '6dad59e146dc16a2386124a5cd3b28411c024c4f':
Add view cookies for action bar menus. [DO NOT MERGE]
|
2014-05-13 20:43:51 +00:00 |
|
Deepanshu Gupta
|
a312214f73
|
am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '9358cf04dc0db493a8702a4a8051f9839e9de6d7':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
|
2014-05-13 20:43:18 +00:00 |
|
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
|
52b49665f5
|
am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
* commit 'eff94bc3647c23c223abe4946595d51d80985eec':
Action bar rendering in layoutlib [DO NOT MERGE]
|
2014-05-13 20:41:24 +00:00 |
|
Deepanshu Gupta
|
ec1b4df6d2
|
resolved conflicts for merge of b161d6ba to jb-mr1.1-dev
|
2014-05-13 13:40:14 -07:00 |
|
Deepanshu Gupta
|
9358cf04dc
|
am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit 'ccf6b34799efb14e5883ed4901ff03bf75ac4c1c':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
|
2014-05-13 20:38:17 +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
|
6dad59e146
|
am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev
* commit '85b751949b3d383494523bb98b016157d76787f3':
Add view cookies for action bar menus. [DO NOT MERGE]
|
2014-05-13 20:38:12 +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
|
ccf6b34799
|
am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit 'a154687620a6d53f17c7abc36d419884cd6df2b7':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
|
2014-05-13 20:33:33 +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
|
85b751949b
|
resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev
|
2014-05-13 13:32:59 -07:00 |
|
Aaron Whyte
|
5ff35f8a7f
|
Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
|
2014-05-13 20:32:21 +00:00 |
|
Deepanshu Gupta
|
a154687620
|
am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '7ef276450f3157cc68f714b0d5805319e6f4c555':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
|
2014-05-13 20:31:33 +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
|
e95500878c
|
am 874040d1: am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '874040d10d5ad3b7235f24779c6e9cc142326df0':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 19:17:15 +00:00 |
|
Deepanshu Gupta
|
c4ce076118
|
am b59cac72: am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit 'b59cac7255e04a97ea230484ee6602836ebd669b':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
|
2014-05-13 19:17:12 +00:00 |
|
Deepanshu Gupta
|
874040d10d
|
am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '84f5aceabd57f349b0e43c0cf45bc2ff76873ee1':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 19:12:52 +00:00 |
|
Deepanshu Gupta
|
b59cac7255
|
am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit '382a0c70bf4f972034ee95059b8e29758ce08607':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
|
2014-05-13 19:12:48 +00:00 |
|
Deepanshu Gupta
|
84f5aceabd
|
am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '0b878070ed6f20580508a921ab0babff9826931b':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 19:07:35 +00:00 |
|
Deepanshu Gupta
|
382a0c70bf
|
am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit '3d9c18f27059f1b242690dec400c90c78db1e527':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
|
2014-05-13 19:07:32 +00:00 |
|
Deepanshu Gupta
|
0b878070ed
|
am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '61b1fd5cd9238db5f5970c30cc46dc5087b229cb':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 19:02:20 +00:00 |
|
Deepanshu Gupta
|
3d9c18f270
|
am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit '9bdf54d3d7421c052013eb2200afbd18e3c9b48a':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
|
2014-05-13 19:02:17 +00:00 |
|
Deepanshu Gupta
|
61b1fd5cd9
|
am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit 'e14b24f3a0c39c2e3755b55cca2600e12620ee32':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 18:57:04 +00:00 |
|
Deepanshu Gupta
|
9bdf54d3d7
|
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]
|
2014-05-13 18:57:01 +00:00 |
|
Deepanshu Gupta
|
f316c286cb
|
am 9a5d6556: am c174bdcd: am 76cc9bcc: (-s ours) am 6d091cdb: 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 '9a5d655696c65dbe05b1309713330b73e8cadb1c':
Layoutlib tests now check methods return value [DO NOT MERGE]
|
2014-05-13 18:53:04 +00:00 |
|
Deepanshu Gupta
|
73dda53fff
|
am 9141c288: am 90c30544: am d23b318c: (-s ours) am 5806ec71: 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 '9141c2880cbeeb93c4e99e2b699a47796da4407f':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
|
2014-05-13 18:53:01 +00:00 |
|
Deepanshu Gupta
|
0dff67ba2b
|
am 1d7c7eaf: am 2ffe14b8: am 7bbd0358: (-s ours) am b110aa8c: 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 '1d7c7eaf844216d25113e07c2d15c0a563fdefdf':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
|
2014-05-13 18:52:58 +00:00 |
|
Deepanshu Gupta
|
8446919f61
|
am ef77c00d: am 9c30d2e8: am ceb9b606: (-s ours) am 4024fe96: 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 'ef77c00d6a7010c3e511e88cf1bb8387394fbdbd':
Fix a bug in Nine Patch library. [DO NOT MERGE]
|
2014-05-13 18:52:55 +00:00 |
|
Deepanshu Gupta
|
81f4b8e19e
|
am b806bde9: am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
* commit 'b806bde9fa0225ed38fc0f999cfaaa53b436f5e0':
Optimize layout rendering in layoutlib [DO NOT MERGE]
|
2014-05-13 18:52:52 +00:00 |
|
Deepanshu Gupta
|
e14b24f3a0
|
am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '06ca4c6a4657c20ecb32bcfacabdc95c7063c99a':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 18:51:50 +00:00 |
|
Deepanshu Gupta
|
41b3ef3ae2
|
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]
|
2014-05-13 18:51:47 +00:00 |
|
Deepanshu Gupta
|
dc11e8820b
|
am 561fc1b6: am 99b33914: am 3f615bf2: (-s ours) am e0d3e66d: 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 '561fc1b69de0e9f82c1ab2dcbf5ec031476cd27c':
Add methods for Time_Delegate [DO NOT MERGE]
|
2014-05-13 18:47:46 +00:00 |
|
Deepanshu Gupta
|
c7832db554
|
am 1f21b31e: am 0c2aeb4a: am 8816bdfa: (-s ours) am 39daf02e: 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 '1f21b31ed51e58c996d428434885e7ca3e1e9367':
Fix NPE in layoutlib. [DO NOT MERGE]
|
2014-05-13 18:47:42 +00:00 |
|
Deepanshu Gupta
|
3dbb1123f1
|
am a42d321c: am 56d3c9d1: am 851aece2: (-s ours) am a63a1f9b: 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 'a42d321c6ac7eef80d24e3b178306418926ce659':
Fix text size in Fake Action Bar. [DO NOT MERGE]
|
2014-05-13 18:47:39 +00:00 |
|
Deepanshu Gupta
|
443019c36a
|
am df7b20bd: am 0ac96e70: am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
* commit 'df7b20bd0c5b64d945f999fc9eb48b8cd4262127':
Remove references to non-std Java classes. [DO NOT MERGE]
|
2014-05-13 18:47:35 +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
|
9a5d655696
|
am c174bdcd: am 76cc9bcc: (-s ours) am 6d091cdb: 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 'c174bdcdf125822d42f6c7ec58be0ff400dccb59':
Layoutlib tests now check methods return value [DO NOT MERGE]
|
2014-05-13 18:46:53 +00:00 |
|
Deepanshu Gupta
|
9141c2880c
|
am 90c30544: am d23b318c: (-s ours) am 5806ec71: 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 '90c30544963684426850feacfaa3e9348fd57896':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
|
2014-05-13 18:46:50 +00:00 |
|
Deepanshu Gupta
|
1d7c7eaf84
|
am 2ffe14b8: am 7bbd0358: (-s ours) am b110aa8c: 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 '2ffe14b8488d9ad29cad27c620d7c1f4a8954516':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
|
2014-05-13 18:46:48 +00:00 |
|
Deepanshu Gupta
|
ef77c00d6a
|
am 9c30d2e8: am ceb9b606: (-s ours) am 4024fe96: 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 '9c30d2e8c8e57f8907f15ca9ca15e53eaed8c284':
Fix a bug in Nine Patch library. [DO NOT MERGE]
|
2014-05-13 18:46:45 +00:00 |
|
Deepanshu Gupta
|
b806bde9fa
|
am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
* commit '7475771a5bad01cadbdaa7ba0a0833c2262f2933':
Optimize layout rendering in layoutlib [DO NOT MERGE]
|
2014-05-13 18:46:42 +00:00 |
|