Fix build issue

From: Romain HUNAULT <romain.hunault@e.email>

Date: Wed, 6 Feb 2019 17:23:37 +0100

Date: Wed, 6 Feb 2019 19:38:00 +0100

Subject: [PATCH] Add /e/ browser informations in About

---

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

 .../chrome/browser/preferences/AboutChromePreferences.java  | 4 +++-

 chrome/android/java/strings/android_chrome_strings.grd      | 6 ++++++

 3 files changed, 12 insertions(+), 1 deletion(-)

 .../browser/preferences/AboutChromePreferences.java      | 6 +++---

 chrome/android/java/strings/android_chrome_strings.grd   | 9 ++++++---

 3 files changed, 12 insertions(+), 6 deletions(-)

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

index e1ddc3099473..9424e04f1cd0 100644

         android:key="application_version"

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

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java

index 4fa819207e98..926edcfdbe44 100644

index 4fa819207e98..9be9571ed589 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java

@@ -26,6 +26,7 @@ public class AboutChromePreferences extends PreferenceFragment {

     @Override

     public void onCreate(Bundle savedInstanceState) {

@@ -41,7 +42,8 @@ public class AboutChromePreferences extends PreferenceFragment {

@@ -39,9 +40,8 @@ public class AboutChromePreferences extends PreferenceFragment {

         p.setSummary(getApplicationVersion(getActivity(), versionStrings.getApplicationVersion()));

         p = findPreference(PREF_OS_VERSION);

         p.setSummary(versionStrings.getOSVersion());

         p = findPreference(PREF_LEGAL_INFORMATION);

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

-        p = findPreference(PREF_LEGAL_INFORMATION);

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

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

+        p = findPreference(PREF_E_BROWSER_INFORMATIONS);

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

     /**

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

index 1cb432938492..40fc0e740d8c 100644

index 1cb432938492..9ec3d879b6e9 100644

--- a/chrome/android/java/strings/android_chrome_strings.grd

+++ b/chrome/android/java/strings/android_chrome_strings.grd

@@ -1509,6 +1509,12 @@ Your Google account may have other forms of browsing history like searches and a

@@ -1494,9 +1494,6 @@ Your Google account may have other forms of browsing history like searches and a

       <message name="IDS_PREFS_ABOUT_CHROME" desc="Title for the About Chrome page. [CHAR-LIMIT=32]">

         About Chrome

       </message>

-      <message name="IDS_LEGAL_INFORMATION_SUMMARY" desc="Summary for legal information" meaning="Android">

-        Copyright <ph name="year">%1$d<ex>2014</ex></ph> Google Inc. All rights reserved.

-      </message>

       <message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">

         Application version

       </message>

@@ -1509,6 +1506,12 @@ Your Google account may have other forms of browsing history like searches and a

       <message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">

         Chrome updates are no longer supported for this version of Android

       </message>