Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I02d279e082ea69ca25954d0f21d64859ec15e04d
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4b66ea0
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,28 @@
+// 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.
+
+android_library {
+ name: "libchips",
+ static_libs: [
+ "android-support-annotations",
+ "android-support-compat",
+ ],
+ sdk_version: "current",
+ srcs: [
+ "src/**/*.java",
+ "src/**/*.logtags",
+ ],
+
+ resource_dirs: ["res"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index f7e810d..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libchips
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-annotations
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-compat
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src) \
- $(call all-logtags-files-under, src)
-LOCAL_USE_AAPT2 := true
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-##################################################
-# Build all sub-directories
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bfc1073..8a52c5a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
android:versionCode="1">
<uses-sdk
- android:minSdkVersion="11"
+ android:minSdkVersion="14"
android:targetSdkVersion="19" />
<application />
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 91e424c..1f62542 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -21,9 +21,14 @@
<string name="copy_number" msgid="530057841276106843">"ফ\'ন নম্বৰ প্ৰতিলিপি কৰক"</string>
<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="chips_action_copy" msgid="1929144660075507103">"প্ৰতিলিপি কৰক"</string>
- <string name="chips_action_cancel" msgid="6077877438943543501">"বাতিল কৰক"</string>
- <string name="chips_permission_text" msgid="1978301259208877495">"সম্পর্কসূচীৰ পৰামর্শসমূহৰ বাবে অনুমতি দিয়ক"</string>
+ <!-- no translation found for accessbility_suggestion_dropdown_closed (5545766162855459747) -->
+ <skip />
+ <!-- no translation found for dropdown_delete_button_desc (8506791557733906887) -->
+ <skip />
+ <!-- no translation found for chips_action_copy (1929144660075507103) -->
+ <skip />
+ <!-- no translation found for chips_action_cancel (6077877438943543501) -->
+ <skip />
+ <!-- no translation found for chips_permission_text (1978301259208877495) -->
+ <skip />
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ab7c560..b8a50c9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,7 +17,7 @@
<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">"کپی نشانی رایانامه"</string>
+ <string name="copy_email" msgid="7869435992461603532">"کپی نشانی ایمیل"</string>
<string name="copy_number" msgid="530057841276106843">"کپی شماره تلفن"</string>
<string name="action_label" msgid="1318401633653605424">"بازگشت"</string>
<string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"پیشنهادات مخاطب باز شد"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7eed0d3..be05820 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -21,9 +21,11 @@
<string name="copy_number" msgid="530057841276106843">"ଫୋନ୍ ନମ୍ବର କପୀ କରନ୍ତୁ"</string>
<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>
+ <!-- no translation found for accessbility_suggestion_dropdown_closed (5545766162855459747) -->
+ <skip />
<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>
+ <!-- no translation found for chips_permission_text (1978301259208877495) -->
+ <skip />
</resources>
diff --git a/sample/Android.bp b/sample/Android.bp
new file mode 100644
index 0000000..2502650
--- /dev/null
+++ b/sample/Android.bp
@@ -0,0 +1,34 @@
+// 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.
+
+//#################################################
+// Build APK
+
+android_app {
+ name: "libChipsSample",
+
+ static_libs: [
+ "android-support-annotations",
+ "libchips",
+ "android-support-compat",
+ ],
+
+ sdk_version: "current",
+
+ srcs: [
+ "src/**/*.java",
+ "src/**/*.logtags",
+ ],
+ resource_dirs: ["res"],
+}
diff --git a/sample/Android.mk b/sample/Android.mk
deleted file mode 100644
index e07caa5..0000000
--- a/sample/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-##################################################
-# Build APK
-include $(CLEAR_VARS)
-
-src_dirs := src
-LOCAL_PACKAGE_NAME := libChipsSample
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-annotations
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- libchips \
- android-support-compat
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- $(call all-logtags-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_USE_AAPT2 := true
-
-include $(BUILD_PACKAGE)
-
-
-##################################################
-# Build all sub-directories
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/sample/res/values-fa/strings.xml b/sample/res/values-fa/strings.xml
index 049d4cc..d31e347 100644
--- a/sample/res/values-fa/strings.xml
+++ b/sample/res/values-fa/strings.xml
@@ -16,6 +16,6 @@
<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">"آدرسهای رایانامه"</string>
+ <string name="email_addresses" msgid="5320415175940315400">"آدرسهای ایمیل"</string>
<string name="phone_numbers" msgid="7836326833170390688">"شماره تلفنها"</string>
</resources>
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..cba57fa
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,27 @@
+// 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.
+
+android_test {
+ name: "libChipsTests",
+
+ srcs: ["src/**/*.java"],
+
+ sdk_version: "current",
+ certificate: "platform",
+ static_libs: [
+ "libchips",
+ "junit",
+ ],
+ libs: ["android.test.base.stubs"],
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 4a6ade6..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := libChipsTests
-LOCAL_MODULE_TAGS := tests
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_STATIC_JAVA_LIBRARIES := libchips junit
-LOCAL_JAVA_LIBRARIES := android.test.base.stubs
-LOCAL_RESOURCE_DIR := frameworks/opt/chips/res/
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
-
-include $(BUILD_PACKAGE)
-
