Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 1431023004: [Media, Android] Fix lockscreen and other remote controls on KK- (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handle invalid intent. Remove an else. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaButtonReceiver.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 </intent-filter> 634 </intent-filter>
635 </service> 635 </service>
636 <service android:name="org.chromium.chrome.browser.media.ui.MediaNotific ationManager$PresentationListenerService" 636 <service android:name="org.chromium.chrome.browser.media.ui.MediaNotific ationManager$PresentationListenerService"
637 android:exported="false"> 637 android:exported="false">
638 <intent-filter> 638 <intent-filter>
639 <action android:name="android.intent.action.MEDIA_BUTTON" /> 639 <action android:name="android.intent.action.MEDIA_BUTTON" />
640 </intent-filter> 640 </intent-filter>
641 </service> 641 </service>
642 642
643 643
644 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaButton Receiver"> 644 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaNotifi cationManager$PlaybackMediaButtonReceiver">
645 <intent-filter> 645 <intent-filter>
646 <action android:name="android.intent.action.MEDIA_BUTTON" /> 646 <action android:name="android.intent.action.MEDIA_BUTTON" />
647 </intent-filter> 647 </intent-filter>
648 </receiver>
649 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaNotifi cationManager$PresentationMediaButtonReceiver">
650 <intent-filter>
651 <action android:name="android.intent.action.MEDIA_BUTTON" />
652 </intent-filter>
648 </receiver> 653 </receiver>
649 654
650 655
651 <meta-data android:name="com.google.android.gms.version" 656 <meta-data android:name="com.google.android.gms.version"
652 android:value="@integer/google_play_services_version" /> 657 android:value="@integer/google_play_services_version" />
653 658
654 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R" 659 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R"
655 android:value="org.chromium.content.browser.SmartClipProvider"/> 660 android:value="org.chromium.content.browser.SmartClipProvider"/>
656 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER" 661 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER"
657 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" /> 662 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" />
658 663
659 {% block extra_application_definitions %} 664 {% block extra_application_definitions %}
660 665
661 <!-- Media route controllers to use for remote playback (cast). 666 <!-- Media route controllers to use for remote playback (cast).
662 This is here, rather than in code, since it varies between upstream and downstream, 667 This is here, rather than in code, since it varies between upstream and downstream,
663 yet we need this list of classes in the notification service, which belongs upstream 668 yet we need this list of classes in the notification service, which belongs upstream
664 and doesn't run the downstream startup code. The Cast code will, fo r each media element, 669 and doesn't run the downstream startup code. The Cast code will, fo r each media element,
665 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 670 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
666 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 671 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
667 The downstream manifest replaces this block, and hence replaces the list of media route 672 The downstream manifest replaces this block, and hence replaces the list of media route
668 controllers with its own list. --> 673 controllers with its own list. -->
669 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 674 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
670 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 675 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
671 676
672 {% endblock %} 677 {% endblock %}
673 </application> 678 </application>
674 </manifest> 679 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaButtonReceiver.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698