OLD | NEW |
---|---|
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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
292 | 292 |
293 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" | 293 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" |
294 android:theme="@style/MainTheme" | 294 android:theme="@style/MainTheme" |
295 android:autoRemoveFromRecents="true"> | 295 android:autoRemoveFromRecents="true"> |
296 </activity> | 296 </activity> |
297 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" | 297 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" |
298 android:theme="@style/DialogWhenLarge" | 298 android:theme="@style/DialogWhenLarge" |
299 android:label="@string/fre_label" | 299 android:label="@string/fre_label" |
300 android:launchMode="singleTop" | 300 android:launchMode="singleTop" |
301 android:windowSoftInputMode="stateHidden|adjustPan" | 301 android:windowSoftInputMode="stateHidden|adjustPan" |
302 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> | 302 android:screenOrientation="portrait" |
303 android:configChanges="keyboardHidden|keyboard|screenSize|mcc|mnc|sc reenLayout|smallestScreenSize"> | |
newt (away)
2016/04/01 23:43:10
please leave "orientation" in this list for consis
gogerald1
2016/04/12 01:21:10
Done.
| |
303 </activity> | 304 </activity> |
304 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" | 305 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" |
305 android:theme="@style/MainTheme" | 306 android:theme="@style/MainTheme" |
306 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> | 307 android:screenOrientation="portrait" |
308 android:configChanges="keyboardHidden|keyboard|screenSize|mcc|mnc|sc reenLayout|smallestScreenSize"> | |
307 </activity> | 309 </activity> |
308 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" | 310 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" |
309 android:theme="@style/PreferencesTheme" | 311 android:theme="@style/PreferencesTheme" |
310 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" | 312 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" |
311 android:label="@string/preferences" | 313 android:label="@string/preferences" |
312 android:exported="false"> | 314 android:exported="false"> |
313 </activity> | 315 </activity> |
314 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" | 316 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" |
315 android:theme="@style/ThemeWithActionBar" | 317 android:theme="@style/ThemeWithActionBar" |
316 android:hardwareAccelerated="false" | 318 android:hardwareAccelerated="false" |
(...skipping 27 matching lines...) Expand all Loading... | |
344 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> | 346 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> |
345 </activity> | 347 </activity> |
346 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkFo lderSelectActivity" | 348 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkFo lderSelectActivity" |
347 android:theme="@style/BookmarkDialogWhite" | 349 android:theme="@style/BookmarkDialogWhite" |
348 android:windowSoftInputMode="stateAlwaysHidden" | 350 android:windowSoftInputMode="stateAlwaysHidden" |
349 android:label="@string/bookmark_choose_folder" | 351 android:label="@string/bookmark_choose_folder" |
350 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> | 352 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> |
351 </activity> | 353 </activity> |
352 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkSi gninActivity" | 354 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkSi gninActivity" |
353 android:theme="@style/BookmarkDialogWhite" | 355 android:theme="@style/BookmarkDialogWhite" |
354 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> | 356 android:screenOrientation="portrait" |
357 android:configChanges="keyboardHidden|keyboard|screenSize|mcc|mnc|sc reenLayout|smallestScreenSize"> | |
355 </activity> | 358 </activity> |
356 | 359 |
357 <!-- | 360 <!-- |
358 Activities for webapps. | 361 Activities for webapps. |
359 TODO(dfalcantara): Remove the aliases for the WebappActivities once we're pretty sure | 362 TODO(dfalcantara): Remove the aliases for the WebappActivities once we're pretty sure |
360 that users don't have any instances of the origin al Activity still | 363 that users don't have any instances of the origin al Activity still |
361 running. | 364 running. |
362 --> | 365 --> |
363 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch erActivity" | 366 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch erActivity" |
364 android:theme="@android:style/Theme.NoDisplay" | 367 android:theme="@android:style/Theme.NoDisplay" |
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
797 choose the first MediaRouteController that can play it, so the orde r of the list can be important. | 800 choose the first MediaRouteController that can play it, so the orde r of the list can be important. |
798 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. | 801 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. |
799 The downstream manifest replaces this block, and hence replaces the list of media route | 802 The downstream manifest replaces this block, and hence replaces the list of media route |
800 controllers with its own list. --> | 803 controllers with its own list. --> |
801 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" | 804 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" |
802 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> | 805 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> |
803 | 806 |
804 {% endblock %} | 807 {% endblock %} |
805 </application> | 808 </application> |
806 </manifest> | 809 </manifest> |
OLD | NEW |