chrome/android/java/res/xml/site_settings_preferences.xml - Issue 1894913002: Android: turn on auto-detect encoding by default

Side by Side Diff: chrome/android/java/res/xml/site_settings_preferences.xml

Issue 1894913002: Android: turn on auto-detect encoding by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 4 years, 5 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 | « chrome/android/java/res/xml/language_preferences.xml ('k') | chrome/android/java/res/xml/translate_preferences.xml » ('j') | chrome/android/java/res/xml/translate_preferences.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <!-- The order of the following items is from: http://crbug.com/610358. -->	6 <!-- The order of the following items is from: http://crbug.com/610358. -->

7 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">	7 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

8 <!-- All sites -->	8 <!-- All sites -->

9 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	9 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

10 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"	10 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"	48 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

49 android:key="fullscreen" />	49 android:key="fullscreen" />

50 <!-- Protected content -->	50 <!-- Protected content -->

51 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	51 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

52 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"	52 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

53 android:key="protected_content" />	53 android:key="protected_content" />

54 <!-- Autoplay -->	54 <!-- Autoplay -->

55 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	55 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

56 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"	56 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

57 android:key="autoplay" />	57 android:key="autoplay" />

58 <!-- Language -->

59 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

60 android:fragment="org.chromium.chrome.browser.preferences.website.Langua gePreferences"

61 android:key="language"

62 android:title="@string/language"

63 android:icon="@drawable/settings_language" />

64 <!-- Media -->	58 <!-- Media -->

65 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	59 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

66 android:fragment="org.chromium.chrome.browser.preferences.website.SiteSe ttingsPreferences"	60 android:fragment="org.chromium.chrome.browser.preferences.website.SiteSe ttingsPreferences"

67 android:key="media"	61 android:key="media"

68 android:title="@string/media_permission_title"	62 android:title="@string/media_permission_title"

69 android:icon="@drawable/settings_media" />	63 android:icon="@drawable/settings_media" />

	64 <!-- Google Translate -->

	65 <Preference
	Theresa 2016/07/19 20:18:03 Check with UX to confirm that this should move bac Check with UX to confirm that this should move back down now that we're removing auto-detect encoding. Jinsuk Kim 2016/07/20 04:04:53 rolfe@ confirmed that this is okay if it's being e Show quoted text On 2016/07/19 20:18:03, Theresa Wellington wrote: > Check with UX to confirm that this should move back down now that we're removing > auto-detect encoding. rolfe@ confirmed that this is okay if it's being exactly reverted.
	66 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences"

	67 android:key="translate"

	68 android:title="@string/google_translate"

	69 android:icon="@drawable/settings_translate" />

70 <!-- Storage -->	70 <!-- Storage -->

71 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->	71 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->

72 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	72 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

73 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"	73 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

74 android:key="use_storage"	74 android:key="use_storage"

75 android:title="@string/website_settings_storage"	75 android:title="@string/website_settings_storage"

76 android:icon="@drawable/settings_storage" />	76 android:icon="@drawable/settings_storage" />

77 </PreferenceScreen>	77 </PreferenceScreen>

OLD	NEW