aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2012-03-21 09:20:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-21 09:20:16 -0700
commit96b05034d59aa7a85a88daea3e92afb6dbdb4924 (patch)
tree195acce7a44e5b3383742f0eb33954f99e373507 /java
parent7ac556216d4411cbc5e0f22143bf7ea776b30693 (diff)
parent4216350a2a2d7be80b644d7f074b0bc077d38700 (diff)
downloadlatinime-96b05034d59aa7a85a88daea3e92afb6dbdb4924.tar.gz
latinime-96b05034d59aa7a85a88daea3e92afb6dbdb4924.tar.xz
latinime-96b05034d59aa7a85a88daea3e92afb6dbdb4924.zip
Merge "Move locale-specific configuration out of config.xml."
Diffstat (limited to 'java')
-rw-r--r--java/res/values-de/donottranslate-config.xml (renamed from java/res/values-de/config.xml)0
-rw-r--r--java/res/values/config.xml1
-rw-r--r--java/res/values/donottranslate-config.xml23
3 files changed, 23 insertions, 1 deletions
diff --git a/java/res/values-de/config.xml b/java/res/values-de/donottranslate-config.xml
index 272ff326f..272ff326f 100644
--- a/java/res/values-de/config.xml
+++ b/java/res/values-de/donottranslate-config.xml
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index c51800fb0..cccec635e 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -98,5 +98,4 @@
4 = ?
-->
<integer name="log_screen_metrics">0</integer>
- <bool name="config_require_umlaut_processing">false</bool>
</resources>
diff --git a/java/res/values/donottranslate-config.xml b/java/res/values/donottranslate-config.xml
new file mode 100644
index 000000000..9b94272e2
--- /dev/null
+++ b/java/res/values/donottranslate-config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <bool name="config_require_umlaut_processing">false</bool>
+</resources>