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

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

Issue 1223263009: Disable hardware acceleration for ChromeActivities on low-end devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed DocumentModeTestBase to compile Created 5 years, 4 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 android:value="true"/> 111 android:value="true"/>
112 112
113 {% if channel in ['dev', 'canary', 'default'] %} 113 {% if channel in ['dev', 'canary', 'default'] %}
114 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" /> 114 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" />
115 {% endif %} 115 {% endif %}
116 {% if configuration_policy == '1' %} 116 {% if configuration_policy == '1' %}
117 <meta-data android:name="android.content.APP_RESTRICTIONS" 117 <meta-data android:name="android.content.APP_RESTRICTIONS"
118 android:resource="@xml/app_restrictions"/> 118 android:resource="@xml/app_restrictions"/>
119 {% endif %} 119 {% endif %}
120 120
121 <!-- Note: Set android:hardwareAccelerated to "false" in the ".Main" 121 <!-- Note: All activities directly or indirectly derived from ChromeActi vity
122 activity below to go into software, browser tiling mode. 122 must specify android:hardwareAccelerated="false".
123 123
124 Since this activity (shown in the launcher) and the application 124 Since this activity (shown in the launcher) and the application
125 (shown in Android's Settings/Apps list) share the same label, we 125 (shown in Android's Settings/Apps list) share the same label, we
126 do not specify one here to allow it to inherit from the app. --> 126 do not specify one here to allow it to inherit from the app. -->
127 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity" 127 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity"
128 android:theme="@android:style/Theme.Translucent.NoTitleBar"> 128 android:theme="@android:style/Theme.Translucent.NoTitleBar">
129 </activity> 129 </activity>
130 <activity-alias android:name="com.google.android.apps.chrome.Main" 130 <activity-alias android:name="com.google.android.apps.chrome.Main"
131 android:targetActivity="org.chromium.chrome.browser.document.ChromeL auncherActivity" 131 android:targetActivity="org.chromium.chrome.browser.document.ChromeL auncherActivity"
132 android:exported="true"> 132 android:exported="true">
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 android:resource="@xml/searchable" /> 199 android:resource="@xml/searchable" />
200 </activity-alias> 200 </activity-alias>
201 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity" 201 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity"
202 android:exported="false" 202 android:exported="false"
203 android:theme="@style/MainTheme" 203 android:theme="@style/MainTheme"
204 android:windowSoftInputMode="adjustResize" 204 android:windowSoftInputMode="adjustResize"
205 android:taskAffinity="" 205 android:taskAffinity=""
206 android:persistableMode="persistAcrossReboots" 206 android:persistableMode="persistAcrossReboots"
207 android:autoRemoveFromRecents="false" 207 android:autoRemoveFromRecents="false"
208 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 208 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
209 android:hardwareAccelerated="true"> 209 android:hardwareAccelerated="false">
210 </activity> 210 </activity>
211 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity" 211 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity"
212 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity" 212 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity"
213 android:exported="false"/> 213 android:exported="false"/>
214 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity" 214 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity"
215 android:icon="@mipmap/incognito_app_icon" 215 android:icon="@mipmap/incognito_app_icon"
216 android:exported="false" 216 android:exported="false"
217 android:theme="@style/IncognitoTheme" 217 android:theme="@style/IncognitoTheme"
218 android:windowSoftInputMode="adjustResize" 218 android:windowSoftInputMode="adjustResize"
219 android:taskAffinity="" 219 android:taskAffinity=""
220 android:persistableMode="persistNever" 220 android:persistableMode="persistNever"
221 android:autoRemoveFromRecents="false" 221 android:autoRemoveFromRecents="false"
222 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 222 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
223 android:hardwareAccelerated="true"> 223 android:hardwareAccelerated="false">
224 </activity> 224 </activity>
225 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity" 225 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity"
226 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity" 226 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity"
227 android:exported="false"/> 227 android:exported="false"/>
228 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity" 228 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity"
229 android:theme="@style/MainTheme" 229 android:theme="@style/MainTheme"
230 android:exported="false" 230 android:exported="false"
231 android:windowSoftInputMode="adjustResize" 231 android:windowSoftInputMode="adjustResize"
232 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 232 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
233 android:hardwareAccelerated="true"> 233 android:hardwareAccelerated="false">
234 </activity> 234 </activity>
235 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity " 235 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity "
236 android:theme="@style/MainTheme" 236 android:theme="@style/MainTheme"
237 android:exported="false" 237 android:exported="false"
238 android:windowBackground="@drawable/window_background" 238 android:windowBackground="@drawable/window_background"
239 android:windowSoftInputMode="adjustResize" 239 android:windowSoftInputMode="adjustResize"
240 android:launchMode="singleTask" 240 android:launchMode="singleTask"
241 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc" 241 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc"
242 android:hardwareAccelerated="true"> 242 android:hardwareAccelerated="false">
243 </activity> 243 </activity>
244 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" 244 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity"
245 android:theme="@style/MainTheme" 245 android:theme="@style/MainTheme"
246 android:exported="false" 246 android:exported="false"
247 android:windowBackground="@drawable/window_background" 247 android:windowBackground="@drawable/window_background"
248 android:windowSoftInputMode="adjustResize" 248 android:windowSoftInputMode="adjustResize"
249 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 249 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
250 android:hardwareAccelerated="true"> 250 android:hardwareAccelerated="false">
251 </activity> 251 </activity>
252 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 252 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
253 android:theme="@style/MainTheme" 253 android:theme="@style/MainTheme"
254 android:autoRemoveFromRecents="true"> 254 android:autoRemoveFromRecents="true">
255 </activity> 255 </activity>
256 <activity android:name="org.chromium.chrome.browser.bookmark.ManageBookm arkActivity" 256 <activity android:name="org.chromium.chrome.browser.bookmark.ManageBookm arkActivity"
257 android:theme="@style/DialogWhenLargeHolo" 257 android:theme="@style/DialogWhenLargeHolo"
258 android:label="@string/save_bookmark" 258 android:label="@string/save_bookmark"
259 android:windowSoftInputMode="stateHidden|adjustPan" 259 android:windowSoftInputMode="stateHidden|adjustPan"
260 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 260 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
(...skipping 18 matching lines...) Expand all
279 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 279 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
280 </activity> 280 </activity>
281 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 281 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
282 android:theme="@style/PreferencesTheme" 282 android:theme="@style/PreferencesTheme"
283 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 283 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
284 android:label="@string/preferences" 284 android:label="@string/preferences"
285 android:exported="false"> 285 android:exported="false">
286 </activity> 286 </activity>
287 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 287 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
288 android:theme="@style/ThemeWithActionBar" 288 android:theme="@style/ThemeWithActionBar"
289 android:hardwareAccelerated="true" 289 android:hardwareAccelerated="false"
290 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 290 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
291 </activity> 291 </activity>
292 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" 292 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
293 android:theme="@style/MainTheme" 293 android:theme="@style/MainTheme"
294 android:exported="true"> 294 android:exported="true">
295 </activity> 295 </activity>
296 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity" 296 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity"
297 android:theme="@style/EnhancedBookmarkDialog" 297 android:theme="@style/EnhancedBookmarkDialog"
298 android:windowSoftInputMode="stateAlwaysHidden" 298 android:windowSoftInputMode="stateAlwaysHidden"
299 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > 299 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" >
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" /> 331 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" />
332 <category android:name="android.intent.category.DEFAULT" /> 332 <category android:name="android.intent.category.DEFAULT" />
333 </intent-filter> 333 </intent-filter>
334 </activity-alias> 334 </activity-alias>
335 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" 335 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty"
336 android:theme="@style/MainTheme" 336 android:theme="@style/MainTheme"
337 android:label="@string/webapp_activity_title" 337 android:label="@string/webapp_activity_title"
338 android:documentLaunchMode="intoExisting" 338 android:documentLaunchMode="intoExisting"
339 android:windowSoftInputMode="adjustResize" 339 android:windowSoftInputMode="adjustResize"
340 android:persistableMode="persistNever" 340 android:persistableMode="persistNever"
341 android:hardwareAccelerated="true" 341 android:hardwareAccelerated="false"
342 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 342 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
343 </activity> 343 </activity>
344 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" 344 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity"
345 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" 345 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity"
346 android:label="@string/webapp_activity_title"> 346 android:label="@string/webapp_activity_title">
347 </activity-alias> 347 </activity-alias>
348 {% for i in range(10) %} 348 {% for i in range(10) %}
349 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}" 349 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}"
350 android:theme="@style/MainTheme" 350 android:theme="@style/MainTheme"
351 android:icon="@mipmap/app_shortcut_icon" 351 android:icon="@mipmap/app_shortcut_icon"
352 android:label="@string/webapp_activity_title" 352 android:label="@string/webapp_activity_title"
353 android:launchMode="singleTask" 353 android:launchMode="singleTask"
354 android:windowSoftInputMode="adjustResize" 354 android:windowSoftInputMode="adjustResize"
355 android:persistableMode="persistNever" 355 android:persistableMode="persistNever"
356 android:hardwareAccelerated="true" 356 android:hardwareAccelerated="false"
357 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" 357 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}"
358 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 358 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
359 </activity> 359 </activity>
360 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" 360 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}"
361 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" 361 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}"
362 android:icon="@mipmap/app_shortcut_icon" 362 android:icon="@mipmap/app_shortcut_icon"
363 android:label="@string/webapp_activity_title"> 363 android:label="@string/webapp_activity_title">
364 </activity-alias> 364 </activity-alias>
365 {% endfor %} 365 {% endfor %}
366 366
367 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" 367 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity"
368 android:theme="@style/MainTheme" 368 android:theme="@style/MainTheme"
369 android:label="Chrome.ExpandedControllerActivity" 369 android:label="Chrome.ExpandedControllerActivity"
370 android:hardwareAccelerated="true" 370 android:hardwareAccelerated="true"
371 android:launchMode="singleTask" 371 android:launchMode="singleTask"
372 android:noHistory="true" 372 android:noHistory="true"
373 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 373 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
374 android:excludeFromRecents="true"> 374 android:excludeFromRecents="true">
375 </activity> 375 </activity>
376 376
377 <activity android:name="org.chromium.chrome.browser.childaccounts.ResetD ataActivity" 377 <activity android:name="org.chromium.chrome.browser.childaccounts.ResetD ataActivity"
378 android:theme="@android:style/Theme.Translucent.NoTitleBar" 378 android:theme="@android:style/Theme.Translucent.NoTitleBar"
379 android:exported="true" 379 android:exported="true"
380 android:excludeFromRecents="true"> 380 android:excludeFromRecents="true">
381 </activity> 381 </activity>
382 382
383 <!-- This activity is started along with IncognitoDocumentActivity, so i t also must
384 disable hardware acceleration. Besides, it doesn't have any UI. -->
383 <activity android:name="org.chromium.chrome.browser.document.CipherKeyAc tivity" 385 <activity android:name="org.chromium.chrome.browser.document.CipherKeyAc tivity"
384 android:launchMode="singleInstance" 386 android:launchMode="singleInstance"
385 android:theme="@android:style/Theme.Translucent.NoTitleBar" 387 android:theme="@android:style/Theme.Translucent.NoTitleBar"
386 android:excludeFromRecents="true"> 388 android:excludeFromRecents="true"
389 android:hardwareAccelerated="false">
387 </activity> 390 </activity>
388 391
389 <!-- Providers for chrome data. --> 392 <!-- Providers for chrome data. -->
390 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide r" 393 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide r"
391 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}" 394 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}"
392 android:exported="true"> 395 android:exported="true">
393 <path-permission android:path="/bookmarks/search_suggest_query" 396 <path-permission android:path="/bookmarks/search_suggest_query"
394 android:readPermission="android.permission.GLOBAL_SEARCH" /> 397 android:readPermission="android.permission.GLOBAL_SEARCH" />
395 </provider> 398 </provider>
396 399
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 633 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
631 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 634 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
632 The downstream manifest replaces this block, and hence replaces the list of media route 635 The downstream manifest replaces this block, and hence replaces the list of media route
633 controllers with its own list. --> 636 controllers with its own list. -->
634 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 637 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
635 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 638 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
636 639
637 {% endblock %} 640 {% endblock %}
638 </application> 641 </application>
639 </manifest> 642 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698