Deepanshu Gupta
|
9c00e6739c
|
am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
Fix CalendarView to show the right labels. [DO NOT MERGE]
|
2014-05-13 16:31:05 +00:00 |
|
Deepanshu Gupta
|
07f8da65e2
|
am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '888461c801b531f31b2ef34617d333d781d93010':
Fix layoutlib [DO NOT MERGE]
|
2014-05-13 16:31:02 +00:00 |
|
Baligh Uddin
|
a8e18c8152
|
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
|
2014-05-13 15:41:05 +00:00 |
|
Scott Main
|
1f367d988d
|
update wear reference docs to support sticky nav.
DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Change-Id: I829cd96ae0f36a31155adf8e80b6d965e9531c42
|
2014-05-13 04:31:44 -07:00 |
|
Aaron Whyte
|
1fb617fecd
|
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859
Change-Id: I342eea5afafd56bed9b4138b97c2e906a10d300d
|
2014-05-12 22:08:53 -07:00 |
|
Deepanshu Gupta
|
d6a8e083c2
|
am 11c87237: am 663a1c74: am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '11c87237ecb681353eec756fff9504ac235dbe25':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
|
2014-05-13 02:51:18 +00:00 |
|
Deepanshu Gupta
|
301d5aa72f
|
am 451e91c5: am 83d33e06: am ffb18143: (-s ours) am 0d90b43b: am cb240066: am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '451e91c5d31daf1157188f913a0485179107c548':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
|
2014-05-13 02:51:15 +00:00 |
|
Deepanshu Gupta
|
11c87237ec
|
am 663a1c74: am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '663a1c7484b7df5134712149d59a9863980c4470':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
|
2014-05-13 02:45:29 +00:00 |
|
Deepanshu Gupta
|
451e91c5d3
|
am 83d33e06: am ffb18143: (-s ours) am 0d90b43b: am cb240066: am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '83d33e0603ef45c23edc06feac7ea8d8ef92b431':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
|
2014-05-13 02:45:26 +00:00 |
|
Deepanshu Gupta
|
663a1c7484
|
am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '9e0593fbb57339143779f760fff6314bdf9c839b':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
|
2014-05-13 02:41:18 +00:00 |
|
Deepanshu Gupta
|
83d33e0603
|
am ffb18143: (-s ours) am 0d90b43b: am cb240066: am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit 'ffb181431cdfe389911cf02de76badde05e46112':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
|
2014-05-13 02:41:14 +00:00 |
|
Deepanshu Gupta
|
9e0593fbb5
|
am 513bf25d: am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '513bf25d7a794b850f5d791269db55b7744ee618':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
|
2014-05-13 02:37:20 +00:00 |
|
Deepanshu Gupta
|
ffb181431c
|
am 0d90b43b: am cb240066: am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '0d90b43b58bca53a096d646ed555c4ecb40d40d2':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
|
2014-05-13 02:37:17 +00:00 |
|
Deepanshu Gupta
|
1677a9bdeb
|
Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp
|
2014-05-13 02:32:31 +00:00 |
|
Deepanshu Gupta
|
513bf25d7a
|
am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '5b42e1ae5576f95d9d561a15674e392657f64120':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
|
2014-05-13 02:31:40 +00:00 |
|
Deepanshu Gupta
|
0d90b43b58
|
am cb240066: am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit 'cb2400661a6019cfc6f2fef75d92767f6d7547b6':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
|
2014-05-13 02:31:38 +00:00 |
|
Deepanshu Gupta
|
51cce0ec42
|
resolve conflicts for merge 5a7b3b65 correctly
Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
|
2014-05-12 19:31:25 -07:00 |
|
Deepanshu Gupta
|
3067297209
|
am aaa0c54a: am 83b43dc0: am a8499a16: (-s ours) am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit 'aaa0c54a6255d87bc713b565e916be65ef010908':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
|
2014-05-13 02:30:29 +00:00 |
|
Deepanshu Gupta
|
61012649b6
|
am 7b935e25: am 59889153: am 7aaa59f0: (-s ours) am 74ae54e7: am 1d46a343: am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '7b935e257262ec0c5c0e8d7eb6fb5792ab478003':
Support actionProviderClass attribute for menus [DO NOT MERGE]
|
2014-05-13 02:30:25 +00:00 |
|
Deepanshu Gupta
|
75f6acb769
|
am cd21f81a: am b0d4ca69: am d5260dcc: (-s ours) am d1f26941: am e69715b4: am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit 'cd21f81aad22abb3704ae6276c08602b153cd189':
Fix class name for OverflowMenuButton [DO NOT MERGE]
|
2014-05-13 02:30:22 +00:00 |
|
Deepanshu Gupta
|
cbc0516c47
|
am 439222e5: am cabb028c: am cbf9d672: (-s ours) am 467305a4: am 70875517: am 0fef2d24: (-s ours) am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '439222e534ce7b844f51ccadc430da151cbc32bc':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
|
2014-05-13 02:30:19 +00:00 |
|
Deepanshu Gupta
|
7498a457d6
|
am 54c8733d: am fe887a2a: am 51b8ae6d: (-s ours) am de46e750: am d7f71e40: am c7a27371: (-s ours) am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
* commit '54c8733dfe68d8c12c861cae4d9ca1b994d71446':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
|
2014-05-13 02:30:16 +00:00 |
|
Deepanshu Gupta
|
ec23400f2a
|
am 150a356d: am f2851dd2: am 40ef74dd: (-s ours) am 512fd4c2: am 290b96f3: am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '150a356d8bcea5ad7d717a4e1867bb060772d6e9':
Add view cookies for action bar menus. [DO NOT MERGE]
|
2014-05-13 02:30:13 +00:00 |
|
Deepanshu Gupta
|
c35fc0ab2f
|
am ca6ec546: am 26d3fc3d: am 4130946e: (-s ours) am 321a3fbd: am 3dc756a4: am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit 'ca6ec5467dc5aaea393400bc461dbe631bc4d012':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
|
2014-05-13 02:30:10 +00:00 |
|
Deepanshu Gupta
|
f01d5830a7
|
am 98557927: am 1149ee73: am 99615109: (-s ours) am 839506fa: am 4a6ae03d: am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '9855792731d80a074f368c260dadca9f8661f6a6':
Action bar rendering in layoutlib [DO NOT MERGE]
|
2014-05-13 02:30:07 +00:00 |
|
Deepanshu Gupta
|
5b585a1534
|
am 0505f4ed: am 5bb2ca8d: am 36f8cb3e: (-s ours) am c1172273: am 2f7d5d7c: am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
* commit '0505f4ed2bfe6d7ca20da7d0a72a1f5c6eb38171':
Add missing dependency in layoutlib build file [DO NOT MERGE]
|
2014-05-13 02:30:04 +00:00 |
|
Deepanshu Gupta
|
de3fdcf008
|
am 56a41fe9: am f6faba15: am 62d9390d: (-s ours) am c61e53e7: am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '56a41fe94e2259747644671991ca4c46cc22d374':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 02:30:01 +00:00 |
|
Deepanshu Gupta
|
5133259305
|
am a4579bcf: am 2b6aa287: am c8ab5109: (-s ours) am fd119e4b: am ef15cd61: am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
* commit 'a4579bcfe43c84e0a73430a480c52a64a2b2cf96':
Remove references to non-std Java classes. [DO NOT MERGE]
|
2014-05-13 02:29:58 +00:00 |
|
Deepanshu Gupta
|
07cd85013a
|
am 6b65a766: am b4bc08a2: am 089b0d25: (-s ours) am 6c5f7556: am 4d23ae43: am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '6b65a7664c48243d4e9ede61fcbdb397e3e92282':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
|
2014-05-13 02:29:55 +00:00 |
|
Deepanshu Gupta
|
b251c80ec2
|
am ebb9d963: am 3ea2131f: am 8ef9e2f5: (-s ours) am 14569ecf: am e20ebd5a: am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit 'ebb9d963627511d8ea2dc169809b0dd30434052b':
Layoutlib tests now check methods return value [DO NOT MERGE]
|
2014-05-13 02:29:53 +00:00 |
|
Deepanshu Gupta
|
5b42e1ae55
|
am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit 'b5b4d6eb790ec344680f92f75edd75c427058266':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
|
2014-05-13 02:27:24 +00:00 |
|
Deepanshu Gupta
|
cb2400661a
|
am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '977ede48a26e9c1a9f5f840448edadd89255b161':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
|
2014-05-13 02:27:21 +00:00 |
|
Deepanshu Gupta
|
aaa0c54a62
|
am 83b43dc0: am a8499a16: (-s ours) am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '83b43dc0c98abc416bff1e518206e9dda5244e28':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
|
2014-05-13 02:25:03 +00:00 |
|
Deepanshu Gupta
|
7b935e2572
|
am 59889153: am 7aaa59f0: (-s ours) am 74ae54e7: am 1d46a343: am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '59889153bae4f3f6a3270ef6eae69f1a937eeb4a':
Support actionProviderClass attribute for menus [DO NOT MERGE]
|
2014-05-13 02:25:00 +00:00 |
|
Deepanshu Gupta
|
cd21f81aad
|
am b0d4ca69: am d5260dcc: (-s ours) am d1f26941: am e69715b4: am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit 'b0d4ca69168cce0fec9eb4b442e3002eb07bbf3a':
Fix class name for OverflowMenuButton [DO NOT MERGE]
|
2014-05-13 02:24:58 +00:00 |
|
Deepanshu Gupta
|
439222e534
|
am cabb028c: am cbf9d672: (-s ours) am 467305a4: am 70875517: am 0fef2d24: (-s ours) am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit 'cabb028c3f02cbbcb871484b71bc8e1c13887214':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
|
2014-05-13 02:24:55 +00:00 |
|
Deepanshu Gupta
|
54c8733dfe
|
am fe887a2a: am 51b8ae6d: (-s ours) am de46e750: am d7f71e40: am c7a27371: (-s ours) am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
* commit 'fe887a2a4c36faf73f2a38bcffbcd282027cec9e':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
|
2014-05-13 02:24:53 +00:00 |
|
Deepanshu Gupta
|
150a356d8b
|
am f2851dd2: am 40ef74dd: (-s ours) am 512fd4c2: am 290b96f3: am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
* commit 'f2851dd2c77e767f185ea9f64cafbd8238c9fe79':
Add view cookies for action bar menus. [DO NOT MERGE]
|
2014-05-13 02:24:50 +00:00 |
|
Deepanshu Gupta
|
ca6ec5467d
|
am 26d3fc3d: am 4130946e: (-s ours) am 321a3fbd: am 3dc756a4: am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '26d3fc3d08621c5f289f1c67c33688e653d98b4b':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
|
2014-05-13 02:24:48 +00:00 |
|
Deepanshu Gupta
|
9855792731
|
am 1149ee73: am 99615109: (-s ours) am 839506fa: am 4a6ae03d: am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '1149ee73961e339f962df8670822ae19164d3b3c':
Action bar rendering in layoutlib [DO NOT MERGE]
|
2014-05-13 02:24:45 +00:00 |
|
Deepanshu Gupta
|
0505f4ed2b
|
am 5bb2ca8d: am 36f8cb3e: (-s ours) am c1172273: am 2f7d5d7c: am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
* commit '5bb2ca8d457a41315f817b011f5ff7d587e051a3':
Add missing dependency in layoutlib build file [DO NOT MERGE]
|
2014-05-13 02:24:42 +00:00 |
|
Deepanshu Gupta
|
56a41fe94e
|
am f6faba15: am 62d9390d: (-s ours) am c61e53e7: am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit 'f6faba1518fa36003d4a23a4ff421ecc817c5905':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
|
2014-05-13 02:24:40 +00:00 |
|
Deepanshu Gupta
|
a4579bcfe4
|
am 2b6aa287: am c8ab5109: (-s ours) am fd119e4b: am ef15cd61: am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
* commit '2b6aa287a62953b059caf33ea1d76e63b97f400b':
Remove references to non-std Java classes. [DO NOT MERGE]
|
2014-05-13 02:24:36 +00:00 |
|
Deepanshu Gupta
|
6b65a7664c
|
am b4bc08a2: am 089b0d25: (-s ours) am 6c5f7556: am 4d23ae43: am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit 'b4bc08a2d26a5404382a5fab654acb1b41794778':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
|
2014-05-13 02:24:34 +00:00 |
|
Deepanshu Gupta
|
ebb9d96362
|
am 3ea2131f: am 8ef9e2f5: (-s ours) am 14569ecf: am e20ebd5a: am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '3ea2131f5a7f2fa46723c02bad3606d7d5b735f7':
Layoutlib tests now check methods return value [DO NOT MERGE]
|
2014-05-13 02:24:32 +00:00 |
|
Aaron Whyte
|
6af2ef8e25
|
Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
|
2014-05-13 02:24:13 +00:00 |
|
Deepanshu Gupta
|
b5b4d6eb79
|
am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit 'a7c0d02ad6b161b5084abc8a2740f7e783d4ad1e':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
|
2014-05-13 02:21:57 +00:00 |
|
Deepanshu Gupta
|
977ede48a2
|
am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '51ce58a7bb2798c2aac1f5a1d76deaeab27e21da':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
|
2014-05-13 02:21:54 +00:00 |
|
Deepanshu Gupta
|
7377c7be6a
|
am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
* commit '3a115628236ee9051518d4f96840cbb76070cf92':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
|
2014-05-13 02:20:58 +00:00 |
|
Deepanshu Gupta
|
9359dc2e7d
|
am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '2d3fa7ba782238afb891db38e29ef7ec755bfdf6':
Support actionProviderClass attribute for menus [DO NOT MERGE]
|
2014-05-13 02:20:54 +00:00 |
|