ntp_set_about_blank_button removed

This commit is contained in:
Carmelo Messina 2021-11-20 18:59:48 +01:00
parent bdf4538dbd
commit bd722a2b67
No known key found for this signature in database
GPG key ID: 968894BE688289FD

View file

@ -1,26 +1,26 @@
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Tue, 16 Nov 2021 11:48:52 +0000
Date: Sat, 20 Nov 2021 15:36:54 +0000
Subject: Add option to use home page as NTP
And allow use about:blank as default homepage
---
.../java/res/xml/homepage_preferences.xml | 9 ++++++
.../browser/homepage/HomepageManager.java | 16 +++++++++++
.../homepage/settings/HomepageSettings.java | 28 +++++++++++++++++++
.../chrome/browser/metrics/LaunchMetrics.java | 1 -
.../browser/tabmodel/ChromeTabCreator.java | 7 +++++
.../preferences/ChromePreferenceKeys.java | 1 +
.../LegacyChromePreferenceKeys.java | 1 +
.../strings/android_chrome_strings.grd | 6 ++++
chrome/browser/ui/browser_ui_prefs.cc | 2 ++
chrome/common/pref_names.cc | 4 +++
chrome/common/pref_names.h | 1 +
11 files changed, 75 insertions(+), 1 deletion(-)
.../java/res/xml/homepage_preferences.xml | 5 +++++
.../chrome/browser/homepage/HomepageManager.java | 16 ++++++++++++++++
.../homepage/settings/HomepageSettings.java | 12 ++++++++++++
.../chrome/browser/metrics/LaunchMetrics.java | 1 -
.../browser/tabmodel/ChromeTabCreator.java | 7 +++++++
.../preferences/ChromePreferenceKeys.java | 1 +
.../preferences/LegacyChromePreferenceKeys.java | 1 +
.../android/strings/android_chrome_strings.grd | 3 +++
chrome/browser/ui/browser_ui_prefs.cc | 2 ++
chrome/common/pref_names.cc | 4 ++++
chrome/common/pref_names.h | 1 +
11 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/android/java/res/xml/homepage_preferences.xml
--- a/chrome/android/java/res/xml/homepage_preferences.xml
+++ b/chrome/android/java/res/xml/homepage_preferences.xml
@@ -12,9 +12,18 @@
@@ -12,6 +12,11 @@
android:summaryOn="@string/text_on"
android:summaryOff="@string/text_off" />
@ -32,13 +32,6 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
<org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference
android:key="homepage_radio_group"
android:selectable="false"
app:allowDividerAbove="true"
app:allowDividerBelow="false" />
+
+ <org.chromium.components.browser_ui.settings.ButtonPreference
+ android:key="ntp_set_about_blank_button"
+ app:verticalInset="0dp" />
</PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
@ -76,17 +69,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
/**
* Fragment that allows the user to configure homepage related preferences.
@@ -32,6 +33,9 @@ public class HomepageSettings extends PreferenceFragmentCompat {
@@ -32,6 +33,8 @@ public class HomepageSettings extends PreferenceFragmentCompat {
@VisibleForTesting
public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
+ private static final String PREF_NTP_HOMEPAGE_SWITCH = "ntp_is_homepage_switch";
+ private static final String PREF_NTP_SET_ABOUT_BLANK_BUTTON = "ntp_set_about_blank_button";
+
/**
* Delegate used to mark that the homepage is being managed.
* Created for {@link org.chromium.chrome.browser.settings.HomepagePreferences}
@@ -72,6 +76,30 @@ public class HomepageSettings extends PreferenceFragmentCompat {
@@ -72,6 +75,15 @@ public class HomepageSettings extends PreferenceFragmentCompat {
});
mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
@ -98,21 +90,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
+ mHomepageManager.setPrefNTPIsHomepageEnabled((boolean) newValue);
+ return true;
+ });
+
+ final Preference setAboutBlankButton =
+ findPreference(PREF_NTP_SET_ABOUT_BLANK_BUTTON);
+ setAboutBlankButton.setTitle(R.string.ntp_set_about_blank_button_text);
+ setAboutBlankButton.setOnPreferenceClickListener(
+ new Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference)
+ {
+ mHomepageManager.setHomepagePreferences(
+ /*useChromeNtp*/false, /*useDefaultUri*/false, "about:blank");
+ mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
+ return true;
+ }
+ });
+
RecordUserAction.record("Settings.Homepage.Opened");
}
@ -177,15 +154,12 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1047,6 +1047,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1050,6 +1050,9 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
Last hour
</message>
+ <message name="IDS_OPTIONS_NTP_IS_HOMEPAGE_LABEL" desc="The label for switch that allows the user to toggle whether opening a new tab leads to the new tab page or the home page.">
+ Use for new tabs
+ </message>
+ <message name="IDS_NTP_SET_ABOUT_BLANK_BUTTON_TEXT" desc="The label for button that allows to set about:blank as the home page.">
+ Set blank page as homepage
+ </message>
<message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_24_HOURS" desc="The option to delete browsing data from the last 24 hours.">
Last 24 hours