summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge "More features." into lmp-devCraig Stout2014-08-094-11/+40
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | More features.Craig Stout2014-08-084-11/+40
* | | | | | | | | | | | | | | Merge "Add grid manager demo to Support7Demo app" into lmp-devYigit Boyar2014-08-067-277/+419
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add grid manager demo to Support7Demo appYigit Boyar2014-08-077-277/+419
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* / | | | | | | | | | | | | | Update samples to new MediaProjection APIs.Michael Wright2014-08-061-1/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Playback actions improvements" into lmp-devCraig Stout2014-08-051-20/+53
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Playback actions improvementsCraig Stout2014-08-051-20/+53
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Add MediaProjection samplesMichael Wright2014-08-054-0/+276
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Add elevation settings to cardview demo app" into lmp-devYigit Boyar2014-08-013-16/+166
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add elevation settings to cardview demo appYigit Boyar2014-07-303-16/+166
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | make_key: reduce raciness of password inputKenny Root2014-07-311-2/+4
* | | | | | | | | | | | Merge "Remove AtscTvInput in favor of having another sample input under devel...Dongwon Kang2014-07-2412-1128/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove AtscTvInput in favor of having another sample input under developers.Dongwon Kang2014-07-2912-1128/+0
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Add switches to the Controls sample in ApiDemos" into lmp-devAlan Viverette2014-07-291-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add switches to the Controls sample in ApiDemosAlan Viverette2014-07-291-0/+17
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* / | | | | | | | | | | Stack tool 32/64 bit compatibility fixes.Brigid Smith2014-07-291-1/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Add playback progress." into lmp-devCraig Stout2014-07-271-6/+52
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add playback progress.Craig Stout2014-07-251-6/+52
* | | | | | | | | | | am 050972b1: am 2d0d6541: Change setScrollVertically to protected to make scr...Alan Lau2014-07-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 2d0d6541: Change setScrollVertically to protected to make scroll work in s...Alan Lau2014-07-252-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Change setScrollVertically to protected to make scroll work in subclasses.Alan Lau2014-07-252-2/+2
* | | | | | | | | | | Merge "Add PlaybackOverlayFragment" into lmp-devCraig Stout2014-07-244-0/+185
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Add PlaybackOverlayFragmentCraig Stout2014-07-244-0/+185
* | | | | | | | | | | Update ApiDemos themes, remove targetSdkVersionAlan Viverette2014-07-241-4/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | SupportLeanbackDemo: activity transitionDake Gu2014-07-2315-24/+193
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 sam...Griff Hazen2014-07-230-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2Griff Hazen2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | DO NOT MERGE Update version of sdk 20 samples to 2Griff Hazen2014-07-221-1/+1
* | | | | | | | | Merge "Fix directory where CtsTestStubs.apk is found." into lmp-devJean-Luc Brouillet2014-07-221-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix directory where CtsTestStubs.apk is found.Jean-Luc Brouillet2014-07-211-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | new installation path of apks.Ying Wang2014-07-211-1/+1
* | | | | | | | Merge "Put input ID when inserting channels" into lmp-devChulwoo Lee2014-07-171-2/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Put input ID when inserting channelsChulwoo Lee2014-07-181-2/+28
* | | | | | | | Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-devSungsoo Lim2014-07-171-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the dummy implementation of onContentUnblocked()Sungsoo Lim2014-07-191-6/+0
* | | | | | | | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1923-352/+0
* | | | | | | | | am 8d6dee77: am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880:...Deepanshu Gupta2014-07-190-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046:...Deepanshu Gupta2014-07-180-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f:...Deepanshu Gupta2014-07-180-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd:...Deepanshu Gupta2014-07-180-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e:...Deepanshu Gupta2014-07-180-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a:...Deepanshu Gupta2014-07-180-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf:...Deepanshu Gupta2014-07-180-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved con...Deepanshu Gupta2014-07-180-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for me...Deepanshu Gupta2014-07-180-0/+0
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c8...Deepanshu Gupta2014-07-180-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1....Deepanshu Gupta2014-07-180-0/+0
| | | | | | | | | | |\ \ \ \ \ \
* | | | | | | | | | | | | | | | | am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a:...Deepanshu Gupta2014-07-190-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d:...Deepanshu Gupta2014-07-180-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a:...Deepanshu Gupta2014-07-180-0/+0
| | |\| | | | | | | | | | | | | |