diff options
author | Narayan Kamath <narayan@google.com> | 2014-10-01 11:30:55 +0100 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-10-02 09:50:25 +0000 |
commit | fb716cce89ee080907bb5d43dfc84a657e4e5282 (patch) | |
tree | 1a9a568a15b4a2e7ac858cb94a6ccc7b8258d1fe | |
parent | a5e918984692c683ec42bfc9cd33de96f3c6460b (diff) | |
download | messageformat-fb716cce89ee080907bb5d43dfc84a657e4e5282.tar.gz |
Sync messageformat.android-wear-5.0.0_r1android-l-preview_r2lollipop-wear-releasel-preview
- Updated to change 75130889.
- Also remove support for the host library, which can no longer
be built due to dependencies on android.content.*
Change-Id: I6e619463b8fa2b4acd91bd2f53239602bf8714f7
-rw-r--r-- | Android.mk | 17 | ||||
-rw-r--r-- | import.sh | 30 | ||||
-rw-r--r-- | java/com/android/messageformat/MessageFormat.java (renamed from src/com/android/messageformat/MessageFormat.java) | 30 | ||||
-rw-r--r-- | java/com/ibm/icu/impl/ICUConfig.java (renamed from src/com/ibm/icu/impl/ICUConfig.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/impl/ICUData.java (renamed from src/com/ibm/icu/impl/ICUData.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/impl/PatternProps.java (renamed from src/com/ibm/icu/impl/PatternProps.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/simple/LocaleElements_plurals.java (renamed from src/com/ibm/icu/simple/LocaleElements_plurals.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/simple/MessageFormat.java (renamed from src/com/ibm/icu/simple/MessageFormat.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/simple/PluralFormat.java (renamed from src/com/ibm/icu/simple/PluralFormat.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/simple/PluralRules.java (renamed from src/com/ibm/icu/simple/PluralRules.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/simple/PluralRulesLoader.java (renamed from src/com/ibm/icu/simple/PluralRulesLoader.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/text/MessagePattern.java (renamed from src/com/ibm/icu/text/MessagePattern.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/text/SelectFormat.java (renamed from src/com/ibm/icu/text/SelectFormat.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/util/Freezable.java (renamed from src/com/ibm/icu/util/Freezable.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/util/ICUCloneNotSupportedException.java (renamed from src/com/ibm/icu/util/ICUCloneNotSupportedException.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/util/ICUException.java (renamed from src/com/ibm/icu/util/ICUException.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/util/ICUUncheckedIOException.java (renamed from src/com/ibm/icu/util/ICUUncheckedIOException.java) | 0 | ||||
-rw-r--r-- | java/com/ibm/icu/util/Output.java (renamed from src/com/ibm/icu/util/Output.java) | 0 | ||||
-rw-r--r-- | javatests/com/android/messageformat/SimpleMessageFormatTest.java (renamed from tests/src/com/android/messageformat/SimpleMessageFormatTest.java) | 0 |
19 files changed, 49 insertions, 28 deletions
@@ -16,21 +16,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := messageformat -LOCAL_SDK_VERSION := 4 -LOCAL_SRC_FILES := $(call all-java-files-under, src/) +LOCAL_SRC_FILES := $(call all-java-files-under, java/) + include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := messageformat-tests -LOCAL_SDK_VERSION := 4 -LOCAL_STATIC_JAVA_LIBRARIES := messageformat -LOCAL_SRC_FILES := $(call all-java-files-under, tests/src/) +LOCAL_STATIC_JAVA_LIBRARIES := messageformat junit-targetdex +LOCAL_SRC_FILES := $(call all-java-files-under, javatests/) include $(BUILD_STATIC_JAVA_LIBRARY) - -# Also build a host side library -include $(CLEAR_VARS) - -LOCAL_MODULE := messageformat_host -LOCAL_SRC_FILES := $(call all-java-files-under, src/) - -include $(BUILD_HOST_JAVA_LIBRARY) @@ -1,17 +1,17 @@ #!/bin/bash TOP=$1 -mkdir -p src/com/ibm/icu/impl -mkdir -p src/com/ibm/icu/simple -mkdir -p src/com/ibm/icu/text -mkdir -p src/com/ibm/icu/util -cp ${TOP}/main/classes/core/src/com/ibm/icu/impl/PatternProps.java src/com/ibm/icu/impl -cp ${TOP}/main/classes/core/src/com/ibm/icu/impl/ICUConfig.java src/com/ibm/icu/impl -cp ${TOP}/main/classes/core/src/com/ibm/icu/impl/ICUData.java src/com/ibm/icu/impl -cp ${TOP}/main/classes/core/src/com/ibm/icu/simple/*.java src/com/ibm/icu/simple/ -cp ${TOP}/main/classes/core/src/com/ibm/icu/text/MessagePattern.java src/com/ibm/icu/text -cp ${TOP}/main/classes/core/src/com/ibm/icu/text/SelectFormat.java src/com/ibm/icu/text -cp ${TOP}/main/classes/core/src/com/ibm/icu/util/ICUUncheckedIOException.java src/com/ibm/icu/util -cp ${TOP}/main/classes/core/src/com/ibm/icu/util/ICUCloneNotSupportedException.java src/com/ibm/icu/util -cp ${TOP}/main/classes/core/src/com/ibm/icu/util/ICUException.java src/com/ibm/icu/util -cp ${TOP}/main/classes/core/src/com/ibm/icu/util/Output.java src/com/ibm/icu/util -cp ${TOP}/main/classes/core/src/com/ibm/icu/util/Freezable.java src/com/ibm/icu/util +mkdir -p java/com/ibm/icu/impl +mkdir -p java/com/ibm/icu/simple +mkdir -p java/com/ibm/icu/text +mkdir -p java/com/ibm/icu/util +cp ${TOP}/main/classes/core/src/com/ibm/icu/impl/PatternProps.java java/com/ibm/icu/impl +cp ${TOP}/main/classes/core/src/com/ibm/icu/impl/ICUConfig.java java/com/ibm/icu/impl +cp ${TOP}/main/classes/core/src/com/ibm/icu/impl/ICUData.java java/com/ibm/icu/impl +cp ${TOP}/main/classes/core/src/com/ibm/icu/simple/*.java java/com/ibm/icu/simple/ +cp ${TOP}/main/classes/core/src/com/ibm/icu/text/MessagePattern.java java/com/ibm/icu/text +cp ${TOP}/main/classes/core/src/com/ibm/icu/text/SelectFormat.java java/com/ibm/icu/text +cp ${TOP}/main/classes/core/src/com/ibm/icu/util/ICUUncheckedIOException.java java/com/ibm/icu/util +cp ${TOP}/main/classes/core/src/com/ibm/icu/util/ICUCloneNotSupportedException.java java/com/ibm/icu/util +cp ${TOP}/main/classes/core/src/com/ibm/icu/util/ICUException.java java/com/ibm/icu/util +cp ${TOP}/main/classes/core/src/com/ibm/icu/util/Output.java java/com/ibm/icu/util +cp ${TOP}/main/classes/core/src/com/ibm/icu/util/Freezable.java java/com/ibm/icu/util diff --git a/src/com/android/messageformat/MessageFormat.java b/java/com/android/messageformat/MessageFormat.java index a12b7ff..5e1a0f1 100644 --- a/src/com/android/messageformat/MessageFormat.java +++ b/java/com/android/messageformat/MessageFormat.java @@ -16,6 +16,8 @@ package com.android.messageformat; +import android.content.Context; + import java.util.Locale; public final class MessageFormat { @@ -32,6 +34,34 @@ public final class MessageFormat { return com.ibm.icu.simple.MessageFormat.formatNamedArgs(locale, msg, nameValuePairs); } + /** + * Formats a message pattern string for the default locale with a variable number of name/value + * pair arguments. + * Creates an ICU MessageFormat for Locale.getDefault() and pattern, + * and formats with the arguments. + * + * @param msg an ICU-MessageFormat-syntax string + * @param nameValuePairs (argument name, argument value) pairs + */ + public static final String formatNamedArgs(String msg, Object... nameValuePairs) { + return formatNamedArgs(Locale.getDefault(), msg, nameValuePairs); + } + + /** + * Formats a message pattern from Android resource for the default locale with a variable number + * of name/value pair arguments. + * Creates an ICU MessageFormat for Locale.getDefault() and pattern, + * and formats with the arguments. + * + * @param context Android context object + * @param id Android string resource ID representing ICU-MessageFormat-syntax string + * @param nameValuePairs (argument name, argument value) pairs + */ + public static final String formatNamedArgs(Context context, int id, Object... nameValuePairs) { + return formatNamedArgs(Locale.getDefault(), + context.getResources().getString(id), nameValuePairs); + } + // Non instantiable private MessageFormat() { } diff --git a/src/com/ibm/icu/impl/ICUConfig.java b/java/com/ibm/icu/impl/ICUConfig.java index b875286..b875286 100644 --- a/src/com/ibm/icu/impl/ICUConfig.java +++ b/java/com/ibm/icu/impl/ICUConfig.java diff --git a/src/com/ibm/icu/impl/ICUData.java b/java/com/ibm/icu/impl/ICUData.java index b47b278..b47b278 100644 --- a/src/com/ibm/icu/impl/ICUData.java +++ b/java/com/ibm/icu/impl/ICUData.java diff --git a/src/com/ibm/icu/impl/PatternProps.java b/java/com/ibm/icu/impl/PatternProps.java index 7da0f4c..7da0f4c 100644 --- a/src/com/ibm/icu/impl/PatternProps.java +++ b/java/com/ibm/icu/impl/PatternProps.java diff --git a/src/com/ibm/icu/simple/LocaleElements_plurals.java b/java/com/ibm/icu/simple/LocaleElements_plurals.java index 31161a3..31161a3 100644 --- a/src/com/ibm/icu/simple/LocaleElements_plurals.java +++ b/java/com/ibm/icu/simple/LocaleElements_plurals.java diff --git a/src/com/ibm/icu/simple/MessageFormat.java b/java/com/ibm/icu/simple/MessageFormat.java index 0a883dd..0a883dd 100644 --- a/src/com/ibm/icu/simple/MessageFormat.java +++ b/java/com/ibm/icu/simple/MessageFormat.java diff --git a/src/com/ibm/icu/simple/PluralFormat.java b/java/com/ibm/icu/simple/PluralFormat.java index 67debd7..67debd7 100644 --- a/src/com/ibm/icu/simple/PluralFormat.java +++ b/java/com/ibm/icu/simple/PluralFormat.java diff --git a/src/com/ibm/icu/simple/PluralRules.java b/java/com/ibm/icu/simple/PluralRules.java index ab0039d..ab0039d 100644 --- a/src/com/ibm/icu/simple/PluralRules.java +++ b/java/com/ibm/icu/simple/PluralRules.java diff --git a/src/com/ibm/icu/simple/PluralRulesLoader.java b/java/com/ibm/icu/simple/PluralRulesLoader.java index 23383ea..23383ea 100644 --- a/src/com/ibm/icu/simple/PluralRulesLoader.java +++ b/java/com/ibm/icu/simple/PluralRulesLoader.java diff --git a/src/com/ibm/icu/text/MessagePattern.java b/java/com/ibm/icu/text/MessagePattern.java index 228a292..228a292 100644 --- a/src/com/ibm/icu/text/MessagePattern.java +++ b/java/com/ibm/icu/text/MessagePattern.java diff --git a/src/com/ibm/icu/text/SelectFormat.java b/java/com/ibm/icu/text/SelectFormat.java index c062744..c062744 100644 --- a/src/com/ibm/icu/text/SelectFormat.java +++ b/java/com/ibm/icu/text/SelectFormat.java diff --git a/src/com/ibm/icu/util/Freezable.java b/java/com/ibm/icu/util/Freezable.java index 4cf37dd..4cf37dd 100644 --- a/src/com/ibm/icu/util/Freezable.java +++ b/java/com/ibm/icu/util/Freezable.java diff --git a/src/com/ibm/icu/util/ICUCloneNotSupportedException.java b/java/com/ibm/icu/util/ICUCloneNotSupportedException.java index 7be1b91..7be1b91 100644 --- a/src/com/ibm/icu/util/ICUCloneNotSupportedException.java +++ b/java/com/ibm/icu/util/ICUCloneNotSupportedException.java diff --git a/src/com/ibm/icu/util/ICUException.java b/java/com/ibm/icu/util/ICUException.java index e37a97b..e37a97b 100644 --- a/src/com/ibm/icu/util/ICUException.java +++ b/java/com/ibm/icu/util/ICUException.java diff --git a/src/com/ibm/icu/util/ICUUncheckedIOException.java b/java/com/ibm/icu/util/ICUUncheckedIOException.java index fd2a162..fd2a162 100644 --- a/src/com/ibm/icu/util/ICUUncheckedIOException.java +++ b/java/com/ibm/icu/util/ICUUncheckedIOException.java diff --git a/src/com/ibm/icu/util/Output.java b/java/com/ibm/icu/util/Output.java index 2f40475..2f40475 100644 --- a/src/com/ibm/icu/util/Output.java +++ b/java/com/ibm/icu/util/Output.java diff --git a/tests/src/com/android/messageformat/SimpleMessageFormatTest.java b/javatests/com/android/messageformat/SimpleMessageFormatTest.java index e132b14..e132b14 100644 --- a/tests/src/com/android/messageformat/SimpleMessageFormatTest.java +++ b/javatests/com/android/messageformat/SimpleMessageFormatTest.java |