PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix "Welcome screen" modifies the same line as Fix-chromium-vanilla.patch (#1340)

Browse Source
This commit is contained in:
Carmelo Messina
2024-08-03 17:21:18 +02:00
parent ae3f5fbecd
commit c512845991
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Welcome-screen.patch
+7 -5
View File
@@ -15,13 +15,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../DefaultSearchEngineFirstRunFragment.java | 3 -
.../browser/firstrun/FirstRunActivity.java | 31 +-
.../firstrun/FirstRunActivityBase.java | 6 +-
.../firstrun/FirstRunFlowSequencer.java | 68 +---
.../firstrun/FirstRunFlowSequencer.java | 70 +---
.../browser/firstrun/FirstRunUtils.java | 1 +
.../firstrun/ToSAndUMAFirstRunFragment.java | 335 +++++++++++++++++
.../firstrun/TosAndUmaFragmentView.java | 336 ++++++++++++++++++
.../browser/locale/LocaleManagerDelegate.java | 5 +-
.../strings/android_chrome_strings.grd | 24 +-
15 files changed, 911 insertions(+), 108 deletions(-)
15 files changed, 911 insertions(+), 110 deletions(-)
create mode 100644 chrome/android/java/res/layout/fre_tosanduma.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFragmentView.java
@@ -513,16 +513,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
onFlowIsKnown(freProperties);
}
@@ -206,6 +158,8 @@ public abstract class FirstRunFlowSequencer {
@@ -206,8 +158,8 @@ public abstract class FirstRunFlowSequencer {
* @param freProperties Resulting FRE properties bundle.
*/
public void updateFirstRunProperties(Bundle freProperties) {
- // fix chromium vanilla startup
- if (freProperties == null) return;
+ if (freProperties == null)
+ throw new RuntimeException("attempting to update null FRE properties");
boolean isHistorySyncEnabled =
ChromeFeatureList.isEnabled(
ChromeFeatureList.REPLACE_SYNC_PROMOS_WITH_SIGN_IN_PROMOS);
@@ -320,13 +274,17 @@ public abstract class FirstRunFlowSequencer {
@@ -322,13 +274,17 @@ public abstract class FirstRunFlowSequencer {
if (!(caller instanceof Activity)) {
freIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
@@ -1252,7 +1254,7 @@ diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/L
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
@@ -3464,7 +3464,29 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -3459,7 +3459,29 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Chrome. By continuing, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Google Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Google Chrome and ChromeOS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>. The <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Policy<ph name="END_LINK3">&lt;/LINK3&gt;</ph> also applies.
</message>
<message name="IDS_FRE_ACCEPT_CONTINUE" desc="Text for first page accept and continue button [CHAR_LIMIT=20]">