137 lines
8.1 KiB
Diff
137 lines
8.1 KiB
Diff
From: Serg <serg.zhukovsky@gmail.com>
|
|
Date: Wed, 22 Mar 2017 19:10:30 -0400
|
|
Subject: Remove Sync and Translate menu
|
|
|
|
---
|
|
.../java/res/drawable-hdpi/settings_translate.png | Bin 399 -> 0 bytes
|
|
.../java/res/drawable-mdpi/settings_translate.png | Bin 284 -> 0 bytes
|
|
.../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes
|
|
.../res/drawable-xxhdpi/settings_translate.png | Bin 793 -> 0 bytes
|
|
.../res/drawable-xxxhdpi/settings_translate.png | Bin 1038 -> 0 bytes
|
|
.../java/res/xml/site_settings_preferences.xml | 8 ++++----
|
|
.../website/SiteSettingsPreferences.java | 22 ++-------------------
|
|
7 files changed, 6 insertions(+), 24 deletions(-)
|
|
delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png
|
|
delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png
|
|
delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png
|
|
delete mode 100644 chrome/android/java/res/drawable-xxhdpi/settings_translate.png
|
|
delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
|
|
|
|
diff --git a/chrome/android/java/res/drawable-hdpi/settings_translate.png b/chrome/android/java/res/drawable-hdpi/settings_translate.png
|
|
deleted file mode 100644
|
|
index 8067680e81c6ffa1a003c579411173827a3a9f96..0000000000000000000000000000000000000000
|
|
diff --git a/chrome/android/java/res/drawable-mdpi/settings_translate.png b/chrome/android/java/res/drawable-mdpi/settings_translate.png
|
|
deleted file mode 100644
|
|
index 3b9b4cd482d36a60d4ff0a110b0bcefabe4c1060..0000000000000000000000000000000000000000
|
|
diff --git a/chrome/android/java/res/drawable-xhdpi/settings_translate.png b/chrome/android/java/res/drawable-xhdpi/settings_translate.png
|
|
deleted file mode 100644
|
|
index 131a57394ca30dcff4bebcb2471bbbf0e1ac134e..0000000000000000000000000000000000000000
|
|
diff --git a/chrome/android/java/res/drawable-xxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxhdpi/settings_translate.png
|
|
deleted file mode 100644
|
|
index 55878e697b1afed1b4f039a561dc6212e24fc024..0000000000000000000000000000000000000000
|
|
diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
|
|
deleted file mode 100644
|
|
index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000
|
|
diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
|
|
index d5ae426f7d7b..a01b1144639c 100644
|
|
--- a/chrome/android/java/res/xml/site_settings_preferences.xml
|
|
+++ b/chrome/android/java/res/xml/site_settings_preferences.xml
|
|
@@ -50,9 +50,9 @@
|
|
android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
|
android:key="ads" />
|
|
<!-- Background sync -->
|
|
- <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
|
+ <!-- org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
|
android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
|
- android:key="background_sync" />
|
|
+ android:key="background_sync" /-->
|
|
<!-- Automatic Downloads -->
|
|
<org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
|
android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
|
@@ -77,11 +77,11 @@
|
|
android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
|
android:key="sound" />
|
|
<!-- Google Translate -->
|
|
- <Preference
|
|
+ <!-- Preference
|
|
android:fragment="org.chromium.chrome.browser.preferences.website.TranslatePreferences"
|
|
android:key="translate"
|
|
android:title="@string/google_translate"
|
|
- android:icon="@drawable/settings_translate" />
|
|
+ android:icon="@drawable/settings_translate" /-->
|
|
<!-- Storage -->
|
|
<!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
|
|
<org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
|
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 95a1c127a28f..e8b87fcefb3f 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
|
|
@@ -39,7 +39,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
|
// are defined in the SiteSettingsCategory, additional keys
|
|
// are listed here.
|
|
static final String MEDIA_KEY = "media";
|
|
- static final String TRANSLATE_KEY = "translate";
|
|
|
|
// Whether the Protected Content menu is available for display.
|
|
boolean mProtectedContentMenuAvailable;
|
|
@@ -83,11 +82,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
|
// The Media sub-menu only contains Protected Content and Autoplay, so remove all other
|
|
// menus.
|
|
for (@Type int i = 0; i < Type.NUM_ENTRIES; i++) {
|
|
- if (i == Type.AUTOPLAY || i == Type.PROTECTED_MEDIA) continue;
|
|
+ if (i == Type.AUTOPLAY || i == Type.PROTECTED_MEDIA || i == Type.BACKGROUND_SYNC) continue;
|
|
getPreferenceScreen().removePreference(findPreference(i));
|
|
}
|
|
getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
|
|
- getPreferenceScreen().removePreference(findPreference(TRANSLATE_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.
|
|
@@ -109,11 +107,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
|
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
|
|
getPreferenceScreen().removePreference(findPreference(Type.CLIPBOARD));
|
|
}
|
|
- // The new Languages Preference *feature* is an advanced version of this translate
|
|
- // preference. Once Languages Preference is enabled, remove this setting.
|
|
- if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
|
|
- getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
|
|
- }
|
|
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.GENERIC_SENSOR_EXTRA_CLASSES)) {
|
|
getPreferenceScreen().removePreference(findPreference(Type.SENSORS));
|
|
}
|
|
@@ -123,10 +116,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
|
private void updatePreferenceStates() {
|
|
PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
|
|
|
|
- // Translate preference.
|
|
- Preference translatePref = findPreference(TRANSLATE_KEY);
|
|
- if (translatePref != null) setTranslateStateSummary(translatePref);
|
|
-
|
|
// Preferences that navigate to Website Settings.
|
|
List<Integer> websitePrefs = new ArrayList<Integer>();
|
|
if (mMediaSubMenu) {
|
|
@@ -143,7 +132,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
|
if (!mProtectedContentMenuAvailable) {
|
|
websitePrefs.add(Type.AUTOPLAY);
|
|
}
|
|
- websitePrefs.add(Type.BACKGROUND_SYNC);
|
|
+// websitePrefs.add(Type.BACKGROUND_SYNC);
|
|
websitePrefs.add(Type.CAMERA);
|
|
if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
|
|
websitePrefs.add(Type.CLIPBOARD);
|
|
@@ -246,11 +235,4 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
|
preference.getTitle().toString());
|
|
return false;
|
|
}
|
|
-
|
|
- private void setTranslateStateSummary(Preference translatePref) {
|
|
- boolean translateEnabled = PrefServiceBridge.getInstance().isTranslateEnabled();
|
|
- translatePref.setSummary(translateEnabled
|
|
- ? R.string.website_settings_category_ask
|
|
- : R.string.website_settings_category_blocked);
|
|
- }
|
|
}
|
|
--
|
|
2.11.0
|
|
|