Commit Graph

13546 Commits

Author SHA1 Message Date
The Android Automerger
6b508b017b merge in master-release history after reset to master 2014-03-25 05:49:33 -07:00
Tim Kilbourn
2a137224a6 am 939cafef: am 3baefeb5: Initial leanback sample code.
* commit '939cafeffa71d5db33d4882cadd39314f4ee1a64':
  Initial leanback sample code.
2014-03-24 22:36:50 +00:00
Andrew Hsieh
839fc5d698 am c7e064b8: am 16636e4b: Merge "Refresh 64-bit headers and libs"
* commit 'c7e064b86384797f08d36c6fdb118a24b22a39fe':
  Refresh 64-bit headers and libs
2014-03-24 21:25:32 +00:00
Tim Kilbourn
cdb09c943e am 56c1077d: am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev
* commit '56c1077d131cf807563eb7b8e8bc2263f8bb1748':
  Add the stub src dir to the leanback extras.
2014-03-24 19:35:16 +00:00
Tim Kilbourn
939cafeffa am 3baefeb5: Initial leanback sample code.
* commit '3baefeb50bbd72db2347d112fc6e3daeff94ffc0':
  Initial leanback sample code.
2014-03-24 17:17:22 +00:00
Andrew Hsieh
c7e064b863 am 16636e4b: Merge "Refresh 64-bit headers and libs"
* commit '16636e4bf101847c57b6bcb2d54635e7c41b6941':
  Refresh 64-bit headers and libs
2014-03-24 12:33:47 +00:00
Andrew Hsieh
16636e4bf1 Merge "Refresh 64-bit headers and libs" 2014-03-24 00:39:37 +00:00
The Android Automerger
7239f61398 merge in master-release history after reset to master 2014-03-22 05:49:38 -07:00
Andrew Hsieh
d8118ba51b Refresh 64-bit headers and libs
Change-Id: I300537b883705cedbcb6f21fe616f187b54c4afd
2014-03-22 17:45:39 +08:00
Tim Kilbourn
3baefeb50b Initial leanback sample code.
SupportLeanbackDemos starts out with a fully functional app with a
BrowseFragment. Still need to add examples with cursors, hovercards,
and more.

Change-Id: I845d5b92c29a5585af7968b08e7daa11b2996f5a
2014-03-21 15:13:12 -07:00
Tim Kilbourn
56c1077d13 am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev
* commit 'c9d6af6b8760c79f6527e40549592d85f780cab4':
  Add the stub src dir to the leanback extras.
2014-03-21 20:59:48 +00:00
Tim Kilbourn
c9d6af6b87 Merge "Add the stub src dir to the leanback extras." into klp-modular-dev 2014-03-21 20:53:49 +00:00
Guang Zhu
644b822218 blacklist KEYCODE_SLEEP in random key generation
Bug: 13583213
Change-Id: Ic0fa933440acb27a0636b2db83be08695e9df0db
2014-03-21 12:16:05 -07:00
Adam Koch
afe9bac93a am 4d5a7ace: am 87bd56ff: am 3a09d75f: am bdd20c5c: Merge "Remove bitmapfun code sample (it has moved to samples framework)." into klp-docs
* commit '4d5a7ace8e214c14001128cbeaf410a97da729a0':
  Remove bitmapfun code sample (it has moved to samples framework).
2014-03-20 21:05:20 +00:00
Adam Koch
4d5a7ace8e am 87bd56ff: am 3a09d75f: am bdd20c5c: Merge "Remove bitmapfun code sample (it has moved to samples framework)." into klp-docs
* commit '87bd56ff96c226d0f53911205657f07cd2bb19c0':
  Remove bitmapfun code sample (it has moved to samples framework).
2014-03-20 17:05:17 +00:00
Adam Koch
87bd56ff96 am 3a09d75f: am bdd20c5c: Merge "Remove bitmapfun code sample (it has moved to samples framework)." into klp-docs
* commit '3a09d75f5bb284ce9367816d557b5e25d1c5fea2':
  Remove bitmapfun code sample (it has moved to samples framework).
