summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-10-02 22:04:29 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-10-02 22:04:29 +0000
commit8f695c6476404e77b8b647d0d1898a3706bb1199 (patch)
tree84e869f146ad4166948ac2f104ea2226458dd7c7
parent46d1954c86bab445eb1122323d397e7b04159141 (diff)
parent2ab5ac1cdb518f06b86a7777bffb54c81ca119e5 (diff)
downloadandroid_packages_providers_DownloadProvider-8f695c6476404e77b8b647d0d1898a3706bb1199.tar.gz
android_packages_providers_DownloadProvider-8f695c6476404e77b8b647d0d1898a3706bb1199.tar.bz2
android_packages_providers_DownloadProvider-8f695c6476404e77b8b647d0d1898a3706bb1199.zip
Snap for 5044688 from 2ab5ac1cdb518f06b86a7777bffb54c81ca119e5 to pi-qpr2-release
Change-Id: I5b7a7cc563ad1aede20d6a69ba6376fcab5ae5c0
-rw-r--r--ui/AndroidManifest.xml3
-rw-r--r--ui/res/values-ca/strings.xml2
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/AndroidManifest.xml b/ui/AndroidManifest.xml
index fa795c9f..d08ec191 100644
--- a/ui/AndroidManifest.xml
+++ b/ui/AndroidManifest.xml
@@ -11,7 +11,8 @@
android:icon="@mipmap/ic_launcher_download"
android:hardwareAccelerated="true"
android:supportsRtl="true"
- android:requiredForAllUsers="true">
+ android:requiredForAllUsers="true"
+ android:usesCleartextTraffic="true">
<activity
android:name=".TrampolineActivity"
diff --git a/ui/res/values-ca/strings.xml b/ui/res/values-ca/strings.xml
index 3892888a..b56b1a86 100644
--- a/ui/res/values-ca/strings.xml
+++ b/ui/res/values-ca/strings.xml
@@ -44,7 +44,7 @@
<string name="cancel_running_download" msgid="5232704030969221112">"Cancel·la"</string>
<string name="retry_download" msgid="7617100787922717912">"Torna-ho a provar"</string>
<string name="start_now_download" msgid="1564642872809509681">"Comença ara"</string>
- <string name="deselect_all" msgid="6348198946254776764">"Anul·la la selecció de tot"</string>
+ <string name="deselect_all" msgid="6348198946254776764">"Desselecciona-ho tot"</string>
<string name="select_all" msgid="634074918366265804">"Selecciona-ho tot"</string>
<string name="selected_count" msgid="2101564570019753277">"S\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
<string name="download_share_dialog" msgid="3355867339806448955">"Compart. mitjançant"</string>