DO NOT MERGE - Mark RQ3A.210410.001 as merged
Bug: 190855093
Merged-In: Ib5a7173764ba390f9aaaf38dd8bbbbac6bb028a8
Change-Id: I9ed0d234498f34217ed39bcad95e987921ee872f
diff --git a/Android.bp b/Android.bp
index afa528c..e0a12cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_library {
name: "libchips",
static_libs: [
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b28e3de..f0e4c57 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -24,6 +24,6 @@
<string name="accessbility_suggestion_dropdown_closed" msgid="91481373431329121">"Ehdotuksia ei ole saatavilla."</string>
<string name="dropdown_delete_button_desc" msgid="4359394656487762022">"Poista <xliff:g id="CONTACT">%s</xliff:g> vastaanottajista"</string>
<string name="chips_action_copy" msgid="6984158516334578792">"Kopioi"</string>
- <string name="chips_action_cancel" msgid="2582257014578396781">"Peruuta"</string>
+ <string name="chips_action_cancel" msgid="2582257014578396781">"Peru"</string>
<string name="chips_permission_text" msgid="5601284803674008863">"Salli yhteystietoehdotukset"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 95a9aab..9d840af 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,10 +20,10 @@
<string name="copy_email" msgid="1084563757174121331">"העתקת כתובת אימייל"</string>
<string name="copy_number" msgid="8860802152973030914">"העתקת מספר טלפון"</string>
<string name="action_label" msgid="7172664623795021857">"חזרה"</string>
- <string name="accessbility_suggestion_dropdown_opened" msgid="9015267358421989409">"הצעות אנשי קשר פתוחות"</string>
+ <string name="accessbility_suggestion_dropdown_opened" msgid="9015267358421989409">"נפתחו הצעות לאנשי קשר"</string>
<string name="accessbility_suggestion_dropdown_closed" msgid="91481373431329121">"אין הצעות זמינות"</string>
<string name="dropdown_delete_button_desc" msgid="4359394656487762022">"הסרה של <xliff:g id="CONTACT">%s</xliff:g> מהנמענים"</string>
<string name="chips_action_copy" msgid="6984158516334578792">"העתקה"</string>
<string name="chips_action_cancel" msgid="2582257014578396781">"ביטול"</string>
- <string name="chips_permission_text" msgid="5601284803674008863">"התר הצעות לאנשי קשר"</string>
+ <string name="chips_permission_text" msgid="5601284803674008863">"אישור הצעות לאנשי קשר"</string>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
new file mode 100644
index 0000000..8dd98ba
--- /dev/null
+++ b/res/values-si/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="643992135011109762">"+<xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="copy_email" msgid="1084563757174121331">"ඊ-තැපැල් ලිපිනය පිටපත් කරන්න"</string>
+ <string name="copy_number" msgid="8860802152973030914">"දුරකථන අංකය පිටපත් කරන්න"</string>
+ <string name="action_label" msgid="7172664623795021857">"ආපසු එවන්න"</string>
+ <string name="accessbility_suggestion_dropdown_opened" msgid="9015267358421989409">"සම්බන්ධතා යෝජනා විවෘත කරන"</string>
+ <string name="accessbility_suggestion_dropdown_closed" msgid="91481373431329121">"යෝජනා නොමැත"</string>
+ <string name="dropdown_delete_button_desc" msgid="4359394656487762022">"ලබන්නන් වෙතින් <xliff:g id="CONTACT">%s</xliff:g> ඉවත් කරන්න"</string>
+ <string name="chips_action_copy" msgid="6984158516334578792">"පිටපත් කරන්න"</string>
+ <string name="chips_action_cancel" msgid="2582257014578396781">"අවලංගු කරන්න"</string>
+ <string name="chips_permission_text" msgid="5601284803674008863">"සම්බන්ධතා යෝජනා වෙත ඉඩ දෙන්න"</string>
+</resources>
diff --git a/sample/Android.bp b/sample/Android.bp
index 72da660..8a4e723 100644
--- a/sample/Android.bp
+++ b/sample/Android.bp
@@ -15,6 +15,10 @@
//#################################################
// Build APK
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_app {
name: "libChipsSample",
diff --git a/tests/Android.bp b/tests/Android.bp
index cba57fa..ef86046 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "libChipsTests",
