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

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

Issue 1840513002: Redesign sign in and sign in confirmation screens for Narnia 2.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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/res/drawable-hdpi/chrome_sync_logo.png » ('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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 301 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
302 android:theme="@style/MainTheme" 302 android:theme="@style/MainTheme"
303 android:autoRemoveFromRecents="true"> 303 android:autoRemoveFromRecents="true">
304 </activity> 304 </activity>
305 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" 305 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity"
306 android:theme="@style/DialogWhenLarge" 306 android:theme="@style/DialogWhenLarge"
307 android:label="@string/fre_label" 307 android:label="@string/fre_label"
308 android:launchMode="singleTop" 308 android:launchMode="singleTop"
309 android:windowSoftInputMode="stateHidden|adjustPan" 309 android:windowSoftInputMode="stateHidden|adjustPan"
310 android:screenOrientation="portrait"
310 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 311 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
311 </activity> 312 </activity>
312 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" 313 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity"
313 android:theme="@style/MainTheme" 314 android:theme="@style/MainTheme"
315 android:screenOrientation="portrait"
314 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 316 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
315 </activity> 317 </activity>
316 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 318 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
317 android:theme="@style/PreferencesTheme" 319 android:theme="@style/PreferencesTheme"
318 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 320 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
319 android:label="@string/preferences" 321 android:label="@string/preferences"
320 android:exported="false"> 322 android:exported="false">
321 </activity> 323 </activity>
322 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 324 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
323 android:theme="@style/ThemeWithActionBar" 325 android:theme="@style/ThemeWithActionBar"
(...skipping 28 matching lines...) Expand all
352 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 354 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
353 </activity> 355 </activity>
354 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkFo lderSelectActivity" 356 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkFo lderSelectActivity"
355 android:theme="@style/BookmarkDialogWhite" 357 android:theme="@style/BookmarkDialogWhite"
356 android:windowSoftInputMode="stateAlwaysHidden" 358 android:windowSoftInputMode="stateAlwaysHidden"
357 android:label="@string/bookmark_choose_folder" 359 android:label="@string/bookmark_choose_folder"
358 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 360 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
359 </activity> 361 </activity>
360 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkSi gninActivity" 362 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkSi gninActivity"
361 android:theme="@style/BookmarkDialogWhite" 363 android:theme="@style/BookmarkDialogWhite"
364 android:screenOrientation="portrait"
362 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 365 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
363 </activity> 366 </activity>
364 367
365 <!-- 368 <!--
366 Activities for webapps. 369 Activities for webapps.
367 TODO(dfalcantara): Remove the aliases for the WebappActivities once we're pretty sure 370 TODO(dfalcantara): Remove the aliases for the WebappActivities once we're pretty sure
368 that users don't have any instances of the origin al Activity still 371 that users don't have any instances of the origin al Activity still
369 running. 372 running.
370 --> 373 -->
371 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch erActivity" 374 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch erActivity"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 811 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
809 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 812 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
810 The downstream manifest replaces this block, and hence replaces the list of media route 813 The downstream manifest replaces this block, and hence replaces the list of media route
811 controllers with its own list. --> 814 controllers with its own list. -->
812 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 815 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
813 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 816 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
814 817
815 {% endblock %} 818 {% endblock %}
816 </application> 819 </application>
817 </manifest> 820 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/drawable-hdpi/chrome_sync_logo.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698