chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java - Issue 2159533002: Add a section to Site Settings listing USB devices.

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

Issue 2159533002: Add a section to Site Settings listing USB devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@android_usb_settings

Patch Set: Add comment explaining the automatic dismiss behavior. Created 4 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 side-by-side diff with in-line comments

Download patch

« chrome/android/java/res/xml/single_object_preferences.xml ('K') | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/UsbChooserPreferences.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/UsbChooserPreferences.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

index ed544b60b3a35912aca1760a981fb2362ac9fc93..2666015da20d7bd52a22ac8347982d39cae15075 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

@@ -48,8 +48,9 @@ public class SiteSettingsPreferences extends PreferenceFragment

static final String NOTIFICATIONS_KEY = "notifications";

static final String POPUPS_KEY = "popups";

static final String PROTECTED_CONTENT_KEY = "protected_content";

- static final String TRANSLATE_KEY = "translate";

static final String STORAGE_KEY = "use_storage";

+ static final String TRANSLATE_KEY = "translate";

+ static final String USB_KEY = "usb";

static final String AUTOPLAY_MUTED_VIDEOS = "AutoplayMutedVideos";

@@ -131,6 +132,7 @@ public class SiteSettingsPreferences extends PreferenceFragment

getPreferenceScreen().removePreference(findPreference(NOTIFICATIONS_KEY));

getPreferenceScreen().removePreference(findPreference(POPUPS_KEY));

getPreferenceScreen().removePreference(findPreference(STORAGE_KEY));

+ getPreferenceScreen().removePreference(findPreference(USB_KEY));

Ted C 2016/08/15 20:31:59 move down a line for alpha ordering like the keys

Reilly Grant (use Gerrit) 2016/08/16 17:41:59 Done.

getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));

} else {

// If both Autoplay and Protected Content menus are available, they'll be tucked under

@@ -246,6 +248,8 @@ public class SiteSettingsPreferences extends PreferenceFragment

// TODO(finnur): Re-move this for Storage once it can be moved to the 'Usage' menu.

p = findPreference(STORAGE_KEY);

if (p != null) p.setOnPreferenceClickListener(this);

+ p = findPreference(USB_KEY);

+ if (p != null) p.setOnPreferenceClickListener(this);

}

@Override