2014-03-20 16:59:16 +00:00
Adam Koch
3a09d75f5b am bdd20c5c: Merge "Remove bitmapfun code sample (it has moved to samples framework)." into klp-docs
* commit 'bdd20c5c1a78941e0e94123c78152123f0be946a':
  Remove bitmapfun code sample (it has moved to samples framework).
2014-03-20 09:31:03 +00:00
Adam Koch
bdd20c5c1a Merge "Remove bitmapfun code sample (it has moved to samples framework)." into klp-docs 2014-03-20 07:22:29 +00:00
Tim Kilbourn
61c46959b5 Add the stub src dir to the leanback extras.
Change-Id: I614bcdd9f9061917fb2c4721cbe1752fd56f6c12
2014-03-18 13:36:11 -07:00
The Android Automerger
2ad4b26f07 merge in master-release history after reset to master 2014-03-15 05:49:45 -07:00
Joe Fernandez
753584340a am 225c000d: am 8a28dc4f: am b67283c0: am b378f58a: Merge "Adding production app.yaml to source control" into klp-docs
* commit '225c000db2b54d935a401cd52d88d7f0fa4f45b1':
  Adding production app.yaml to source control
2014-03-14 17:54:26 +00:00
Ricardo Cervera
f0ea1b0ed7 am 5a863c55: am 1aec60d4: am f203e028: am c861a265: Merge "docs: Modified sample descriptions for March sample push." into klp-docs
* commit '5a863c55b5034b879236aa605f5c2af64fc26b3d':
  docs: Modified sample descriptions for March sample push.
2014-03-14 17:54:25 +00:00
Alexander Lucas
ab05cdfb72 am dd7dda23: am 964fa100: am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit 'dd7dda23a56844b706bd20c752b0696571fc582d':
  Added new samples to sdk.atree for march push
2014-03-14 17:54:24 +00:00
Lorenzo Colitti
1d069f3a8a am aafbb735: am 8680138d: Merge "Add clatd test definitions to the testrunner."
* commit 'aafbb7355032babcff3554d9e872c9f2a6341d04':
  Add clatd test definitions to the testrunner.
2014-03-14 17:13:14 +00:00
Lorenzo Colitti
39e788847a am ccc445f6: am 20615c2b: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml"
* commit 'ccc445f6593e8267496e4a673a1a93c647b63d53':
  Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml
2014-03-14 17:13:12 +00:00
Joe Fernandez
225c000db2 am 8a28dc4f: am b67283c0: am b378f58a: Merge "Adding production app.yaml to source control" into klp-docs
* commit '8a28dc4fbe60b2344aac52863c035433f182fda5':
  Adding production app.yaml to source control
2014-03-14 16:32:59 +00:00
Ricardo Cervera
5a863c55b5 am 1aec60d4: am f203e028: am c861a265: Merge "docs: Modified sample descriptions for March sample push." into klp-docs
* commit '1aec60d4a61ec81844180560eb25098a5c19eb95':
  docs: Modified sample descriptions for March sample push.
2014-03-14 16:32:58 +00:00
Alexander Lucas
dd7dda23a5 am 964fa100: am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '964fa100beb6108f7cfc5c8a1eaa7be55bbab0c9':
  Added new samples to sdk.atree for march push
2014-03-14 16:32:56 +00:00
Joe Fernandez
8a28dc4fbe am b67283c0: am b378f58a: Merge "Adding production app.yaml to source control" into klp-docs
* commit 'b67283c07d9e7ced4f5d7e734c4de21d4a5c6520':
  Adding production app.yaml to source control
2014-03-14 16:28:34 +00:00
Ricardo Cervera
1aec60d4a6 am f203e028: am c861a265: Merge "docs: Modified sample descriptions for March sample push." into klp-docs
* commit 'f203e0289eb1e418a5ce2049893306bcd13d30a7':
  docs: Modified sample descriptions for March sample push.
2014-03-14 16:28:33 +00:00
Alexander Lucas
964fa100be am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
  Added new samples to sdk.atree for march push
