aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-27Merge "Xerox Print Service Recommendation Plug-in" am: c3e6fecc6d am: 02033fc7e8android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-iot-preview-5android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewo-iot-preview-5n-iot-preview-4Harmish Patel
am: 08ec110e20 * commit '08ec110e208e7f527cd010ee6455c0697f7a8deb': Xerox Print Service Recommendation Plug-in Change-Id: I74236a8a45f43605dc2d5c713a166ab25e390d55
2016-05-27Merge "Xerox Print Service Recommendation Plug-in" am: c3e6fecc6dandroid-n-mr1-preview-2android-n-mr1-preview-1Philip P. Moltmann
am: 02033fc7e8 * commit '02033fc7e87a0a47f55962164de812a6ef09a277': Xerox Print Service Recommendation Plug-in Change-Id: Ic6edd15f1fe89152f672598205f9df3f0dc55d62
2016-05-27Merge "Xerox Print Service Recommendation Plug-in"Harmish Patel
am: c3e6fecc6d * commit 'c3e6fecc6d494a2e777256cc9e0fff1b27d12fa8': Xerox Print Service Recommendation Plug-in Change-Id: Id10edddc99cb1e70ff37a91908f25f58336d8da3
2016-05-27Merge "Xerox Print Service Recommendation Plug-in"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Philip P. Moltmann
2016-05-24Xerox Print Service Recommendation Plug-inHarmish Patel
Adding Xerox Print Service Recommendation Plug-in which implements PrintServicePlugin. This plug-in will discover xerox printers and report the count back to Print Service Recommnedation Service along with the service package to recommend. Change-Id: If722c014726d14e3b0a7cf09c2a2b0b1325f68c4 Signed-off-by: Harmish Patel <harmish.patel@xerox.com>
2016-05-23Merge "Samsung Printer Recommendation plugin" am: 1c9d9328ab am: 7190caf83aSergey Yakovlev
am: f80dd5f9ec * commit 'f80dd5f9ec0a09a2982948f1262fdaf4fa22d2c6': Samsung Printer Recommendation plugin Change-Id: I6fcbd68babc603fb279211a2fe92f30f01d2a560
2016-05-23Merge "Samsung Printer Recommendation plugin" am: 1c9d9328abPhilip P. Moltmann
am: 7190caf83a * commit '7190caf83a806b1db9d54cae545d92c83c045821': Samsung Printer Recommendation plugin Change-Id: I88a2e9a5bf57bda0392171afc8313cb7f4b5ab7f
2016-05-23Merge "Samsung Printer Recommendation plugin"Sergey Yakovlev
am: 1c9d9328ab * commit '1c9d9328ab2db167af155efdfd8eafa96e17940c': Samsung Printer Recommendation plugin Change-Id: Id4441544c96ed78264133276cc64280b0c9d6e2d
2016-05-23Merge "Samsung Printer Recommendation plugin"Philip P. Moltmann
2016-05-23Samsung Printer Recommendation pluginSergey Yakovlev
Samsung Printer Recommendation plugin based on Printer Recommendation Example Change-Id: I26a62f103bad959418fe717dbc1a519e7ebc1337
2016-05-03Merge changes Ic36b01cd,I522b2062,I683275d7 am: 3a33ee20e9 am: ff23c9b653Jorge Del Hierro
am: 010acdfa1b * commit '010acdfa1bc369aa018fcf025903b8fb62e5142e': Make gradle wrapper executable Cleanup unused items & lint warnings Mopria HP Printer Recommendation Example Change-Id: I611ec13bc1d74809cdf9663ab963c4c318f45a87
2016-05-03Merge changes Ic36b01cd,I522b2062,I683275d7 am: 3a33ee20e9Philip P. Moltmann
am: ff23c9b653 * commit 'ff23c9b6539b032d3ac95dbbd13dc92c0cf6953b': Make gradle wrapper executable Cleanup unused items & lint warnings Mopria HP Printer Recommendation Example Change-Id: Ic98176e29441bd89d46e7935fcc9d2b5249aec08
2016-05-03Merge changes Ic36b01cd,I522b2062,I683275d7Jorge Del Hierro
am: 3a33ee20e9 * commit '3a33ee20e99646f38127c7aeca5f0616d268a5ce': Make gradle wrapper executable Cleanup unused items & lint warnings Mopria HP Printer Recommendation Example Change-Id: Ie9709fc68af7342ec1647ac7c86874b96104f18f
2016-05-03Merge changes Ic36b01cd,I522b2062,I683275d7android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3Philip P. Moltmann
* changes: Make gradle wrapper executable Cleanup unused items & lint warnings Mopria HP Printer Recommendation Example
2016-05-03Make gradle wrapper executableJorge Del Hierro
2016-05-03Cleanup unused items & lint warningsJorge Del Hierro
2016-05-02Mopria HP Printer Recommendation ExampleMopria
2016-04-11support OnlyAlertOnce in the ShowcaseChris Wren
am: 0e6177c * commit '0e6177c78af2de6d71279725753d5db92511f397': support OnlyAlertOnce in the Showcase Change-Id: Ia7fbd811e89c80e6968dd785478e9f5ed6942ce9
2016-04-11support OnlyAlertOnce in the Showcaseandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releasenougat-devChris Wren
Change-Id: I72fa2f099af40125cf323c98eae629c9d46ccc1f
2016-04-07Merge "test out the new disconnect api" into nyc-devChris Wren
am: 72c7247 * commit '72c7247df3b01c2a0044cfb9bb773cc75ad28307': test out the new disconnect api Change-Id: Icdbe716627402d53f97f2b603117736f642e3446
2016-04-07Merge "test out the new disconnect api" into nyc-devChris Wren
2016-04-07port to NotificationManagerCompat to test APIsChris Wren
am: 7e3e666 * commit '7e3e666f243586c0dc97853ce92bee9e4f4d1d3b': port to NotificationManagerCompat to test APIs Change-Id: I74a2696a16c6539c74463d00a9f364d8c8c15f0c
2016-04-07test out the new disconnect apiChris Wren
Bug: 27582839 Change-Id: Iaddcbba0bfeca0e2603ed6d4fc30a5ff833d5717
2016-04-07port to NotificationManagerCompat to test APIsChris Wren
Bug: 28021291 Change-Id: Ib274393e458670d724aa078743ed8d0d6cd6106d Previously: I20d9e0bd98590e68c8320ceb0b10aec5cc6d1e33
2016-04-06Revert "port to NotificationManagerCompat to test APIs"Chris Wren
am: e6ea907 * commit 'e6ea907e7cf8eb8f8ab04f238ab834ba970b4f45': Revert "port to NotificationManagerCompat to test APIs" Change-Id: Ib360dd1959068aedb48529be71201e837a26ca01
2016-04-06Revert "port to NotificationManagerCompat to test APIs"Chris Wren
This reverts commit 55c563b549ac8b0319e7ec82bfb6e0f533addffb. Change-Id: I5a39e57e0b08ab312318efb176427f0abb58741a
2016-04-06port to NotificationManagerCompat to test APIsChris Wren
am: 55c563b * commit '55c563b549ac8b0319e7ec82bfb6e0f533addffb': port to NotificationManagerCompat to test APIs Change-Id: I15357f452c83736069cfb66c913e09d8d54a607d
2016-04-06port to NotificationManagerCompat to test APIsChris Wren
Bug: 28021291 Change-Id: I20d9e0bd98590e68c8320ceb0b10aec5cc6d1e33
2016-03-31Merge "Remove PrintServiceStubs as it is resolved in the ↵Philip P. Moltmann
frameworks/base/packages/PrintServiceRecommendationService." into nyc-dev am: 8750051 * commit '8750051ab3bddc6e0481ab45e299504537653041': Remove PrintServiceStubs as it is resolved in the frameworks/base/packages/PrintServiceRecommendationService. Change-Id: Ifb5eb5146763a7168cac800f9681a4b07b46f199
2016-03-31Merge "Remove PrintServiceStubs as it is resolved in the ↵Philip P. Moltmann
frameworks/base/packages/PrintServiceRecommendationService." into nyc-dev
2016-03-30Support cancelation of OnRequestCustomPrinterIconPhilip P. Moltmann
am: f369a12 * commit 'f369a120cc6037a0765bb7b4922fbce1c86f1ee2': Support cancelation of OnRequestCustomPrinterIcon Change-Id: Iea05f6bc3cc56ba965ee0830d1a2a59ee064415e
2016-03-28Support cancelation of OnRequestCustomPrinterIconPhilip P. Moltmann
Change-Id: I7d07e64edf92fa460a9df83c4c34d4f9cc8b0832
2016-03-28Remove PrintServiceStubs as it is resolved in the ↵Philip P. Moltmann
frameworks/base/packages/PrintServiceRecommendationService. Change-Id: I0bab4cdecc0b07629c52511e8bdd690dd4e9cfd1
2016-03-17Adjust API of experimenal print servicePhilip P. Moltmann
Change-Id: Ieddd605304da10836d69ca13dc9b5ee8b817c04f
2016-03-03API19 support for print test apps.Philip P. Moltmann
Change-Id: I2a60d7e8ffb96f6b486e317555b6dba486d225ac
2016-02-24Expose printservice-activitesPhilip P. Moltmann
Change-Id: I23d1e516ed794b965a71055dc049d61abb3f31bb
2016-02-11Printer Discovery: Improve doc of NetworkDiscovery.Philip P. Moltmann
Change-Id: Iad8a1773cb4d22afb15bfa79911075a12a313c7a
2016-02-11Printer Discovery: Start and stop discovery based on network connectivity.Philip P. Moltmann
Change-Id: Id85d0357fd5fbebf0c7e349261ea0c24a5c7bae7
2016-02-10Printer discovery: Renaming + dealing with localization.Philip P. Moltmann
Change-Id: Ib8e00f43fdf49f5d87a049ab197c279b08ba6c0b
2016-02-10Printer discovery: Make printer discovery a content provider.Philip P. Moltmann
Change-Id: I3f6520e94e530166ff7fac67c5ed5e4686fe53de
2016-02-10Printer Discovery: Rename interfaces.Philip P. Moltmann
Change-Id: I582fe20ebdabad86a5512b176b94a8e35a5173f6
2016-02-09Printer Discovery: Cleanup small issues left after last change.Philip P. Moltmann
Change-Id: I88d99973419f804485d33313f4b18efb2bf04329
2016-02-10Merge "Printer Discovery: Refactor ServicePrint and NetworkDiscovery." into ↵Philip P. Moltmann
nyc-dev
2016-02-09Printer Discovery: Refactor ServicePrint and NetworkDiscovery.Philip P. Moltmann
Change-Id: Ifa6048695f63209f14b125c0369b3461626b2623
2016-02-08Multi packages per APK sampleSvet Ganov
This is a sample that shows how to declare multi packages per APK. The feature is currently supported only for privileged apps or updates to such apps. The sample declares three activities wihch on old platforms are in the parent package but on devices running API 24 two of the activities are disabled in the parent and moved to the first and second child packages respectively. Change-Id: I673d9c455b3c8543091e83e8d37e35c4af1067d7
2016-02-04PrinterDiscovery: ourServiceRefs is not used.Philip P. Moltmann
Change-Id: I795b38b8eb03d83e66307958679f5ad7aef72d52
2016-02-04PrinterDiscover: Remove now unnecessary use of reflection.Philip P. Moltmann
Change-Id: Ibc1307be323d5b63acc643a0226f5b9a2aa64fb0
2016-02-04PrinterDiscovery: Add LicensePhilip P. Moltmann
Change-Id: I57afd05e111359b2949e225aa60e1dcaed306c0e
2016-02-04PrinterDiscovery: Reorder directory structure and create android build file.Philip P. Moltmann
Change-Id: Idcb4616e4c4286c7284c1b77d6a521145c8598fc
2016-02-04Merge "Initial contribution of Mopria Printer Vendor Discovery sample"Philip P. Moltmann
am: 8e93b13d3f * commit '8e93b13d3fe410b13fb2911a2fc1e49860bf6ca9': Initial contribution of Mopria Printer Vendor Discovery sample