Redo Autofill wallet preferences on Android.

chrome/app/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//tools/grit/grit_rule.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
   android_generated_java_resources = [
     "java/res/values-am/generated_resources.xml",
@@ skipping 34 matching lines @@
     "java/res/values-sw/generated_resources.xml",
     "java/res/values-th/generated_resources.xml",
     "java/res/values-tl/generated_resources.xml",
     "java/res/values-tr/generated_resources.xml",
     "java/res/values-uk/generated_resources.xml",
     "java/res/values-vi/generated_resources.xml",
     "java/res/values-zh-rCN/generated_resources.xml",
     "java/res/values-zh-rTW/generated_resources.xml",
     "java/res/values/generated_resources.xml",
   ]
+
+  android_google_chrome_strings = [

[newt (away), 2015/03/18 04:31:45]

You'll need a GYP change too for this. Also, the dependencies here don't look
complete to me. What will cause chrome_java to be compiled when
google_chrome_strings.grd changes?

Though I'm not sure that it's worth adding this additional build complexity to
be able to share a couple strings with chromium/google_chrome_strings.grd.
Unless we plan to share a lot of strings in the future, I'd probably avoid this.

[Evan Stade, 2015/03/19 00:24:23]

Hmm, I guess I can remove these changes, but I don't understand why we seem to
use the Chrome terminology even in Chromium on android.

[newt (away), 2015/03/19 01:41:42]

I'd like to change this, but do so in a way that doesn't require duplicating
each string that contains "Chrome".

[Evan Stade, 2015/03/20 00:14:56]

If you're planning to use placeholders, I think that's fraught with peril in
terms of translation quality. Desktop Chrome does duplicate strings with
"Chrome"/"Chromium" after moving away from the use of placeholders.

[newt (away), 2015/03/20 00:53:45]

The placeholder solution could be done in a way that doesn't affect
translations, by e.g. replacing the placeholder with "Chrome" before sending it
to the translators, so the translators would see a placeholder-less string. This
wouldn't provide translations for Chromium, but those could be provided by
anyone who wanted to provide them.

+    "java/res/values-am/google_chrome_strings.xml",
+    "java/res/values-ar/google_chrome_strings.xml",
+    "java/res/values-bg/google_chrome_strings.xml",
+    "java/res/values-ca/google_chrome_strings.xml",
+    "java/res/values-cs/google_chrome_strings.xml",
+    "java/res/values-da/google_chrome_strings.xml",
+    "java/res/values-de/google_chrome_strings.xml",
+    "java/res/values-el/google_chrome_strings.xml",
+    "java/res/values-en-rGB/google_chrome_strings.xml",
+    "java/res/values-es-rUS/google_chrome_strings.xml",
+    "java/res/values-es/google_chrome_strings.xml",
+    "java/res/values-fa/google_chrome_strings.xml",
+    "java/res/values-fi/google_chrome_strings.xml",
+    "java/res/values-fr/google_chrome_strings.xml",
+    "java/res/values-hi/google_chrome_strings.xml",
+    "java/res/values-hr/google_chrome_strings.xml",
+    "java/res/values-hu/google_chrome_strings.xml",
+    "java/res/values-in/google_chrome_strings.xml",
+    "java/res/values-it/google_chrome_strings.xml",
+    "java/res/values-iw/google_chrome_strings.xml",
+    "java/res/values-ja/google_chrome_strings.xml",
+    "java/res/values-ko/google_chrome_strings.xml",
+    "java/res/values-lt/google_chrome_strings.xml",
+    "java/res/values-lv/google_chrome_strings.xml",
+    "java/res/values-nb/google_chrome_strings.xml",
+    "java/res/values-nl/google_chrome_strings.xml",
+    "java/res/values-pl/google_chrome_strings.xml",
+    "java/res/values-pt-rBR/google_chrome_strings.xml",
+    "java/res/values-pt-rPT/google_chrome_strings.xml",
+    "java/res/values-ro/google_chrome_strings.xml",
+    "java/res/values-ru/google_chrome_strings.xml",
+    "java/res/values-sk/google_chrome_strings.xml",
+    "java/res/values-sl/google_chrome_strings.xml",
+    "java/res/values-sr/google_chrome_strings.xml",
+    "java/res/values-sv/google_chrome_strings.xml",
+    "java/res/values-sw/google_chrome_strings.xml",
+    "java/res/values-th/google_chrome_strings.xml",
+    "java/res/values-tl/google_chrome_strings.xml",
+    "java/res/values-tr/google_chrome_strings.xml",
+    "java/res/values-uk/google_chrome_strings.xml",
+    "java/res/values-vi/google_chrome_strings.xml",
+    "java/res/values-zh-rCN/google_chrome_strings.xml",
+    "java/res/values-zh-rTW/google_chrome_strings.xml",
+    "java/res/values/google_chrome_strings.xml",
+  ]
+
+  android_chromium_strings = [
+    "java/res/values-am/chromium_strings.xml",
+    "java/res/values-ar/chromium_strings.xml",
+    "java/res/values-bg/chromium_strings.xml",
+    "java/res/values-ca/chromium_strings.xml",
+    "java/res/values-cs/chromium_strings.xml",
+    "java/res/values-da/chromium_strings.xml",
+    "java/res/values-de/chromium_strings.xml",
+    "java/res/values-el/chromium_strings.xml",
+    "java/res/values-en-rGB/chromium_strings.xml",
+    "java/res/values-es-rUS/chromium_strings.xml",
+    "java/res/values-es/chromium_strings.xml",
+    "java/res/values-fa/chromium_strings.xml",
+    "java/res/values-fi/chromium_strings.xml",
+    "java/res/values-fr/chromium_strings.xml",
+    "java/res/values-hi/chromium_strings.xml",
+    "java/res/values-hr/chromium_strings.xml",
+    "java/res/values-hu/chromium_strings.xml",
+    "java/res/values-in/chromium_strings.xml",
+    "java/res/values-it/chromium_strings.xml",
+    "java/res/values-iw/chromium_strings.xml",
+    "java/res/values-ja/chromium_strings.xml",
+    "java/res/values-ko/chromium_strings.xml",
+    "java/res/values-lt/chromium_strings.xml",
+    "java/res/values-lv/chromium_strings.xml",
+    "java/res/values-nb/chromium_strings.xml",
+    "java/res/values-nl/chromium_strings.xml",
+    "java/res/values-pl/chromium_strings.xml",
+    "java/res/values-pt-rBR/chromium_strings.xml",
+    "java/res/values-pt-rPT/chromium_strings.xml",
+    "java/res/values-ro/chromium_strings.xml",
+    "java/res/values-ru/chromium_strings.xml",
+    "java/res/values-sk/chromium_strings.xml",
+    "java/res/values-sl/chromium_strings.xml",
+    "java/res/values-sr/chromium_strings.xml",
+    "java/res/values-sv/chromium_strings.xml",
+    "java/res/values-sw/chromium_strings.xml",
+    "java/res/values-th/chromium_strings.xml",
+    "java/res/values-tl/chromium_strings.xml",
+    "java/res/values-tr/chromium_strings.xml",
+    "java/res/values-uk/chromium_strings.xml",
+    "java/res/values-vi/chromium_strings.xml",
+    "java/res/values-zh-rCN/chromium_strings.xml",
+    "java/res/values-zh-rTW/chromium_strings.xml",
+    "java/res/values/chromium_strings.xml",
+  ]
 }
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings
 #              (generate_generated_resources action)
 grit("generated_resources") {
   source = "generated_resources.grd"
   output_dir = "$root_gen_dir/chrome"
   use_qualified_include = true
   outputs = [
     "grit/generated_resources.h",
@@ skipping 151 matching lines @@
     "google_chrome_strings_ta.pak",
     "google_chrome_strings_te.pak",
     "google_chrome_strings_th.pak",
     "google_chrome_strings_tr.pak",
     "google_chrome_strings_uk.pak",
     "google_chrome_strings_vi.pak",
     "google_chrome_strings_zh-CN.pak",
     "google_chrome_strings_zh-TW.pak",
     "google_chrome_strings_fake-bidi.pak",
   ]
+
+  if (is_android) {
+    outputs += android_google_chrome_strings
+  }
 }
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings
 #              (generate_chromium_strings action)
 grit("chromium_strings") {
   source = "chromium_strings.grd"
   output_dir = "$root_gen_dir/chrome"
   use_qualified_include = true
   outputs = [
     "grit/chromium_strings.h",
@@ skipping 45 matching lines @@
     "chromium_strings_sw.pak",
     "chromium_strings_ta.pak",
     "chromium_strings_te.pak",
     "chromium_strings_th.pak",
     "chromium_strings_tr.pak",
     "chromium_strings_uk.pak",
     "chromium_strings_vi.pak",
     "chromium_strings_zh-CN.pak",
     "chromium_strings_zh-TW.pak",
   ]
+
+  if (is_android) {
+    outputs += android_chromium_strings
+  }
 }
 
 source_set("test_support") {
   testonly = true
   visibility = [ "//chrome/test:test_support" ]
 
   sources = [
     "chrome_main_delegate.cc",
     "chrome_main_delegate.h",
     "close_handle_hook_win.cc",
@@ skipping 18 matching lines @@
   }
 
   if (enable_plugins && enable_nacl) {
     deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
   }
 
   if (enable_remoting) {
     deps += [ "//remoting/client/plugin" ]
   }
 }