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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Iterate ArrayLists by index. 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

« no previous file with comments | « 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') | no next file with comments »
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..0af69eeb59e15f4897269f0e4a239039b1f2478a 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";

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

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

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

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

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

} else {

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

// the Media key. Otherwise, we can remove the Media menu entry.

@@ -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