chrome/android/java/res/xml/site_settings_preferences.xml - Issue 1972963002: Site Settings Android: Move Autoplay and Protected Content to Media menu.

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

Issue 1972963002: Site Settings Android: Move Autoplay and Protected Content to Media menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address feedback Created 4 years, 7 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

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 list below All Sites is ordered by privacy-sensitive items first. If	6 <!-- The list below All Sites is ordered by privacy-sensitive items first. If

7 you are not sure where to add your item, add it above Storage. -->	7 you are not sure where to add your item, add it above Storage. -->

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

9 <!-- All sites -->	9 <!-- All sites -->

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

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 <!-- Background sync -->	55 <!-- Background sync -->

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

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

58 android:key="background_sync" />	58 android:key="background_sync" />

59 <!-- Language -->	59 <!-- Language -->

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

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

62 android:key="language"	62 android:key="language"

63 android:title="@string/language"	63 android:title="@string/language"

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

	65 <!-- Media -->

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

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

	68 android:key="media"

	69 android:title="@string/media_permission_title"

	70 android:icon="@drawable/settings_media" />

65 <!-- Storage -->	71 <!-- Storage -->

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

67 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	73 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

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

69 android:key="use_storage"	75 android:key="use_storage"

70 android:title="@string/website_settings_storage"	76 android:title="@string/website_settings_storage"

71 android:icon="@drawable/settings_storage" />	77 android:icon="@drawable/settings_storage" />

72 </PreferenceScreen>	78 </PreferenceScreen>

OLD	NEW

« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java » ('j') | no next file with comments »