summaryrefslogtreecommitdiff
path: root/samples
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r3' of ↵Steve Kondik2015-03-271-1/+2
|\ | | | | | | | | | | https://android.googlesource.com/platform/development into HEAD Android 5.1.0 release 3
| * Fix the buildJim Miller2015-02-251-1/+2
| | | | | | | | | | | | | | | | This API was hidden for MR1. Bug 19461292 Change-Id: Ib0a5ca536e843c91a142faeeccf684294aa3e274
* | Merge tag 'android-5.1.0_r1' into HEADRicardo Cerqueira2015-03-101792-14573/+35108
|\| | | | | | | Android 5.1.0 release 1
| * am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to ↵Trevor Johns2014-12-161-1/+1
| |\ | | | | | | | | | | | | | | | | | | revision 5 (DO NOT MERGE) * commit '011c16143323f1b6a5e3d0d3ac8659f48237b003': Increment lmp-docs samples to revision 5 (DO NOT MERGE)
| | * Increment lmp-docs samples to revision 5 (DO NOT MERGE)Trevor Johns2014-12-121-1/+1
| | | | | | | | | | | | Change-Id: Iea7e17c19fea38dc0c57ec15839a07f5cb4d7193
| * | Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-devDake Gu2014-12-114-2/+208
| |\ \
| | * | Add test case for multiple row horizontal grid viewDake Gu2014-12-114-2/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test case for update dataset at last row with empty space. b/18631342 b/18718926 Change-Id: I3c745a41b0486cf293fc6a5a595e50f0a14ee0d0
| * | | am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for ↵Trevor Johns2014-12-10503-2690/+8907
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | lmp-docs * commit '2452c0880d904d9e042e290b75acbe6f49b5208f': Docs: Sync browseable samples for lmp-docs
| | * Docs: Sync browseable samples for lmp-docsTrevor Johns2014-12-09503-2690/+8907
| | | | | | | | | | | | | | | | | | | | | Synced to developers/samples/android commit bc036ecdf44cd03163c206096172299f3940b057. Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
| * | Merge "Add RowsFragment example" into lmp-mr1-devDake Gu2014-12-097-11/+258
| |\ \
| | * | Add RowsFragment exampleDake Gu2014-12-097-11/+258
| | | | | | | | | | | | | | | | | | | | Bug: 18622128 Change-Id: I12146a766fa383782f9917352c5959b6064835ee
| * | | Merge "Add 'Remove all then re-add'." into lmp-mr1-devCraig Stout2014-12-091-1/+17
| |\ \ \ | | |/ / | |/| |
| | * | Add 'Remove all then re-add'.Craig Stout2014-12-081-1/+17
| | | | | | | | | | | | | | | | Change-Id: I57f06fab207bcf47c1fd089bf720f539aa389e7e
| * | | Updates for compatLib changes to MedaiRouter support libRoboErik2014-12-041-6/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The ControllerDialog in MediaRouter now gets the session token from the MediaRouter instead of needing it to be set. Removed the calls to set it directly on the dialog. bug:18186638 Change-Id: If7499108c226d3405ea70e2f332694a92a921e50
| * | Use non-deprecated HeaderItem constructor.Craig Stout2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | b/17455376 Change-Id: I9fff76367ffe1f96642a39962e51c935cf39d10b
| * | Merge "Update for MediaSessionCompat support" into lmp-mr1-devRoboErik2014-12-033-64/+52
| |\ \
| | * | Update for MediaSessionCompat supportRoboErik2014-12-013-64/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switches the MediaRouter sample to using MediaSessionCompat instead of RemoteControlClient. This goes along with the update to the support lib for full MediaSessionCompat support of RCC. bug:18186638 Change-Id: If8dd25346b850512ea8d248012d8a369a39d301f
| * | | Merge "Have the MediaProjection sample use the callback." into lmp-mr1-devMichael Wright2014-12-032-3/+11
| |\ \ \
| | * | | Have the MediaProjection sample use the callback.Michael Wright2014-11-212-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18393320 Change-Id: I482ed9cde5444d62a5486f4ca91e3dc6b441e673
| * | | | am 15af151e: am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number ↵Trevor Johns2014-12-011-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | for Android Samples package (lmp-docs) * commit '15af151e05bc642b6cc11c42b73fe6edb9552e39': DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
| | * | DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)Trevor Johns2014-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Setting revision for Coral samples release to r4. Change-Id: I6096fe36f7fbaa589919ecd0edfcc000ffd4264a
| * | | Merge "Update the MediaRouter support demo for new UIs" into lmp-mr1-devRoboErik2014-11-249-141/+179
| |\ \ \
| | * | | Update the MediaRouter support demo for new UIsRoboErik2014-11-199-141/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the MediaRouter support demo for the new material UI spec. bug:17879842 Change-Id: I3340e65384050fbf561cf506cb5b80028d69d849
| * | | | Merge "Update sample to use playback control glue." into lmp-mr1-devCraig Stout2014-11-211-204/+300
| |\ \ \ \
| | * | | | Update sample to use playback control glue.Craig Stout2014-11-191-204/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18077079 Change-Id: I8dafbca6450e04223d8316f1ee1ae9c42ec7b8e5
| * | | | | Merge "Remove deprecated API usage" into lmp-mr1-devYigit Boyar2014-11-214-9/+17
| |\ \ \ \ \
| | * | | | | Remove deprecated API usageYigit Boyar2014-11-114-9/+17
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 18213371 Change-Id: I6acaec5e8a7e5fa4ce5d7cab7040219048d4dcc6
| * | | | | Merge "Update sample app to support right-to-left layouts" into lmp-mr1-devKris Giesing2014-11-211-0/+1
| |\ \ \ \ \
| | * | | | | Update sample app to support right-to-left layoutsKris Giesing2014-11-211-0/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 18262639 Change-Id: I2c1136821f665db095d72cee74f4c404badf4461
| * | | | | am dc0c2a2a: am 30648384: am a35cfcea: Merge "Refresh prebuilts for ↵Trevor Johns2014-11-212-23/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | SpeedTracker sample" into lmp-docs * commit 'dc0c2a2aa7fbf7e6d585db162b24aa46e6e9688f': Refresh prebuilts for SpeedTracker sample
| | * | | Merge "Refresh prebuilts for SpeedTracker sample" into lmp-docsTrevor Johns2014-11-192-23/+1
| | |\ \ \
| | | * | | Refresh prebuilts for SpeedTracker sampleTrevor Johns2014-11-192-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36819e897b0fe983f16d3ced117d4a925b0bdd47
| * | | | | am b0136429: am ec2f91f5: am 109db5b4: Update browseable for MessagingService.Nagesh Susarla2014-11-213-6/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0136429632307db4249f0d6fae1b9810bd8dfc5': Update browseable for MessagingService.
| | * | | | Update browseable for MessagingService.Nagesh Susarla2014-11-193-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. layout fixes 2. name changes in sample. (redo of ag/586904 which was lost from lmp-docs) Change-Id: I3a2afafb5b878ba90b8ae6314220af19b3dfbb09
| * | | | | am 55c9f03b: am 34b5d8e7: Update browseable for MediaBrowserService.Nagesh Susarla2014-11-211-4/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55c9f03bc581cb2d3b797d41d53406e01881ed31': Update browseable for MediaBrowserService.
| | * | | | Update browseable for MediaBrowserService.Nagesh Susarla2014-11-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadb01b70091b9102a8445cd1fe1e1d974127e88f
| * | | | | am 5777a7ff: am 0d0f4d63: Update browseable for MediaBrowserService sample.Renato Mangini2014-11-215-5/+16
| |\| | | | | | |_|/ / | |/| | | | | | | | | | | | | * commit '5777a7ff7e96d3fcb6d6293fb15e5dac8a8e05f6': Update browseable for MediaBrowserService sample.
| | * | | Update browseable for MediaBrowserService sample.Renato Mangini2014-11-185-5/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: I699899cc27b3f9b1f7003d050169e67b29c53eb7
| * | | | Merge "PduParser MSIM support (4/4)" into lmp-mr1-devYe Wen2014-11-183-9/+49
| |\ \ \ \
| | * | | | PduParser MSIM support (4/4)Ye Wen2014-11-183-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PduParser needs to know if Content-Disposition part header is supported for a specific carrier. Originally this is loaded directly from system resource in PduParser. This won't work for multi-SIM, which requires getting that config based on carrier. This change adds parameter to indicate if this header is supported and requires caller to provider the config. b/18371228 Change-Id: I8a0a7ce91d1b9581fe5d4545fa954277a661751b
| * | | | | SupportLeanbackDemo: add test of delayed detail entrance transitionDake Gu2014-11-182-21/+48
| |/ / / / | | | | | | | | | | | | | | | | | | | | b/17628884 Change-Id: Ic13424ae553b58dd93f9932dc50de00b4f876b02
| * | | | Merge "Use 2-param constructor for HeaderItem." into lmp-mr1-devCraig Stout2014-11-185-7/+7
| |\ \ \ \
| | * | | | Use 2-param constructor for HeaderItem.Craig Stout2014-11-185-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b48e3f37e7941a1bba8518efcbdcd180f20b8f5
| * | | | | Fix NPE if user finishes activity quickly.Craig Stout2014-11-181-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | b/17646987 Change-Id: I6c3aa94f8b557449af410b323a6bbdfaa389015e
| * | | | am 2a7f9a5b: am f30a1f46: am bbbffffd: Fix copyright headerRenato Mangini2014-11-186-6/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '2a7f9a5b943ea812bb4158038ceb8c790925cac3': Fix copyright header
| | * | | am bbbffffd: Fix copyright headerRenato Mangini2014-11-186-6/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'bbbffffd88d627e0ac11292941384fa7fc1d7566': Fix copyright header
| | | * | Fix copyright headerRenato Mangini2014-11-176-6/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Idbe984a8f16dc7a6ec116a8b004b76675bf1f020
| * | | | am 445d4319: am 17590765: am d2ecef7d: Fix missing import statement on ↵Renato Mangini2014-11-181-3/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackageValidator. * commit '445d431994f03790d55e77d74cb20c0a678e37bb': Fix missing import statement on PackageValidator.
| | * | | am d2ecef7d: Fix missing import statement on PackageValidator.Renato Mangini2014-11-181-3/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'd2ecef7d0ecc0cc5b238a7198efce03db56e8eea': Fix missing import statement on PackageValidator.
| | | * | Fix missing import statement on PackageValidator.Renato Mangini2014-11-171-3/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic4bb036a15e86b46b1f24410fcd1dc5ef389b732