Loading bromite @ f645da9e Original line number Diff line number Diff line Subproject commit 72547ac4c3158dfcb954d8732cee7a0700a5d901 Subproject commit f645da9e44acdecb6040021b0428ff663fdda376 build/browser.gn_args +1 −0 Original line number Diff line number Diff line android_channel="stable" blink_symbol_level=1 build_with_tflite_lib=false chrome_pgo_phase=0 dcheck_always_on=false debuggable_apks=false Loading build/patches/0001-Browser-Change-app-and-package-name-to-browser.patch +2 −2 Original line number Diff line number Diff line From e665d8b5120c1fb77e19052ee47c4fb51f969484 Mon Sep 17 00:00:00 2001 From 8a9f242453259a31df1f00085ca09798cd7113bb Mon Sep 17 00:00:00 2001 From: Aayush Gupta <theimpulson@e.email> Date: Fri, 26 Nov 2021 05:39:25 +0000 Subject: [PATCH 01/15] Browser: Change app and package name to browser Loading @@ -10,7 +10,7 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email> 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 465896c955bf0..da21f309f2e78 100644 index 3a2417c58db15..296d91464a9f3 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) { Loading build/patches/0002-Browser-Use-our-custom-icon-instead-of-chromium.patch +1 −1 Original line number Diff line number Diff line From f2f6dabdfc916e48ed9a8c63beb29eded6791a52 Mon Sep 17 00:00:00 2001 From e4a464f34d21e4a2ad882468bab023661ab7b867 Mon Sep 17 00:00:00 2001 From: Aayush Gupta <theimpulson@e.email> Date: Fri, 26 Nov 2021 06:04:08 +0000 Subject: [PATCH 02/15] Browser: Use our custom icon instead of chromium Loading build/patches/0003-Browser-Rename-strings-to-browser.patch +14 −14 Original line number Diff line number Diff line From e68afe1d5e4aefca078cbf4a0e820f9e294d67ae Mon Sep 17 00:00:00 2001 From 5672885ee961d8b59108290cc358ddf434e32255 Mon Sep 17 00:00:00 2001 From: Aayush Gupta <theimpulson@e.email> Date: Fri, 26 Nov 2021 07:12:30 +0000 Subject: [PATCH 03/15] Browser: Rename strings to browser Loading Loading @@ -93,7 +93,7 @@ index 9ffac62f8eba4..96b71187ea2f0 100644 </PreferenceScreen> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java index 182e2078b87c8..1fad9b8cd920c 100644 index c874a07351712..6fd881230db7f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java @@ -36,7 +36,7 @@ public class AboutChromeSettings Loading Loading @@ -128,7 +128,7 @@ index 182e2078b87c8..1fad9b8cd920c 100644 ChromeSwitchPreference allowInlineUpdate = (ChromeSwitchPreference) findPreference(PREF_ALLOW_INLINE_UPDATE); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java index 69f2ba955ca4e..308181c06128e 100644 index a78a720298bb4..69863b791ccc2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java @@ -86,7 +86,7 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli Loading Loading @@ -159,20 +159,20 @@ index 69f2ba955ca4e..308181c06128e 100644 } } diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java index bdad48714fd0a..d37700a9cf527 100644 index e92bc2b2739c2..af6d85d9da4cd 100644 --- a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java +++ b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java @@ -106,7 +106,7 @@ public class WebContentsDarkModeMessageController { Resources resources = activity.getResources(); boolean optOut = ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean( ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING, OPT_OUT_PARAM, true); - String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title) + String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title_e) : resources.getString(R.string.auto_dark_message_opt_in_title); PropertyModel message = new PropertyModel.Builder(MessageBannerProperties.ALL_KEYS) @@ -129,7 +129,7 @@ public class WebContentsDarkModeMessageController { .with(MessageBannerProperties.ICON_TINT_COLOR, MessageBannerProperties.TINT_NONE) .with(MessageBannerProperties.TITLE, - resources.getString(R.string.auto_dark_message_title)) + resources.getString(R.string.auto_dark_message_title_e)) .with(MessageBannerProperties.DESCRIPTION, description) .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT, resources.getString(R.string.auto_dark_message_button)) diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd index 465e988c4b538..2bb1965e7faad 100644 index 7a1d1a65ba519..5ec76764c0d30 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -198,6 +198,8 @@ CHAR_LIMIT guidelines: Loading Loading
bromite @ f645da9e Original line number Diff line number Diff line Subproject commit 72547ac4c3158dfcb954d8732cee7a0700a5d901 Subproject commit f645da9e44acdecb6040021b0428ff663fdda376
build/browser.gn_args +1 −0 Original line number Diff line number Diff line android_channel="stable" blink_symbol_level=1 build_with_tflite_lib=false chrome_pgo_phase=0 dcheck_always_on=false debuggable_apks=false Loading
build/patches/0001-Browser-Change-app-and-package-name-to-browser.patch +2 −2 Original line number Diff line number Diff line From e665d8b5120c1fb77e19052ee47c4fb51f969484 Mon Sep 17 00:00:00 2001 From 8a9f242453259a31df1f00085ca09798cd7113bb Mon Sep 17 00:00:00 2001 From: Aayush Gupta <theimpulson@e.email> Date: Fri, 26 Nov 2021 05:39:25 +0000 Subject: [PATCH 01/15] Browser: Change app and package name to browser Loading @@ -10,7 +10,7 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email> 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 465896c955bf0..da21f309f2e78 100644 index 3a2417c58db15..296d91464a9f3 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) { Loading
build/patches/0002-Browser-Use-our-custom-icon-instead-of-chromium.patch +1 −1 Original line number Diff line number Diff line From f2f6dabdfc916e48ed9a8c63beb29eded6791a52 Mon Sep 17 00:00:00 2001 From e4a464f34d21e4a2ad882468bab023661ab7b867 Mon Sep 17 00:00:00 2001 From: Aayush Gupta <theimpulson@e.email> Date: Fri, 26 Nov 2021 06:04:08 +0000 Subject: [PATCH 02/15] Browser: Use our custom icon instead of chromium Loading
build/patches/0003-Browser-Rename-strings-to-browser.patch +14 −14 Original line number Diff line number Diff line From e68afe1d5e4aefca078cbf4a0e820f9e294d67ae Mon Sep 17 00:00:00 2001 From 5672885ee961d8b59108290cc358ddf434e32255 Mon Sep 17 00:00:00 2001 From: Aayush Gupta <theimpulson@e.email> Date: Fri, 26 Nov 2021 07:12:30 +0000 Subject: [PATCH 03/15] Browser: Rename strings to browser Loading Loading @@ -93,7 +93,7 @@ index 9ffac62f8eba4..96b71187ea2f0 100644 </PreferenceScreen> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java index 182e2078b87c8..1fad9b8cd920c 100644 index c874a07351712..6fd881230db7f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java @@ -36,7 +36,7 @@ public class AboutChromeSettings Loading Loading @@ -128,7 +128,7 @@ index 182e2078b87c8..1fad9b8cd920c 100644 ChromeSwitchPreference allowInlineUpdate = (ChromeSwitchPreference) findPreference(PREF_ALLOW_INLINE_UPDATE); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java index 69f2ba955ca4e..308181c06128e 100644 index a78a720298bb4..69863b791ccc2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java @@ -86,7 +86,7 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli Loading Loading @@ -159,20 +159,20 @@ index 69f2ba955ca4e..308181c06128e 100644 } } diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java index bdad48714fd0a..d37700a9cf527 100644 index e92bc2b2739c2..af6d85d9da4cd 100644 --- a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java +++ b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java @@ -106,7 +106,7 @@ public class WebContentsDarkModeMessageController { Resources resources = activity.getResources(); boolean optOut = ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean( ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING, OPT_OUT_PARAM, true); - String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title) + String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title_e) : resources.getString(R.string.auto_dark_message_opt_in_title); PropertyModel message = new PropertyModel.Builder(MessageBannerProperties.ALL_KEYS) @@ -129,7 +129,7 @@ public class WebContentsDarkModeMessageController { .with(MessageBannerProperties.ICON_TINT_COLOR, MessageBannerProperties.TINT_NONE) .with(MessageBannerProperties.TITLE, - resources.getString(R.string.auto_dark_message_title)) + resources.getString(R.string.auto_dark_message_title_e)) .with(MessageBannerProperties.DESCRIPTION, description) .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT, resources.getString(R.string.auto_dark_message_button)) diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd index 465e988c4b538..2bb1965e7faad 100644 index 7a1d1a65ba519..5ec76764c0d30 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -198,6 +198,8 @@ CHAR_LIMIT guidelines: Loading