Import translations. DO NOT MERGE am: 5ff2344628 -s ours am: c73fab9968 -s ours am: 26f69ab9c9 -s ours
am: 93220f8d19 -s ours
Change-Id: If494f0e64891540d5ed92711075462d3673efd23
diff --git a/Android.mk b/Android.mk
index 994be22..5ae29d4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,14 +16,15 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libchips
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-compat \
+ android-support-annotations
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-logtags-files-under, src)
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
+LOCAL_USE_AAPT2 := true
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_STATIC_JAVA_LIBRARY)
##################################################
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 9a200b1..a1dbb3b 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -23,7 +23,7 @@
<string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"যোগাযোগের পরামর্শগুলি খোলা হয়েছে"</string>
<string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"কোনো প্রস্তাবনা উপলব্ধ নেই"</string>
<string name="dropdown_delete_button_desc" msgid="8506791557733906887">"প্রাপকদের কাছ থেকে <xliff:g id="CONTACT">%s</xliff:g> সরান"</string>
- <string name="chips_action_copy" msgid="1929144660075507103">"প্রতিলিপি করুন"</string>
+ <string name="chips_action_copy" msgid="1929144660075507103">"কপি করুন"</string>
<string name="chips_action_cancel" msgid="6077877438943543501">"বাতিল করুন"</string>
<string name="chips_permission_text" msgid="1978301259208877495">"পরিচিতিগুলির প্রস্তাবনায় অনুমতি দিন"</string>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..cb09e46
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="copy_email" msgid="7869435992461603532">"Copy email address"</string>
+ <string name="copy_number" msgid="530057841276106843">"Copy phone number"</string>
+ <string name="action_label" msgid="1318401633653605424">"Return"</string>
+ <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"Contact suggestions opened"</string>
+ <string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"No suggestions available"</string>
+ <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"Remove <xliff:g id="CONTACT">%s</xliff:g> from recipients"</string>
+ <string name="chips_action_copy" msgid="1929144660075507103">"Copy"</string>
+ <string name="chips_action_cancel" msgid="6077877438943543501">"Cancel"</string>
+ <string name="chips_permission_text" msgid="1978301259208877495">"Allow contacts suggestions"</string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..4100f43
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="copy_email" msgid="7869435992461603532">"Copy email address"</string>
+ <string name="copy_number" msgid="530057841276106843">"Copy phone number"</string>
+ <string name="action_label" msgid="1318401633653605424">"Return"</string>
+ <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"Contact suggestions opened"</string>
+ <string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"No suggestions available"</string>
+ <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"Remove <xliff:g id="CONTACT">%s</xliff:g> from recipients"</string>
+ <string name="chips_action_copy" msgid="1929144660075507103">"Copy"</string>
+ <string name="chips_action_cancel" msgid="6077877438943543501">"Cancel"</string>
+ <string name="chips_permission_text" msgid="1978301259208877495">"Allow contacts suggestions"</string>
+</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 9c5823e..062c39d 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -22,7 +22,7 @@
<string name="action_label" msgid="1318401633653605424">"परत"</string>
<string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"संपर्क सूचना उघडल्या"</string>
<string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"कोणत्याही सूचना उपलब्ध नाहीत"</string>
- <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"प्राप्तकर्त्यांमधून <xliff:g id="CONTACT">%s</xliff:g> काढा"</string>
+ <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"मिळवणाऱ्यांमधून <xliff:g id="CONTACT">%s</xliff:g> काढा"</string>
<string name="chips_action_copy" msgid="1929144660075507103">"कॉपी करा"</string>
<string name="chips_action_cancel" msgid="6077877438943543501">"रद्द करा"</string>
<string name="chips_permission_text" msgid="1978301259208877495">"संपर्क सूचनांना अनुमती द्या"</string>
diff --git a/sample/Android.mk b/sample/Android.mk
index dd35ec3..a572bff 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -14,10 +14,6 @@
LOCAL_PATH:= $(call my-dir)
-# Include res dir from chips
-chips_dir := ../res
-local_res_dirs := res $(chips_dir)
-
##################################################
# Build APK
include $(CLEAR_VARS)
@@ -25,15 +21,17 @@
src_dirs := src
LOCAL_PACKAGE_NAME := libChipsSample
-LOCAL_STATIC_JAVA_LIBRARIES += libchips
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ libchips \
+ android-support-compat \
+ android-support-annotations
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-logtags-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(local_res_dirs)) $(LOCAL_PATH)/../../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:android.support.compat
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_USE_AAPT2 := true
include $(BUILD_PACKAGE)
diff --git a/sample/res/values-en-rCA/strings.xml b/sample/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..8cf71de
--- /dev/null
+++ b/sample/res/values-en-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2013 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="email_addresses" msgid="5320415175940315400">"Email Addresses"</string>
+ <string name="phone_numbers" msgid="7836326833170390688">"Phone Numbers"</string>
+</resources>
diff --git a/sample/res/values-en-rXC/strings.xml b/sample/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..333f7cd
--- /dev/null
+++ b/sample/res/values-en-rXC/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2013 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="email_addresses" msgid="5320415175940315400">"Email Addresses"</string>
+ <string name="phone_numbers" msgid="7836326833170390688">"Phone Numbers"</string>
+</resources>