2014-03-14 16:28:32 +00:00
Adam Powell
ff6ec86d06 am a506acdd: am e3ac380a: Merge "Update RecyclerView sample to show use of ItemDecoration" into klp-modular-dev
* commit 'a506acddc30c6ec56fc7f916d819f71374a9d4ae':
  Update RecyclerView sample to show use of ItemDecoration
2014-03-14 10:02:54 +00:00
Lorenzo Colitti
aafbb73550 am 8680138d: Merge "Add clatd test definitions to the testrunner."
* commit '8680138dd64c81cf25e05a4ae4f8195368cb9e55':
  Add clatd test definitions to the testrunner.
2014-03-14 00:44:46 +00:00
Lorenzo Colitti
ccc445f659 am 20615c2b: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml"
* commit '20615c2bcec61d743d5899c0e723c1762f4a3190':
  Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml
2014-03-14 00:44:39 +00:00
Lorenzo Colitti
8680138dd6 Merge "Add clatd test definitions to the testrunner." 2014-03-14 00:38:14 +00:00
Lorenzo Colitti
20615c2bce Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml" 2014-03-14 00:38:05 +00:00
Joe Fernandez
b67283c07d am b378f58a: Merge "Adding production app.yaml to source control" into klp-docs
* commit 'b378f58a1d5b3c0047da52631156588758f29c95':
  Adding production app.yaml to source control
2014-03-13 22:15:12 +00:00
Ricardo Cervera
f203e0289e am c861a265: Merge "docs: Modified sample descriptions for March sample push." into klp-docs
* commit 'c861a2650bce3a0ff02f1efcb5c6b38e741c1878':
  docs: Modified sample descriptions for March sample push.
2014-03-13 22:15:03 +00:00
Alexander Lucas
7ae2eca4a0 am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '7a80e034839e02c295cb75c59c6af75e17dad238':
  Added new samples to sdk.atree for march push
2014-03-13 22:15:02 +00:00
Joe Fernandez
b378f58a1d Merge "Adding production app.yaml to source control" into klp-docs 2014-03-13 21:10:01 +00:00
George Mount
ee6eedec15 Merge "Undo inadvertent change to Transitions API demo." 2014-03-13 19:34:10 +00:00
Adam Powell
a506acddc3 am e3ac380a: Merge "Update RecyclerView sample to show use of ItemDecoration" into klp-modular-dev
* commit 'e3ac380aa076a35a253469f1b6d1a0e272ca0228':
  Update RecyclerView sample to show use of ItemDecoration
2014-03-13 18:19:09 +00:00
Adam Powell
e3ac380aa0 Merge "Update RecyclerView sample to show use of ItemDecoration" into klp-modular-dev 2014-03-13 18:16:05 +00:00
George Mount
016fbf2c60 Undo inadvertent change to Transitions API demo.
Change-Id: Ib986f1dd560291896c5e5619c7af9947ee4efaf1
2014-03-13 10:27:03 -07:00
Adam Powell
c12c207351 Update RecyclerView sample to show use of ItemDecoration
Add dividers between list items. These modify the space allocated for
each item.

Change-Id: I995a172ed0b6acef6b84faaa50c02f0ae8db1002
2014-03-13 09:40:35 -07:00
The Android Automerger
df4559d9a5 merge in master-release history after reset to master 2014-03-13 05:49:35 -07:00
Tim Kilbourn
957fa659c2 resolved conflicts for merge of 9eecf3fc to master
Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a
2014-03-12 17:27:10 -07:00
Tim Kilbourn
9eecf3fc97 am 349ba525: Add new support libs into the sdk build.
* commit '349ba5258754aa0dd5511ed89006c2f43dd23895':
  Add new support libs into the sdk build.
2014-03-12 23:47:41 +00:00
Tim Kilbourn
349ba52587 Add new support libs into the sdk build.
android-support-v7-recyclerview
android-support-v17-leanback

Change-Id: I6538bb30204aeaeac0b0ea34f0a5951e09f58866
2014-03-12 15:28:23 -07:00
Trevor Johns
d43bf2c371 am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML""
* commit 'f62824c658006c620be775ca82b74fcc6f82b59c':
  Align "from code" parent-child preference flow with "from XML"
2014-03-12 19:56:45 +00:00