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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.preferences.website; 5 package org.chromium.chrome.browser.preferences.website;
6 6
7 import android.os.Build; 7 import android.os.Build;
8 import android.os.Bundle; 8 import android.os.Bundle;
9 import android.preference.Preference; 9 import android.preference.Preference;
10 import android.preference.Preference.OnPreferenceClickListener; 10 import android.preference.Preference.OnPreferenceClickListener;
(...skipping 30 matching lines...) Expand all
41 static final String CAMERA_KEY = "camera"; 41 static final String CAMERA_KEY = "camera";
42 static final String COOKIES_KEY = "cookies"; 42 static final String COOKIES_KEY = "cookies";
43 static final String FULLSCREEN_KEY = "fullscreen"; 43 static final String FULLSCREEN_KEY = "fullscreen";
44 static final String JAVASCRIPT_KEY = "javascript"; 44 static final String JAVASCRIPT_KEY = "javascript";
45 static final String LOCATION_KEY = "device_location"; 45 static final String LOCATION_KEY = "device_location";
46 static final String MEDIA_KEY = "media"; 46 static final String MEDIA_KEY = "media";
47 static final String MICROPHONE_KEY = "microphone"; 47 static final String MICROPHONE_KEY = "microphone";
48 static final String NOTIFICATIONS_KEY = "notifications"; 48 static final String NOTIFICATIONS_KEY = "notifications";
49 static final String POPUPS_KEY = "popups"; 49 static final String POPUPS_KEY = "popups";
50 static final String PROTECTED_CONTENT_KEY = "protected_content"; 50 static final String PROTECTED_CONTENT_KEY = "protected_content";
51 static final String STORAGE_KEY = "use_storage";
51 static final String TRANSLATE_KEY = "translate"; 52 static final String TRANSLATE_KEY = "translate";
52 static final String STORAGE_KEY = "use_storage"; 53 static final String USB_KEY = "usb";
53 54
54 static final String AUTOPLAY_MUTED_VIDEOS = "AutoplayMutedVideos"; 55 static final String AUTOPLAY_MUTED_VIDEOS = "AutoplayMutedVideos";
55 56
56 // Whether the Autoplay menu is available for display. 57 // Whether the Autoplay menu is available for display.
57 boolean mAutoplayMenuAvailable = false; 58 boolean mAutoplayMenuAvailable = false;
58 59
59 // Whether the Protected Content menu is available for display. 60 // Whether the Protected Content menu is available for display.
60 boolean mProtectedContentMenuAvailable = false; 61 boolean mProtectedContentMenuAvailable = false;
61 62
62 // Whether this class is handling showing the Media sub-menu (and not the ma in menu). 63 // Whether this class is handling showing the Media sub-menu (and not the ma in menu).
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 getPreferenceScreen().removePreference(findPreference(CAMERA_KEY)); 125 getPreferenceScreen().removePreference(findPreference(CAMERA_KEY));
125 getPreferenceScreen().removePreference(findPreference(COOKIES_KEY)); 126 getPreferenceScreen().removePreference(findPreference(COOKIES_KEY));
126 getPreferenceScreen().removePreference(findPreference(FULLSCREEN_KEY )); 127 getPreferenceScreen().removePreference(findPreference(FULLSCREEN_KEY ));
127 getPreferenceScreen().removePreference(findPreference(JAVASCRIPT_KEY )); 128 getPreferenceScreen().removePreference(findPreference(JAVASCRIPT_KEY ));
128 getPreferenceScreen().removePreference(findPreference(LOCATION_KEY)) ; 129 getPreferenceScreen().removePreference(findPreference(LOCATION_KEY)) ;
129 getPreferenceScreen().removePreference(findPreference(MEDIA_KEY)); 130 getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
130 getPreferenceScreen().removePreference(findPreference(MICROPHONE_KEY )); 131 getPreferenceScreen().removePreference(findPreference(MICROPHONE_KEY ));
131 getPreferenceScreen().removePreference(findPreference(NOTIFICATIONS_ KEY)); 132 getPreferenceScreen().removePreference(findPreference(NOTIFICATIONS_ KEY));
132 getPreferenceScreen().removePreference(findPreference(POPUPS_KEY)); 133 getPreferenceScreen().removePreference(findPreference(POPUPS_KEY));
133 getPreferenceScreen().removePreference(findPreference(STORAGE_KEY)); 134 getPreferenceScreen().removePreference(findPreference(STORAGE_KEY));
135 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.
134 getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY) ); 136 getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY) );
135 } else { 137 } else {
136 // If both Autoplay and Protected Content menus are available, they' ll be tucked under 138 // If both Autoplay and Protected Content menus are available, they' ll be tucked under
137 // the Media key. Otherwise, we can remove the Media menu entry. 139 // the Media key. Otherwise, we can remove the Media menu entry.
138 if (!mAutoplayMenuAvailable || !mProtectedContentMenuAvailable) { 140 if (!mAutoplayMenuAvailable || !mProtectedContentMenuAvailable) {
139 getPreferenceScreen().removePreference(findPreference(MEDIA_KEY) ); 141 getPreferenceScreen().removePreference(findPreference(MEDIA_KEY) );
140 142
141 if (!mAutoplayMenuAvailable) { 143 if (!mAutoplayMenuAvailable) {
142 getPreferenceScreen().removePreference(findPreference(AUTOPL AY_KEY)); 144 getPreferenceScreen().removePreference(findPreference(AUTOPL AY_KEY));
143 } 145 }
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 } 241 }
240 } 242 }
241 243
242 Preference p = findPreference(ALL_SITES_KEY); 244 Preference p = findPreference(ALL_SITES_KEY);
243 if (p != null) p.setOnPreferenceClickListener(this); 245 if (p != null) p.setOnPreferenceClickListener(this);
244 p = findPreference(MEDIA_KEY); 246 p = findPreference(MEDIA_KEY);
245 if (p != null) p.setOnPreferenceClickListener(this); 247 if (p != null) p.setOnPreferenceClickListener(this);
246 // TODO(finnur): Re-move this for Storage once it can be moved to the 'U sage' menu. 248 // TODO(finnur): Re-move this for Storage once it can be moved to the 'U sage' menu.
247 p = findPreference(STORAGE_KEY); 249 p = findPreference(STORAGE_KEY);
248 if (p != null) p.setOnPreferenceClickListener(this); 250 if (p != null) p.setOnPreferenceClickListener(this);
251 p = findPreference(USB_KEY);
252 if (p != null) p.setOnPreferenceClickListener(this);
249 } 253 }
250 254
251 @Override 255 @Override
252 public void onResume() { 256 public void onResume() {
253 super.onResume(); 257 super.onResume();
254 updatePreferenceStates(); 258 updatePreferenceStates();
255 } 259 }
256 260
257 // OnPreferenceClickListener: 261 // OnPreferenceClickListener:
258 262
259 @Override 263 @Override
260 public boolean onPreferenceClick(Preference preference) { 264 public boolean onPreferenceClick(Preference preference) {
261 preference.getExtras().putString( 265 preference.getExtras().putString(
262 SingleCategoryPreferences.EXTRA_CATEGORY, preference.getKey()); 266 SingleCategoryPreferences.EXTRA_CATEGORY, preference.getKey());
263 preference.getExtras().putString(SingleCategoryPreferences.EXTRA_TITLE, 267 preference.getExtras().putString(SingleCategoryPreferences.EXTRA_TITLE,
264 preference.getTitle().toString()); 268 preference.getTitle().toString());
265 return false; 269 return false;
266 } 270 }
267 271
268 private void setTranslateStateSummary(Preference translatePref) { 272 private void setTranslateStateSummary(Preference translatePref) {
269 boolean translateEnabled = PrefServiceBridge.getInstance().isTranslateEn abled(); 273 boolean translateEnabled = PrefServiceBridge.getInstance().isTranslateEn abled();
270 translatePref.setSummary(translateEnabled 274 translatePref.setSummary(translateEnabled
271 ? R.string.website_settings_category_ask 275 ? R.string.website_settings_category_ask
272 : R.string.website_settings_category_blocked); 276 : R.string.website_settings_category_blocked);
273 } 277 }
274 } 278 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698