Merge branch '4096-master-145' into 'master'

clean=0

gsync=0

history=1

trichrome=0

patchonly=0

arch=""

  echo "    -s Sync source"

  echo "    -h Sync without history"

  echo "    -p Apply patches - Only after synced"

  echo "    -t Build trichrome chromium, webview and library"

  echo

  exit 1

}

build() {

  echo ">> [$(date)] Head commit: $(git show -s --format=%s)"

  apks="TrichromeChrome TrichromeLibrary TrichromeWebView TrichromeChrome6432 \

        TrichromeLibrary6432 TrichromeWebView6432 ChromePublic SystemWebView"

  apks="ChromePublic SystemWebView"

  build_args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" "

  apk_arch=${1}

  build_args+=' android_keystore_path="'$keystore_path'"'

  build_args+=' android_keystore_name="platform"'

  build_args+=' android_keystore_password="platform"'

  build_args+=' trichrome_certdigest="c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8"'

  echo ">> [$(date)] Building chromium $chromium_version for $1"

  gn gen "out/$1" --fail-on-unused-args --args="$build_args"

  if [[ $trichrome -eq 0 ]]; then

  build_targets="chrome_public_apk system_webview_apk"

  elif [ $1 '==' "x64" ] || [ $1 '==' "arm64" ]; then

    build_targets="trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk"

  else

    build_targets="trichrome_webview_apk trichrome_chrome_apk trichrome_library_apk"

  fi

  ninja -C out/$1 $build_targets

  mkdir -p "${root_dir}/apks/${apk_arch}"

  fi

}

while getopts ":a:cur:shpt" opt; do

while getopts ":a:cur:shp" opt; do

  case $opt in

  a) arch="$OPTARG" ;;

  c) clean=1 ;;

  s) gsync=1 ;;

  h) history=0 ;;

  p) patchonly=1 ;;

  t) trichrome=1 ;;

  :)

    echo "Option -$OPTARG requires an argument"

    echo

use_errorprone_java_compiler=false

use_official_google_api_keys=false

use_rtti=false

use_stable_package_name_for_trichrome=false

use_thin_lto=false

use_v8_context_snapshot=false

enable_glic = false

build_tflite_with_xnnpack = false

v8_enable_builtins_reordering = false

chrome_public_manifest_package = "foundation.e.browser"

trichrome_library_package = "foundation.e.trichromelibrary"

system_webview_package_name="com.android.webview"

Subproject commit 2ba21150282e277cdab0f534cb57978d9a9ac398

Subproject commit ad6c3e036ad33023c8b2259e62ce54a5c0354189

Improve-plain-text-rendering-on-mobile.patch

Remove-segmentation-platform.patch

Remove-window-name-on-cross-origin-navigation.patch

Remove-preload-of-com.google.android.gms.fonts.patch

Partition-Blink-memory-cache.patch

Disable-PrivacyGuide.patch

sharing-hub-always-use-visible-URL.patch

From 955b40fb3e13391d88d5a3f6de0562851b00e83c Mon Sep 17 00:00:00 2001

From 524b64d8be2879bff10af9cc8a4d5c6cb68ebe40 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 07:12:30 +0000

Subject: Browser: Rename strings to browser

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 .../android/java/res/xml/about_chrome_preferences.xml  |  3 +++

 .../browser/about_settings/AboutChromeSettings.java    |  6 +++---

 .../browser/about_settings/AboutChromeSettings.java    |  9 +++------

 .../ui/android/strings/android_chrome_strings.grd      |  2 ++

 chrome/browser/ui/android/strings/foundation_e.grdp    | 10 ++++++++++

 4 files changed, 18 insertions(+), 3 deletions(-)

 4 files changed, 18 insertions(+), 6 deletions(-)

 create mode 100644 chrome/browser/ui/android/strings/foundation_e.grdp

diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/android/java/res/xml/about_chrome_preferences.xml

         android:key="application_version"

         android:title="@string/application_version_title" />

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 b4db43786e475..6930f0e13e00c 100644

index 3e4f90d0d0c4d..c6ea3612cc83e 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

@@ -43,7 +43,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

     // Non-translated strings:

     @SuppressWarnings("InlineFormatString")

@@ -74,10 +74,10 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

@@ -74,12 +74,9 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

         p = findPreference(PREF_OS_VERSION);

         assumeNonNull(p);

         p.setSummary(AboutSettingsBridge.getOSVersion());

-        p = findPreference(PREF_LEGAL_INFORMATION);

+        p = findPreference(PREF_E_BROWSER_INFORMATION);

         assumeNonNull(p);

         int currentYear = CalendarFactory.get().get(Calendar.YEAR);

-        Calendar calendar = CalendarFactory.get();

-        calendar.setTimeInMillis(System.currentTimeMillis());

-        int currentYear = calendar.get(Calendar.YEAR);

-        p.setSummary(getString(R.string.legal_information_summary, currentYear));

+        p.setSummary(getString(R.string.e_browser_information));

     }

     @Override

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

index 25af84522a4ec..71c9dc78f6e9f 100644

index 4a844f52afd20..d6399b27e7efd 100644

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -202,6 +202,8 @@ CHAR_LIMIT guidelines: