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

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

Issue 942103003: Handle notification preferences intent from gear icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments. Created 5 years, 10 months 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
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
4 4
5 Use of this source code is governed by a BSD-style license that can be 5 Use of this source code is governed by a BSD-style license that can be
6 found in the LICENSE file. 6 found in the LICENSE file.
7 --> 7 -->
8 8
9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
10 package="org.chromium.chrome.shell"> 10 package="org.chromium.chrome.shell">
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 android:label="@string/app_name" 42 android:label="@string/app_name"
43 android:supportsRtl="true"> 43 android:supportsRtl="true">
44 <activity android:name="org.chromium.chrome.shell.ChromeShellActivity" 44 <activity android:name="org.chromium.chrome.shell.ChromeShellActivity"
45 android:launchMode="singleTask" 45 android:launchMode="singleTask"
46 android:theme="@style/MainTheme" 46 android:theme="@style/MainTheme"
47 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize" 47 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize"
48 android:hardwareAccelerated="true"> 48 android:hardwareAccelerated="true">
49 <intent-filter> 49 <intent-filter>
50 <action android:name="android.intent.action.MAIN" /> 50 <action android:name="android.intent.action.MAIN" />
51 <category android:name="android.intent.category.LAUNCHER" /> 51 <category android:name="android.intent.category.LAUNCHER" />
52 <category android:name="android.intent.category.NOTIFICATION_P REFERENCES" />
52 </intent-filter> 53 </intent-filter>
53 </activity> 54 </activity>
54 <activity android:name="org.chromium.sync.test.util.MockGrantCredentials PermissionActivity" 55 <activity android:name="org.chromium.sync.test.util.MockGrantCredentials PermissionActivity"
55 android:exported="true"> 56 android:exported="true">
56 <intent-filter> 57 <intent-filter>
57 <action android:name="android.intent.action.VIEW" /> 58 <action android:name="android.intent.action.VIEW" />
58 <category android:name="android.intent.category.DEFAULT" /> 59 <category android:name="android.intent.category.DEFAULT" />
59 </intent-filter> 60 </intent-filter>
60 </activity> 61 </activity>
61 <activity android:theme="@style/PreferencesTheme" 62 <activity android:theme="@style/PreferencesTheme"
62 android:name="org.chromium.chrome.shell.preferences.ChromeShellP references" 63 android:name="org.chromium.chrome.shell.preferences.ChromeShellP references"
63 android:configChanges="orientation|keyboardHidden|keyboard|scree nSize" 64 android:configChanges="orientation|keyboardHidden|keyboard|scree nSize"
64 android:label="@string/preferences" 65 android:label="@string/preferences"
65 android:exported="false"> 66 android:exported="false">
66 <intent-filter>
67 <action android:name="android.intent.action.MAIN" />
68 <category android:name="android.intent.category.DEFAULT" />
69 <category android:name="android.intent.category.NOTIFICATION_PRE FERENCES" />
70 </intent-filter>
71 </activity> 67 </activity>
72 68
73 <!-- The following service entries exist in order to allow us to 69 <!-- The following service entries exist in order to allow us to
74 start more than one sandboxed process. --> 70 start more than one sandboxed process. -->
75 71
76 <!-- NOTE: If you change the value of "android:process" for the below se rvices, 72 <!-- NOTE: If you change the value of "android:process" for the below se rvices,
77 you also need to update kHelperProcessExecutableName in chrome_cons tants.cc. --> 73 you also need to update kHelperProcessExecutableName in chrome_cons tants.cc. -->
78 {% set num_sandboxed_services = 20 %} 74 {% set num_sandboxed_services = 20 %}
79 <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERV ICES" 75 <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERV ICES"
80 android:value="{{ num_sandboxed_services }}"/> 76 android:value="{{ num_sandboxed_services }}"/>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 </intent-filter> 187 </intent-filter>
192 </receiver> 188 </receiver>
193 189
194 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R" 190 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R"
195 android:value="org.chromium.content.browser.SmartClipProvider " /> 191 android:value="org.chromium.content.browser.SmartClipProvider " />
196 <meta-data android:name="org.chromium.chrome.browser.SERVICE_TAB_LAUNCHE R" 192 <meta-data android:name="org.chromium.chrome.browser.SERVICE_TAB_LAUNCHE R"
197 android:value="org.chromium.chrome.shell.ChromeShellServiceTa bLauncher" /> 193 android:value="org.chromium.chrome.shell.ChromeShellServiceTa bLauncher" />
198 194
199 </application> 195 </application>
200 </manifest> 196 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698