219 lines
13 KiB
Diff
219 lines
13 KiB
Diff
From: uazo <uazo@users.noreply.github.com>
|
|
Date: Tue, 27 Feb 2024 16:20:43 +0000
|
|
Subject: Show NTP at startup
|
|
|
|
Adds an active option by default to automatically open the
|
|
NTP at each reboot and allows the user to continue the old browsing.
|
|
Until the real tab is opened, no data is retrieved.
|
|
|
|
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
|
---
|
|
.../android/java/res/xml/homepage_preferences.xml | 6 ++++++
|
|
.../chrome/browser/BrowserRestartActivity.java | 1 +
|
|
.../chrome/browser/ChromeInactivityTracker.java | 13 +++++++++++++
|
|
.../chrome/browser/ChromeTabbedActivity.java | 4 +++-
|
|
.../chrome/browser/tasks/ReturnToChromeUtil.java | 12 +++++++++++-
|
|
.../browser/preferences/ChromePreferenceKeys.java | 2 ++
|
|
.../preferences/LegacyChromePreferenceKeys.java | 1 +
|
|
.../single_tab/SingleTabSwitcherCoordinator.java | 2 +-
|
|
.../single_tab/SingleTabSwitcherOnNtpMediator.java | 6 ++----
|
|
.../show-ntp-at-startup.grdp | 9 +++++++++
|
|
.../chrome_feature_list_cc/show-ntp-at-startup.inc | 2 ++
|
|
11 files changed, 51 insertions(+), 7 deletions(-)
|
|
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/show-ntp-at-startup.grdp
|
|
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/show-ntp-at-startup.inc
|
|
|
|
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
|
|
@@ -19,6 +19,12 @@ found in the LICENSE file.
|
|
android:summaryOn="@string/options_ntp_is_homepage_label"
|
|
android:summaryOff="@string/options_ntp_is_homepage_label" />
|
|
|
|
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
|
+ android:title="@string/show_ntp_at_startup_title"
|
|
+ android:summary="@string/show_ntp_at_startup_summary"
|
|
+ app:featureName="enable-show-ntp-at-startup"
|
|
+ app:needRestart="true" />
|
|
+
|
|
<org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference
|
|
android:key="homepage_radio_group"
|
|
android:selectable="false"
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BrowserRestartActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/BrowserRestartActivity.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/BrowserRestartActivity.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BrowserRestartActivity.java
|
|
@@ -67,6 +67,7 @@ public class BrowserRestartActivity extends Activity {
|
|
Intent restartIntent = new Intent(Intent.ACTION_MAIN);
|
|
restartIntent.setPackage(context.getPackageName());
|
|
restartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
+ restartIntent.putExtra(BrowserRestartActivity.EXTRA_RESTART, true);
|
|
context.startActivity(restartIntent);
|
|
}
|
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java
|
|
@@ -12,6 +12,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
|
|
import org.chromium.chrome.browser.lifecycle.DestroyObserver;
|
|
import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
|
|
import org.chromium.chrome.browser.lifecycle.StartStopWithNativeObserver;
|
|
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
|
|
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
|
|
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
|
|
|
|
@@ -55,6 +56,18 @@ public class ChromeInactivityTracker
|
|
mLifecycleDispatcher.register(this);
|
|
}
|
|
|
|
+ public void setIsStartup(boolean newStartup) {
|
|
+ ChromeSharedPreferences.getInstance().writeBoolean(
|
|
+ ChromePreferenceKeys.TABBED_ACTIVITY_IS_STARTUP, newStartup);
|
|
+ }
|
|
+
|
|
+ public boolean isNewStartup() {
|
|
+ return
|
|
+ ChromeFeatureList.sShowNtpAtStartupAndroid.isEnabled()
|
|
+ && ChromeSharedPreferences.getInstance().readBoolean(
|
|
+ ChromePreferenceKeys.TABBED_ACTIVITY_IS_STARTUP, false);
|
|
+ }
|
|
+
|
|
/**
|
|
* Updates the shared preferences to contain the given time. Used internally and for tests.
|
|
* @param timeInMillis the time to record.
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
@@ -1680,7 +1680,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
|
Callback<String> onStandardActiveIndexRead = null;
|
|
shouldShowNtpAsHomeSurfaceAtStartup = shouldShowNtpHomeSurfaceOnStartup();
|
|
boolean skipSavingNonActiveNtps = skipSavingNonActiveNtps();
|
|
- if (skipSavingNonActiveNtps) {
|
|
+ if (skipSavingNonActiveNtps || shouldShowNtpAsHomeSurfaceAtStartup) {
|
|
mHomeSurfaceTracker = new HomeSurfaceTracker();
|
|
}
|
|
if (shouldShowNtpAsHomeSurfaceAtStartup) {
|
|
@@ -2392,6 +2392,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
|
mInactivityTracker =
|
|
new ChromeInactivityTracker(
|
|
ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF);
|
|
+ mInactivityTracker.setIsStartup(
|
|
+ !CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()));
|
|
TabUsageTracker.initialize(this.getLifecycleDispatcher(), tabModelSelector);
|
|
TabGroupUsageTracker.initialize(
|
|
this.getLifecycleDispatcher(), tabModelSelector, this::isWarmOnResume);
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
|
|
@@ -35,6 +35,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
|
|
import org.chromium.base.supplier.OneshotSupplier;
|
|
import org.chromium.base.supplier.Supplier;
|
|
import org.chromium.chrome.browser.ActivityTabProvider;
|
|
+import org.chromium.chrome.browser.BrowserRestartActivity;
|
|
import org.chromium.chrome.browser.ChromeInactivityTracker;
|
|
import org.chromium.chrome.browser.IntentHandler;
|
|
import org.chromium.chrome.browser.app.ChromeActivity;
|
|
@@ -631,6 +632,15 @@ public final class ReturnToChromeUtil {
|
|
}
|
|
}
|
|
|
|
+ boolean isMainIntentFromLauncherOrRestart =
|
|
+ IntentUtils.isMainIntentFromLauncher(intent)
|
|
+ || IntentUtils.safeGetBooleanExtra(
|
|
+ intent, BrowserRestartActivity.EXTRA_RESTART, false);
|
|
+ if (isMainIntentFromLauncherOrRestart && inactivityTracker.isNewStartup()) {
|
|
+ inactivityTracker.setIsStartup(false);
|
|
+ return true;
|
|
+ }
|
|
+
|
|
// Checks whether to show the Start surface due to feature flag TAB_SWITCHER_ON_RETURN_MS.
|
|
long lastVisibleTimeMs = inactivityTracker.getLastVisibleTimeMs();
|
|
long lastBackgroundTimeMs = inactivityTracker.getLastBackgroundedTimeMs();
|
|
@@ -802,7 +812,7 @@ public final class ReturnToChromeUtil {
|
|
TabModel currentTabModel,
|
|
TabCreator tabCreator,
|
|
HomeSurfaceTracker homeSurfaceTracker) {
|
|
- if (isIncognito || !shouldShowNtpHomeSurfaceOnStartup) {
|
|
+ if (isIncognito || !shouldShowNtpHomeSurfaceOnStartup || homeSurfaceTracker == null) {
|
|
return false;
|
|
}
|
|
|
|
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
|
|
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
|
|
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
|
|
@@ -792,6 +792,8 @@ public final class ChromePreferenceKeys {
|
|
|
|
public static final String TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF =
|
|
"ChromeTabbedActivity.BackgroundTimeMs";
|
|
+ public static final String TABBED_ACTIVITY_IS_STARTUP =
|
|
+ "ChromeTabbedActivity.IsStartup";
|
|
|
|
public static final String TABBED_ACTIVITY_LAST_VISIBLE_TIME_MS =
|
|
"Chrome.StartSurface.LastVisibleTimeMs";
|
|
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
|
|
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
|
|
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
|
|
@@ -118,6 +118,7 @@ public class LegacyChromePreferenceKeys {
|
|
ChromePreferenceKeys.SNAPSHOT_DATABASE_REMOVED,
|
|
ChromePreferenceKeys.SYNC_ERROR_MESSAGE_SHOWN_AT_TIME,
|
|
ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF,
|
|
+ ChromePreferenceKeys.TABBED_ACTIVITY_IS_STARTUP,
|
|
ChromePreferenceKeys.TABMODEL_ACTIVE_TAB_ID,
|
|
ChromePreferenceKeys.TABMODEL_HAS_COMPUTED_MAX_ID,
|
|
ChromePreferenceKeys.TABMODEL_HAS_RUN_FILE_MIGRATION,
|
|
diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherCoordinator.java b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherCoordinator.java
|
|
--- a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherCoordinator.java
|
|
+++ b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherCoordinator.java
|
|
@@ -309,7 +309,7 @@ public class SingleTabSwitcherCoordinator implements TabSwitcher, ModuleProvider
|
|
|
|
/** Returns the layout resource id for the single tab card. */
|
|
public static int getModuleLayoutId() {
|
|
- return R.layout.single_tab_module_layout;
|
|
+ return R.layout.single_tab_module_layout; // (uazo) check this
|
|
}
|
|
|
|
public void destroy() {
|
|
diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
|
|
--- a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
|
|
+++ b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
|
|
@@ -252,16 +252,14 @@ public class SingleTabSwitcherOnNtpMediator {
|
|
public void onPageLoadFinished(Tab tab, GURL url) {
|
|
super.onPageLoadFinished(tab, url);
|
|
mPropertyModel.set(TITLE, tab.getTitle());
|
|
- mPropertyModel.set(
|
|
- URL, SingleTabSwitcherMediator.getDomainUrl(tab.getUrl()));
|
|
+ mPropertyModel.set(URL, tab.getUrl().getPossiblyInvalidSpec());
|
|
tab.removeObserver(this);
|
|
}
|
|
};
|
|
mMostRecentTab.addObserver(tabObserver);
|
|
} else {
|
|
mPropertyModel.set(TITLE, mMostRecentTab.getTitle());
|
|
- mPropertyModel.set(
|
|
- URL, SingleTabSwitcherMediator.getDomainUrl(mMostRecentTab.getUrl()));
|
|
+ mPropertyModel.set(URL, mMostRecentTab.getUrl().getPossiblyInvalidSpec());
|
|
}
|
|
}
|
|
|
|
diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/show-ntp-at-startup.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/show-ntp-at-startup.grdp
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/show-ntp-at-startup.grdp
|
|
@@ -0,0 +1,9 @@
|
|
+<?xml version="1.0" encoding="utf-8"?>
|
|
+<grit-part>
|
|
+ <message name="IDS_SHOW_NTP_AT_STARTUP_TITLE" desc="Text for 'Show NTP at startup' settings option.">
|
|
+ Show NTP at startup
|
|
+ </message>
|
|
+ <message name="IDS_SHOW_NTP_AT_STARTUP_SUMMARY" desc="Summary text for 'Show NTP at startup' settings option.">
|
|
+ Enable showing a NewTabPage at startup and allows selection of the last open tab
|
|
+ </message>
|
|
+</grit-part>
|
|
diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/show-ntp-at-startup.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/show-ntp-at-startup.inc
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/show-ntp-at-startup.inc
|
|
@@ -0,0 +1,2 @@
|
|
+SET_CROMITE_FEATURE_ENABLED(kStartSurfaceReturnTime);
|
|
+SET_CROMITE_FEATURE_ENABLED(kShowNtpAtStartupAndroid);
|
|
--
|