Code drop from //branches/cupcake/...@124589

10 files changed, 89 insertions, 2 deletions

diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 299cdd4..a8abf8b 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -22,8 +22,11 @@ copy_from :=                \
     DroidSerif-Bold.ttf     \
     DroidSerif-Italic.ttf   \
     DroidSerif-BoldItalic.ttf   \
-    DroidSansMono.ttf       \
-    DroidSansFallback.ttf
+    DroidSansMono.ttf
+
+ifneq ($(NO_FALLBACK_FONT),true)
+    copy_from += DroidSansFallback.ttf
+endif
 
 copy_to := $(addprefix $(TARGET_OUT)/fonts/,$(copy_from))
 
diff --git a/data/fonts/DroidSans-Bold.ttf b/data/fonts/DroidSans-Bold.ttf
index fc60df4..7ac04b6 100644
--- a/data/fonts/DroidSans-Bold.ttf
+++ b/data/fonts/DroidSans-Bold.ttf
diff --git a/data/fonts/DroidSans.ttf b/data/fonts/DroidSans.ttf
index 458ba59..2537cc3 100644
--- a/data/fonts/DroidSans.ttf
+++ b/data/fonts/DroidSans.ttf
diff --git a/data/fonts/DroidSansFallback.ttf b/data/fonts/DroidSansFallback.ttf
index 38b5b1a..61460b1 100755
--- a/data/fonts/DroidSansFallback.ttf
+++ b/data/fonts/DroidSansFallback.ttf
diff --git a/data/fonts/DroidSansMono.ttf b/data/fonts/DroidSansMono.ttf
index 4546611..6e79dad 100644
--- a/data/fonts/DroidSansMono.ttf
+++ b/data/fonts/DroidSansMono.ttf
diff --git a/data/fonts/DroidSerif-Bold.ttf b/data/fonts/DroidSerif-Bold.ttf
index b6add0e..85d6c6b 100644
--- a/data/fonts/DroidSerif-Bold.ttf
+++ b/data/fonts/DroidSerif-Bold.ttf
diff --git a/data/fonts/DroidSerif-BoldItalic.ttf b/data/fonts/DroidSerif-BoldItalic.ttf
index 921434f..9d8e798 100644
--- a/data/fonts/DroidSerif-BoldItalic.ttf
+++ b/data/fonts/DroidSerif-BoldItalic.ttf
diff --git a/data/fonts/DroidSerif-Italic.ttf b/data/fonts/DroidSerif-Italic.ttf
index 1ef1f75..6acc86d 100644
--- a/data/fonts/DroidSerif-Italic.ttf
+++ b/data/fonts/DroidSerif-Italic.ttf
diff --git a/data/fonts/DroidSerif-Regular.ttf b/data/fonts/DroidSerif-Regular.ttf
index 239ba38..8c1c2c4 100644
--- a/data/fonts/DroidSerif-Regular.ttf
+++ b/data/fonts/DroidSerif-Regular.ttf
diff --git a/data/localization/import-from-xtb b/data/localization/import-from-xtb
new file mode 100755
index 0000000..37020cf
--- /dev/null
+++ b/data/localization/import-from-xtb
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+locale=de
+
+extract()
+{
+    module=$1
+    shift
+
+    P4PORT=perforce1:1666 p4 print -q //depot/google3/googledata/transconsole/xtb/$module/$locale.xtb > $module-$locale.xtb
+
+    files=$(
+        for i in $3
+        do
+            find $i -name '*.xml' -print0 |
+            xargs -0 grep -l '<string' |
+            grep -v -e '-[a-z][a-z]/' |
+            grep -v -e '-[a-z][a-z]-' |
+            grep -v -e '-r[A-Z][A-Z]/' |
+            grep -v -e '-r[A-Z][A-Z]-'
+        done
+    )
+
+    for i in $files
+    do
+        out=$(
+            perl -e '
+                $file = $ARGV[0];
+                $locale = $ARGV[1];
+
+                $file =~ /^(.*)\/values([^\/]*)\/(.*)/;
+                $prefix = $1;
+                $values = $2;
+                $suffix = $3;
+
+                if ($values =~ /^(-mcc[^-]*)*(-mnc[^-]*)*(.*)$/) {
+                    print "$prefix/values$1$2-$locale$3/$suffix\n";
+                } else {
+                    print "$prefix/values-$locale$values/$suffix\n";
+                }
+            ' $i $locale
+        )
+
+        p4 edit $out
+        p4 add $out
+        mkdir -p `dirname $out`
+        ../../../../out/host/linux-x86/bin/transconsole -m $1 $2 -p $module -i $module-$locale.xtb $i > $out
+    done
+}
+
+extract AndroidAlarmClock ../../../../packages/apps/AlarmClock ../../apps/AlarmClock ../../../../packages/apps/AlarmClock
+extract AndroidBrowser ../../../../packages/apps/Browser ../../apps/Browser ../../../../packages/apps/Browser
+extract AndroidCalculator ../../../../packages/apps/Calculator ../../apps/Calculator ../../../../packages/apps/Calculator
+extract AndroidCalendar ../../../../packages/apps/Calendar ../../apps/Calendar ../../../../packages/apps/Calendar
+extract AndroidCamera ../../../../packages/apps/Camera ../../apps/Camera ../../../../packages/apps/Camera
+extract AndroidContacts ../../../../packages/apps/Contacts ../../apps/Contacts ../../../../packages/apps/Contacts
+extract AndroidDownloads ../../../../packages/providers/DownloadProvider ../../content/providers/downloads ../../../../packages/providers/DownloadProvider
+extract AndroidDrm ../../../../packages/providers/DrmProvider ../../content/providers/drm ../../../../packages/providers/DrmProvider
+extract AndroidEmail ../../../../packages/apps/Email ../../apps/Email ../../../../packages/apps/Email
+extract AndroidFallback ../../../../development/apps/Fallback ../../apps/Fallback ../../../../development/apps/Fallback
+extract AndroidGmail ../../../../vendor ../../partner ../../../../vendor/google/providers/gmail
+extract AndroidGmail ../../../../vendor ../../partner ../../../../vendor/google/apps/Gmail
+extract AndroidGoogleApps ../../../../vendor ../../partner ../../../../vendor/google/apps/GoogleApps
+extract AndroidGoogleSearch ../../../../packages/apps/GoogleSearch ../../apps/GoogleSearch ../../../../packages/apps/GoogleSearch
+extract AndroidHome ../../../../packages/apps/Launcher ../../apps/Home ../../../../packages/apps/Launcher
+extract AndroidIM ../../../../packages/apps/IM ../../apps/IM ../../../../packages/apps/IM
+extract AndroidMaps ../../../../vendor ../../partner ../../../../vendor/google/apps/Maps
+extract AndroidMaps ../../../../vendor ../../partner ../../../../vendor/google/apps/Street
+extract AndroidMms ../../../../packages/apps/Mms ../../apps/Mms ../../../../packages/apps/Mms
+extract AndroidMusic ../../../../packages/apps/Music ../../apps/Music ../../../../packages/apps/Music
+extract AndroidPhone ../../../../packages/apps/Phone ../../apps/Phone ../../../../packages/apps/Phone
+extract AndroidPlatform ../../../../frameworks/base/core/res ../../apps/common ../../../../frameworks/base/core/res
+extract AndroidSettings ../../../../packages/apps/Settings ../../apps/Settings ../../../../packages/apps/Settings
+extract AndroidSetupWizard ../../../../vendor ../../partner ../../../../vendor/google/apps/SetupWizard
+extract AndroidSoundRecorder ../../../../packages/apps/SoundRecorder ../../apps/SoundRecorder ../../../../packages/apps/SoundRecorder
+extract AndroidStk ../../../../packages/apps/Stk ../../apps/Stk ../../../../packages/apps/Stk
+extract AndroidSync ../../../../packages/apps/Sync ../../apps/Sync ../../../../packages/apps/Sync
+extract AndroidTalk ../../../../vendor ../../partner ../../../../vendor/google/apps/Talk
+extract AndroidUpdater ../../../../packages/apps/Updater ../../apps/Updater ../../../../packages/apps/Updater
+extract AndroidVending ../../../../vendor ../../partner ../../../../vendor/google/apps/Vending
+extract AndroidVoiceDialer ../../../../packages/apps/VoiceDialer ../../apps/VoiceDialer ../../../../packages/apps/VoiceDialer
+extract AndroidYoutube ../../../../vendor ../../partner ../../../../vendor/google/apps/YouTube
+
+exit 0