Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev

commit: b9bafa0d3d1b2bf02d9b96eee505dfc492324bec [log] [tgz]
author: Oli Lan <olilan@google.com> Mon Aug 22 14:27:57 2022 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Mon Aug 22 14:27:57 2022 +0000
tree: 3c2494fe8e7122c3be68985e628b9502b69f6c4c
parent: 65b18b5e6945a37511d46ff93d3eea3c04b5d567 [diff]
parent: c0742e745da55452a412b4bb7bd28c5ecf3a8cb2 [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a5b2cfd..aadeec7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Koppel aan <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Ontkoppel hierdie VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Ontkoppel"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Weergawe <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Weergawe"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Vergeet VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Vervang bestaande VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Stel altyd-aan VPN?"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7342367..10c2437 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"ከ<xliff:g id="PROFILE">%s</xliff:g> ጋር ተገናኝ"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"የዚህ ቪፒኤን ግንኙነት ይቋረጥ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ግንኙነት አቋርጥ"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ሥሪት <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ስሪት"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPNን እርሳ"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"አሁን ያለው VPN ይተካ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ሁልጊዜ-የበራ VPN ይቀናበር?"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4a73562..7dedaee 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -2964,7 +2964,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"الاتصال بـ <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"‏هل تريد قطع الاتصال بهذه الشبكة الافتراضية الخاصة (VPN)؟"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"قطع الاتصال"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"الإصدار <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"الإصدار"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"نسيان الشبكة الافتراضية الخاصة"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟"</string>

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index aa8d235..6bc7275 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml

@@ -2815,7 +2815,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>ৰ সৈতে সংযোগ কৰক"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"এই ভিপিএনটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবনে?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"সংযোগ বিচ্ছিন্ন কৰক"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"সংস্কৰণ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"সংস্কৰণ"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"ভিপিএন পাহৰক"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"পূৰ্বৰ ভিপিএনটো সলনি কৰেনে?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ভিপিএনক যিকোনো সময়ত অন থকা অবস্থাত ছেট কৰিবনে?"</string>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 794c8f5..389808d 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> profilinə qoşulun"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Bu VPN bağlantısı kəsilsin?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Bağlantını kəsin"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versiya <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versiya"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN\'i unudun"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Mövcud VPN əvəz edilsin?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Hər zaman aktiv VPN quraşdırılsın?"</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index c93166a..6a4afc0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -2853,7 +2853,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Povezivanje na profil <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Želite li da prekinete vezu sa ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Prekini vezu"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Želite li da zamenite postojeći VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Želite li da podesite uvek uključeni VPN?"</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 82e5d08..7e28e6f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -2891,7 +2891,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Падключэнне да профiлю <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Адключыць гэту VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Адключыць"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Версія <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Версія"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Забыць VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Замяніць існуючую VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Наладзіць заўсёды ўключаную VPN?"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a7e239a..7586442 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Свързване със: <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Да се прекрати ли връзката с тази виртуална частна мрежа (VPN)?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Прекратяване на връзката"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Версия <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Забравяне на вирт. частна мрежа (VPN)"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Да се замени ли съществуващата VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Да се зададе ли винаги включена виртуална частна мрежа (VPN)?"</string>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index daa57f9..bb1935a 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> এতে কানেক্ট করুন"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"এই VPN থেকে ডিসকানেক্ট করবেন?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ডিসকানেক্ট করুন"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ভার্সন<xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ভার্সন"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN সরিয়ে দিন"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"বিদ্যমান VPN প্রতিস্থাপন করতে চান?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"সর্বদা-চালু VPN সেট করতে চান?"</string>

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 9643d43..533dc6a 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -2853,7 +2853,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Poveži se na <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Želite li prekinuti vezu s ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Prekini vezu"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Želite li zamijeniti postojeći VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Želite li postaviti uvijek uključen VPN?"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 02134ff..554b7fe 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Connexió amb <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Vols desconnectar aquesta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconnecta"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versió <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versió"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Oblida la VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Vols substituir la VPN actual?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vols definir la VPN sempre activa?"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index bd8e168..c2175ca 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Připojit k profilu <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Odpojit tuto síť VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Odpojit"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Verze <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Verze"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zapomenout VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Nahradit stávající síť VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Nastavit trvalou síť VPN?"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bf69b25..4ae9a4d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Opret forbindelse til <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Vil du afbryde dette VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Afbryd"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Glem VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Erstat det eksisterende VPN-netværk?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vil du konfigurere konstant VPN?"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f73c06d..4742e86 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Mit <xliff:g id="PROFILE">%s</xliff:g> verbinden"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Verbindung zu diesem VPN trennen?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Verbindung trennen"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN entfernen"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Aktuelles VPN ersetzen?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Durchgehend aktives VPN aktivieren?"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 30f5eb4..284fb67 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Σύνδεση στο προφίλ <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Να αποσυνδεθεί αυτό το VPN;"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Αποσύνδεση"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Έκδοση <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Έκδοση"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Διαγραφή VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Αντικατάσταση υπάρχοντος VPN;"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Ενεργοποίηση του μονίμως ενεργού VPN;"</string>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 1f63bf9..9f9f257 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Connect to <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Disconnect"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Set always-on VPN?"</string>

diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 3372116..2a618e0 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Connect to <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Disconnect"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Set always-on VPN?"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1f63bf9..9f9f257 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Connect to <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Disconnect"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Set always-on VPN?"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 65ed792..6b2c4fa 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Connect to <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Disconnect"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Set always-on VPN?"</string>

diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index c648e6b..e237845 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml

@@ -2815,7 +2815,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎Connect to ‎‏‎‎‏‏‎<xliff:g id="PROFILE">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎Disconnect this VPN?‎‏‎‎‏‎"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎Disconnect‎‏‎‎‏‎"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎Version ‎‏‎‎‏‏‎<xliff:g id="VERSION">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎Version‎‏‎‎‏‎"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎Forget VPN‎‏‎‎‏‎"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎Replace existing VPN?‎‏‎‎‏‎"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎Set always-on VPN?‎‏‎‎‏‎"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 70f945e..90deb5f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"¿Deseas desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconectar"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versión <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Borrar VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"¿Reemplazar VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"¿Configurar la VPN siempre activa?"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a2868b0..5d52bf5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"¿Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconectar"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versión <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Borrar VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"¿Sustituir VPN actual?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"¿Configurar el modo de VPN siempre activada?"</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 79cd54d..aa18a18 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Profiiliga <xliff:g id="PROFILE">%s</xliff:g> ühendamine"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Kas soovite katkestada ühenduse selle VPN-iga?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Katkesta ühendus"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versioon <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versioon"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Unusta VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Kas asendada olemasolev VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Kas määrata alati sisselülitatud VPN?"</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 98eb8c1..4e44b75 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Konektatu <xliff:g id="PROFILE">%s</xliff:g> profilera"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"VPN saretik deskonektatu nahi duzu?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Deskonektatu"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"<xliff:g id="VERSION">%s</xliff:g> bertsioa"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Bertsioa"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Ahaztu VPN konexioa"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Dagoen VPN konexioa ordeztu nahi duzu?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"VPNa beti aktibatuta egoteko aukera ezarri nahi duzu?"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a13f494..de20144 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"اتصال به <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"‏اتصال به این VPN.قطع‌ شود؟"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"قطع ارتباط"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"نسخه <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"نسخه"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"‏فراموش کردن VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"‏VPN موجود جایگزین شود؟"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"‏VPN همیشه روشن تنظیم شود؟"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ebc20bd..975849e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Yhdistä profiiliin <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Katkaistaanko VPN-yhteys?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Katkaise yhteys"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versio <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versio"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Unohda VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Korvataanko nykyinen VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Määritetäänkö aina käytössä oleva VPN?"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e5c42df..d9e4dd1 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Se connecter à <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Déconnecter ce RPV?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Déconnecter"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Oublier le profil RPV"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Remplacer le RPV existant?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Définir le RPV permanent?"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bc0a6ea..fe369e1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Se connecter à <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Déconnecter ce VPN ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Déconnecter"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Supprimer le VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Remplacer le VPN existant ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Définir le VPN permanent ?"</string>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 8bf8936..0cf2ad0 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -2817,7 +2817,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar con <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Queres desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconectar"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versión <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Esquecer perfil da VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Queres substituír a VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Queres definir a VPN como sempre activa?"</string>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index e83bef5..5a65711 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> સાથે કનેક્ટ કરો"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"આ VPNને ડિસ્કનેક્ટ કરીએ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ડિસ્કનેક્ટ કરો"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"સંસ્કરણ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"વર્ઝન"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN ભૂલી ગયાં"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"અસ્તિત્વમાંની VPN ને બદલીએ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"હંમેશાં ચાલુ VPN સેટ કરીએ?"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fc2309c..9305b54 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">" <xliff:g id="PROFILE">%s</xliff:g> से कनेक्ट करें"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"इस VPN को डिसकनेक्ट करना चाहते हैं?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"डिसकनेक्ट करें"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"वर्शन <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"वर्शन"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN भूल जाएं"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"मौजूदा VPN को बदलें?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"हमेशा-चालू VPN सेट करें?"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b0a0b07..f45369b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -2853,7 +2853,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Povezivanje s profilom <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Prekinuti vezu s VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Prekini vezu"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Želite li zamijeniti dosadašnji VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Želite li postaviti uvijek uključeni VPN?"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 566c928..12b9a9e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Csatlakozás a következőhöz: <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Leválasztja a VPN-t?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Leválasztás"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Verzió: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Verzió"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN elfelejtése"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Lecseréli a meglévő VPN-t?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Beállítja a mindig bekapcsolt VPN-t?"</string>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 71d84f4..10c2586 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Միանալ <xliff:g id="PROFILE">%s</xliff:g>-ին"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Անջատե՞լ այս VPN-ը:"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Անջատել"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Տարբերակ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Տարբերակ"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Մոռանալ VPN-ը"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Փոխարինե՞լ ընթացիկ VPN-ը:"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Սահմանե՞լ որպես «միշտ միացված» VPN:"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e2f2d0f..5c71786 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Menyambung ke <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Putuskan sambungan VPN ini?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Putuskan sambungan"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versi <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versi"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Ganti VPN yang sudah ada?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Setel VPN selalu aktif?"</string>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index cf859ab..808b049 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Tengjast <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Aftengja þessa VPN-tengingu?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Aftengja"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Útgáfa <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Útgáfa"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Gleyma VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Skipta út núverandi VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Velja VPN sem alltaf er kveikt á?"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3e21b03..0823eb9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Connessione a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Disconnettere questa VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Disconnetti"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versione <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versione"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Rimuovi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Sostituire la rete VPN esistente?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Impostare la rete VPN sempre attiva?"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0739b58..9b65e88 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"התחברות אל <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"‏האם לנתק את ה-VPN הזה?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"נתק"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"גרסה <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"גרסה"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"‏שכח VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"‏האם להחליף רשת VPN קיימת?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"‏האם להגדיר את רשת ה-VPN בחיבור תמידי?"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 831b311..0dc6c74 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>に接続"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"この VPN の接続を解除しますか？"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"接続を解除"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"バージョン<xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"バージョン"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN を削除"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"既存の VPN を置き換えますか？"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"常時接続 VPN を設定しますか？"</string>

diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index de86bc3..f567fc5 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"დაკავშირებულია <xliff:g id="PROFILE">%s</xliff:g>-თან"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"გსურთ ამ VPN-თან კავშირის გაწყვეტა?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"კავშირის გაწყვეტა"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ვერსია <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ვერსია"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN-ის დავიწყება"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"გსურთ არსებული VPN-ის ჩანაცვლება?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"გსურთ ყოველთვის ჩართული VPN-ის დაყენება?"</string>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index a05e1fc..41d3510 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> профайлына жалғау"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Осы VPN желісі ажыратылсын ба?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Ажырату"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Нұсқасы: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Нұсқа"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN ұмыту"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Бар VPN қолданбасын ауыстыру керек пе?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Әрқашан қосулы VPN режимін орнату"</string>

diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index ae4e937..bee83d7 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"តភ្ជាប់ <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ផ្តាច់ VPN នេះ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ផ្ដាច់"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"កំណែ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"កំណែ"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"បំភ្លេច VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ជំនួស VPN ដែលមានស្រាប់ឬ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"កំណត់ VPN ឲ្យបើកជានិច្ចឬ?"</string>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3520b72..a4c787b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ಈ VPN ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸು"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"<xliff:g id="VERSION">%s</xliff:g> ಆವೃತ್ತಿ"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ಆವೃತ್ತಿ"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN ಮರೆತುಬಿಡು"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಸ್ಥಾನಾಂತರಿಸುವುದೇ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"VPN ಯಾವಾಗಲೂ ಆನ್ ಆಗಿರುವಂತೆ ಹೊಂದಿಸುವುದೇ?"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 29c4c53..bec24da 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>에 연결"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"이 VPN을 연결 해제하시겠습니까?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"연결 해제"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"버전 <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"버전"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN 삭제"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"기존 VPN을 교체하시겠습니까?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"연결 유지 VPN을 설정하시겠습니까?"</string>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c5272c1..8812f89 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -2815,7 +2815,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> менен байланышуу"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Бул VPN ажыратылсынбы?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Ажыратуу"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"<xliff:g id="VERSION">%s</xliff:g> версиясы"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN профили унутулсун"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Учурдагы VPN алмаштырылсынбы?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Туруктуу VPN\'ди жөндөйсүзбү?"</string>

diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 4bab5d4..f9cdcfc 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"ເຊື່ອມຕໍ່ຫາ <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ຕັດການເຊື່ອມຕໍ່ VPN ນີ້ບໍ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ຕັດການເຊື່ອມຕໍ່"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ເວີຊັນ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ເວີຊັນ"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"ລືມ VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ຂຽນທັບ VPN ທີ່ມີຢູ່ກ່ອນແລ້ວຂອງທ່ານບໍ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Set always-on VPN?"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f635840..75aa216 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Prisijungti prie <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Atsijungti nuo šio VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Atsijungti"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"<xliff:g id="VERSION">%s</xliff:g> versija"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versija"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Pamiršti VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Pakeisti esamą VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Nustatyti visada įjungtą VPN?"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6435075..b8ffb6d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -2853,7 +2853,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Savienojuma izveide ar <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Vai pārtraukt šo VPN savienojumu?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Pārtraukt savienojumu"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versija <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versija"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Aizmirst VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Vai aizstāt esošo VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vai iestatīt vienmēr ieslēgtu VPN?"</string>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 0ee060d..067c9f7 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Поврзи се со <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Да се исклучи оваа VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Исклучи"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Верзија <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Верзија"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Заборави VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Да се замени постојната VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Да се постави „секогаш вклучена“ VPN?"</string>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 558a74a..1356c19 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> എന്നതിലേക്ക് കണക്റ്റുചെയ്യുക"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ഈ VPN വിച്ഛേദിക്കണോ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"വിച്ഛേദിക്കുക"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"പതിപ്പ് <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"പതിപ്പ്"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN മറക്കുക"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"നിലവിലുള്ള VPN-ന് പകരം പുതിയതാക്കണോ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"\'എല്ലായ്പ്പോഴും ഓൺ\' VPN സജ്ജമാക്കണോ?"</string>

diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index ece9e15..5bd15e9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> руу холбогдох"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Энэ VPN-г салгах уу?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Салгах"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Хувилбар <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Хувилбар"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN мартсан"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Энэ VPN-г солих уу?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"VPN-г тогтмол асаалттайгаар тохируулах уу?"</string>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 72f0ab4..ce69202 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -2817,7 +2817,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> शी कनेक्ट करा"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"हे VPN डिस्कनेक्ट करायचे?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"‍डिस्कनेक्ट करा"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"आवृत्ती <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"आवृत्ती"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN विसरा"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"विद्यमान VPN पुनर्स्थित करायचे?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"नेहमी-चालू VPN सेट करायचे?"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c276a9f..63b8470 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Sambung ke <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Putuskan sambungan VPN ini?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Putuskan sambungan"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versi <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versi"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Gantikan VPN yang sedia ada?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Tetapkan VPN sentiasa hidup?"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 88b280d..495d048 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> နှင့် ချိတ်ဆက်ခြင်း"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ဤ VPN အား ချိတ်ဆက်မှု ဖြုတ်လိုပါသလား။"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ဆက်သွယ်မှု ဖြတ်ရန်"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ဗားရှင်း <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ဗားရှင်း"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN ကိုမေ့လိုက်ပါ"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ရှိပြီးသား VPN ကိုအစားထိုးမလား။"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"VPN ကို အမြဲတမ်းဖွင့်ထားရန် သတ်မှတ်မလား။"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0cd229d..2d1bd05 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Koble til <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Vil du koble fra dette VPN-et?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Koble fra"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versjon"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Glem VPN-profilen"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Vil du erstatte det nåværende VPN-et?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vil du angi alltid på-VPN?"</string>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 1fd133b..06c6867 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> मा जोड्नुहोस्"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"यो VPN को जडान विच्छेद गर्ने हो?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"विच्छेदन गर्नुहोस्"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"संस्करण <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"संस्करण"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN लाई बिर्सनुहोस्"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"विद्यमान VPN लाई बदल्ने हो?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"सधैँ-सक्रिय VPN लाई सेट गर्ने हो?"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5807d0f..fe6bd3a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Verbinding maken met <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Verbinding met dit VPN verbreken?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Verbinding verbreken"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versie <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versie"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN vergeten"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Bestaande VPN vervangen?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Always-on VPN instellen?"</string>

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 175c064..eede5f4 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml

@@ -2815,7 +2815,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ଏହି VPNକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ସଂସ୍କରଣ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ସଂସ୍କରଣ"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPNକୁ ଭୁଲିଯାଅ"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ପୂର୍ବରୁ ଥିବା VPNକୁ ବଦଳାଇବେ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN ସେଟ୍‌ କରିବେ?"</string>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index fc1c7a1..94a521c 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ਵਰਜਨ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ਵਰਜਨ"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN ਨੂੰ ਛੱਡੋ"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 30b91a7..6dd7d94 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Połącz z: <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Odłączyć tę sieć VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Odłącz"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Wersja <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Wersja"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zapomnij VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Zastąpić obecną sieć VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Ustawić stały VPN?"</string>

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4233fb9..7a2b05b 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconectar"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versão <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Substituir VPN já existente?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Configurar VPN sempre ativa?"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 662e3e1..b4ff9f3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Ligar a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Pretende desligar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desligar"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versão <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Pretende substituir a VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Pretende definir a VPN como sempre ativa?"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4233fb9..7a2b05b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconectar"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versão <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Substituir VPN já existente?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Configurar VPN sempre ativa?"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c861c91..4a56a3c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -2853,7 +2853,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectați-vă la <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Doriți să vă deconectați de la această rețea VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Deconectați-vă"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versiunea <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versiune"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Eliminați profilul VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Înlocuiți rețeaua VPN existentă?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Setați rețeaua VPN ca activată permanent?"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ff130bb..a29ac2d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Подключение к <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Отключиться от VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Да"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Версия <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Удалить VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Сменить текущую VPN-сеть?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Настроить постоянную VPN-сеть?"</string>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 50d4ecc..12101a9 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> වෙත සම්බන්ධ කරන්න"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"මෙම VPN එක විසන්ධි කරන්නද?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"විසන්ධි කරන්න"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"අනුවාදය <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"අනුවාදය"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN අමතක කරන්න"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"පවතින VPN ප්‍රතිස්ථාපනය කරන්නද?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"සැම විට ක්‍රියාත්මක VPN සකසන්නද?"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 101203b..9e21f61 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Pripojiť k profilu <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Odpojiť tento profil VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Odpojiť"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Verzia <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Verzia"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zabudnúť profil VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Nahradiť existujúcu sieť VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Nastaviť sieť VPN, ktorá je vždy zapnutá?"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2dec87e..104f455 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Povezovanje z <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Prekinitev povezave s tem omrežjem VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Prekini povezavo"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Različica <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Različica"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Pozabi omrežje VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Želite zamenjati obstoječe omrežje VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Ali želite, da je omrežje VPN stalno vklopljeno?"</string>

diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 3e63157..be66d2a 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Lidhu me <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Shkëpute këtë rrjet VPN"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Shkëpute"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Versioni <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versioni"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Harroje rrjetin VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Të zëvendësohet rrjeti ekzistues VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Të caktohet rrjeti VPN gjithmonë aktiv?"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fba3d72..6db0a03 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -2853,7 +2853,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Повезивање на профил <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Желите ли да прекинете везу са овим VPN-ом?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Прекини везу"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Верзија <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Верзија"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Заборави VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Желите ли да замените постојећи VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Желите ли да подесите увек укључени VPN?"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c2572a5..de17d03 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Anslut till <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Vill du koppla från VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Koppla från"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Glöm VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Vill du byta ut befintligt VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vill du ange Always-on VPN?"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f88ad31..905fcf6 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Unganisha kwa <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Ungependa kuondoa VPN hii?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Kata muungnisho"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Toleo la <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Toleo"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Ondoa VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Ungependa kubadilisha VPN iliyopo?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Ungependa kuweka VPN iliyowashwa kila mara?"</string>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 8ce7fe7..feaa129 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> உடன் இணை"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"VPNஐத் துண்டிக்கவா?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"தொடர்பைத் துண்டி"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"பதிப்பு <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"பதிப்பு"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPNஐ நீக்கு"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"தற்போதுள்ள VPNஐ மாற்றியமைக்கவா?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"எப்போதும் இயங்கும் VPNஐ அமைக்கவா?"</string>

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index d5e7674..ba62982 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>కి కనెక్ట్ చేయండి"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"డిస్‌కనెక్ట్ చేయి"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"వెర్షన్ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"వెర్షన్"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPNని విస్మరించు"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index fa7610a..9212ae3 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"เชื่อมต่อกับ <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ยกเลิกการเชื่อมต่อ VPN นี้ไหม"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ยกเลิกการเชื่อมต่อ"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"เวอร์ชัน <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"รุ่น"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"ลืม VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"แทนที่ VPN ที่มีอยู่หรือไม่"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ตั้งค่า VPN แบบเปิดตลอดเวลาหรือไม่"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5ecf13a..2ba8b77 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Kumonekta sa <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Putulin ang koneksyon ng VPN na ito?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Putulin ang koneksyon"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Bersyon <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Bersyon"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Kalimutan ang VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Gusto mo bang palitan ang dati nang VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Gusto mo bang itakda ang VPN na palaging naka-on?"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0585118..b524ea4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> profiline bağlan"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Bu VPN\'nin bağlantısı kesilsin mi?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Bağlantıyı kes"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Sürüm <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Sürüm"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN\'yi unut"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Mevcut VPN değiştirilsin mi?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Her zaman açık VPN ayarlansın mı?"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0ab21a7..8de72ff 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -2890,7 +2890,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Під’єднатися до профілю <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Відключити цю мережу VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Відключити"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Версія <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Версія"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Забути мережу VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Замінити наявну мережу VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Увімкнути постійну мережу VPN?"</string>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1538f5d..c45a6f6 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> سے مربوط کریں"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"‏اس VPN سے غیر منسلک کریں؟"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"غیر منسلک کریں"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ورژن <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"ورژن"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"‏VPN بھول جائیں"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"‏موجودہ VPN بدلیں؟"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"‏ہمیشہ آن VPN سیٹ کریں؟"</string>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index fc4245c..76d4aeb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -2826,7 +2826,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> tarmog‘iga ulanish"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Bu VPN bilan aloqa uzilsinmi?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Aloqani uzish"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"<xliff:g id="VERSION">%s</xliff:g> versiya"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Versiya"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPNni o‘chirish"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Mavjud VPN tarmog‘i almashtirilsinmi?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Doimiy VPN o‘rnatilsinmi?"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 63c4b18..79cd1bc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Kết nối với <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Ngắt kết nối VPN này?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Ngắt kết nối"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Phiên bản <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Phiên bản"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Xóa VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Thay thế VPN hiện có?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Đặt VPN luôn bật?"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ba3cb39..a820283 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"连接到<xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"要断开与此 VPN 的连接吗？"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"断开连接"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"版本 <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"取消保存 VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"要替换现有 VPN 吗？"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"要设置始终开启的 VPN 吗？"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index bc53cff..a5cf4a1 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -2817,7 +2817,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"連接「<xliff:g id="PROFILE">%s</xliff:g>」"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"要解除連結此 VPN 嗎？"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"中斷連線"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"版本為：<xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"刪除 VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"要取代目前的 VPN 嗎？"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"要設定保持開啟的 VPN 嗎？"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 235e911..af795d6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -2816,7 +2816,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"連線到「<xliff:g id="PROFILE">%s</xliff:g>」"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"要中斷這個 VPN 連線嗎？"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"中斷連線"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"版本 <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"清除 VPN 設定檔"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"要取代現有的 VPN 嗎？"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"要設定永久連線的 VPN 嗎？"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 885c3b2..f4ea4cd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -2817,7 +2817,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Xhuma ku-<xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Nqamula le-VPN"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Nqamula"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"Inguqulo engu-<xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="6344167191984400976">"Uhlobo"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Khohlwa i-VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Shintshanisa i-VPN ekhona?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Setha i-VPN ehlala ivuliwe?"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7174438..a0524a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -6552,7 +6552,7 @@
     <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_disconnect">Disconnect</string>
     <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
-    <string name="vpn_version">Version <xliff:g id="version" example="3.3.0">%s</xliff:g></string>
+    <string name="vpn_version">Version</string>
     <!-- Button label to forget a VPN profile [CHAR LIMIT=40] -->
     <string name="vpn_forget_long">Forget VPN</string>
     <!-- Dialog message title to set another VPN app to be always-on [CHAR LIMIT=40] -->

diff --git a/res/values/styles.xml b/res/values/styles.xml
index d3d3199..ec66bc8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml

@@ -197,6 +197,16 @@
         <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Small</item>
     </style>
 
+    <style name="vpn_app_management_version_title">
+        <item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="vpn_app_management_version_summary">
+        <item name="android:textAppearance">?android:attr/textAppearanceListItemSecondary</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
     <style name="TextAppearance" parent="android:TextAppearance.DeviceDefault"/>
 
     <style name="TextAppearance.info_label">

diff --git a/res/xml/location_scanning.xml b/res/xml/location_scanning.xml
index 5e7bd24..f484768 100644
--- a/res/xml/location_scanning.xml
+++ b/res/xml/location_scanning.xml

@@ -18,13 +18,13 @@
         android:title="@string/location_scanning_screen_title"
         android:key="scanning_screen">
 
-        <SwitchPreference
+        <com.android.settingslib.RestrictedSwitchPreference
             android:title="@string/location_scanning_wifi_always_scanning_title"
             android:summary="@string/location_scanning_wifi_always_scanning_description"
             android:defaultValue="true"
             android:key="wifi_always_scanning" />
 
-        <SwitchPreference
+        <com.android.settingslib.RestrictedSwitchPreference
             android:title="@string/location_scanning_bluetooth_always_scanning_title"
             android:summary="@string/location_scanning_bluetooth_always_scanning_description"
             android:defaultValue="true"

diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index bcaa6b0..adc441d 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml

@@ -15,14 +15,24 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto">
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        orderingFromXml="false"
+        >
+
+        <!-- To limit the size (in height) of version Preference displayed here,
+             maximum height of TextView need to be set programmingly.
+             Therefore, this Preference got removed from here and will be added
+             dynamically through source code.
 
         <Preference
+                android:order="0"
                 android:key="version"
                 android:textColor="?android:attr/textColorSecondary"
                 android:selectable="false"/>
+        -->
 
         <com.android.settingslib.RestrictedSwitchPreference
+                android:order="10"
                 android:key="always_on_vpn"
                 android:title="@string/vpn_menu_lockdown"
                 android:defaultValue="false"
@@ -32,6 +42,7 @@
                 settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
 
         <com.android.settingslib.RestrictedSwitchPreference
+                android:order="20"
                 android:key="lockdown_vpn"
                 android:title="@string/vpn_require_connection"
                 android:defaultValue="false"
@@ -41,6 +52,7 @@
                 settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
 
         <com.android.settingslib.RestrictedPreference
+                android:order="30"
                 android:key="forget_vpn"
                 android:title="@string/vpn_forget_long"
                 android:icon="@drawable/ic_delete"

diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index ae61944..f75ce37 100644
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java

@@ -16,6 +16,8 @@
 
 package com.android.settings;
 
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -71,6 +73,8 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
         
         final Intent intent = getIntent();
         

diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 9f9f832..9bf626c 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java

@@ -22,6 +22,9 @@
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
 
 public class DefaultRingtonePreference extends RingtonePreference {
     private static final String TAG = "DefaultRingtonePreference";
@@ -43,6 +46,29 @@
 
     @Override
     protected void onSaveRingtone(Uri ringtoneUri) {
+        if (ringtoneUri == null) {
+            setActualDefaultRingtoneUri(ringtoneUri);
+            return;
+        }
+
+        String mimeType = mUserContext.getContentResolver().getType(ringtoneUri);
+        if (mimeType == null) {
+            Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri
+                    + " ignored: failure to find mimeType (no access from this context?)");
+            return;
+        }
+
+        if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg"))) {
+            Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri
+                    + " ignored: associated mimeType:" + mimeType + " is not an audio type");
+            return;
+        }
+
+        setActualDefaultRingtoneUri(ringtoneUri);
+    }
+
+    @VisibleForTesting
+    void setActualDefaultRingtoneUri(Uri ringtoneUri) {
         RingtoneManager.setActualDefaultRingtoneUri(mUserContext, getRingtoneType(), ringtoneUri);
     }
 

diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 68c6d3c..9cf18a9 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

@@ -46,6 +46,7 @@
     private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
     private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";
 
     @VisibleForTesting
     static final String KEY_CONNECTED_DEVICES = "connected_device_list";
@@ -98,8 +99,10 @@
                 SettingsUIDeviceConfig.BT_NEAR_BY_SUGGESTION_ENABLED, true);
         String callingAppPackageName = PasswordUtils.getCallingAppPackageName(
                 getActivity().getActivityToken());
+        String action = getIntent() != null ? getIntent().getAction() : "";
         if (DEBUG) {
-            Log.d(TAG, "onAttach() calling package name is : " + callingAppPackageName);
+            Log.d(TAG, "onAttach() calling package name is : " + callingAppPackageName
+                    + ", action : " + action);
         }
         use(AvailableMediaDeviceGroupController.class).init(this);
         use(ConnectedDeviceGroupController.class).init(this);
@@ -108,9 +111,15 @@
         use(SlicePreferenceController.class).setSliceUri(nearbyEnabled
                 ? Uri.parse(getString(R.string.config_nearby_devices_slice_uri))
                 : null);
-        use(DiscoverableFooterPreferenceController.class).setAlwaysDiscoverable(
-                TextUtils.equals(SETTINGS_PACKAGE_NAME, callingAppPackageName)
-                        || TextUtils.equals(SYSTEMUI_PACKAGE_NAME, callingAppPackageName));
+        use(DiscoverableFooterPreferenceController.class)
+                .setAlwaysDiscoverable(isAlwaysDiscoverable(callingAppPackageName, action));
+    }
+
+    @VisibleForTesting
+    boolean isAlwaysDiscoverable(String callingAppPackageName, String action) {
+        return TextUtils.equals(SLICE_ACTION, action) ? false
+                : TextUtils.equals(SETTINGS_PACKAGE_NAME, callingAppPackageName)
+                || TextUtils.equals(SYSTEMUI_PACKAGE_NAME, callingAppPackageName);
     }
 
     /**

diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java
index d16e1e5..cee3105 100644
--- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java
+++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java

@@ -14,12 +14,17 @@
 package com.android.settings.location;
 
 import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 public class BluetoothScanningPreferenceController extends AbstractPreferenceController
@@ -46,6 +51,12 @@
         ((SwitchPreference) preference).setChecked(
                 Settings.Global.getInt(mContext.getContentResolver(),
                         Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1);
+        final RestrictedLockUtils.EnforcedAdmin admin =
+            RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_CONFIG_LOCATION, UserHandle.myUserId());
+        if (admin != null) {
+          ((RestrictedSwitchPreference) preference).setDisabledByAdmin(admin);
+        }
     }
 
     @Override

diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java
index 234ec5e..fb64fa9 100644
--- a/src/com/android/settings/location/WifiScanningPreferenceController.java
+++ b/src/com/android/settings/location/WifiScanningPreferenceController.java

@@ -14,12 +14,17 @@
 package com.android.settings.location;
 
 import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 public class WifiScanningPreferenceController extends AbstractPreferenceController
@@ -46,6 +51,12 @@
         ((SwitchPreference) preference).setChecked(
                 Settings.Global.getInt(mContext.getContentResolver(),
                         Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
+        final RestrictedLockUtils.EnforcedAdmin admin =
+            RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_CONFIG_LOCATION, UserHandle.myUserId());
+        if (admin != null) {
+          ((RestrictedSwitchPreference) preference).setDisabledByAdmin(admin);
+        }
     }
 
     @Override

diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index 47c3a95..b743451 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java

@@ -84,9 +84,12 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings)
-                ? AVAILABLE
-                : UNSUPPORTED_ON_DEVICE;
+        if (!mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        final UserManager userManager = mContext.getSystemService(UserManager.class);
+        if (userManager.isGuestUser()) return DISABLED_FOR_USER;
+        return AVAILABLE;
     }
 
     @Override

diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
index 1a514a6..2ff685e 100644
--- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java
+++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java

@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.nfc.NfcAdapter;
+import android.os.UserManager;
 
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
@@ -32,10 +33,12 @@
     public static final String KEY_SECURENFC_SETTINGS = "nfc_secure_settings";
     private final NfcAdapter mNfcAdapter;
     private SecureNfcEnabler mSecureNfcEnabler;
+    private final UserManager mUserManager;
 
     public SecureNfcPreferenceController(Context context, String key) {
         super(context, key);
         mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
+        mUserManager = context.getSystemService(UserManager.class);
     }
 
     @Override
@@ -58,7 +61,11 @@
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        return mNfcAdapter.enableSecureNfc(isChecked);
+        if (isToggleable()) {
+            return mNfcAdapter.enableSecureNfc(isChecked);
+        } else {
+            return false;
+        }
     }
 
     @Override
@@ -95,4 +102,12 @@
             mSecureNfcEnabler.pause();
         }
     }
+
+    private boolean isToggleable() {
+        if (mUserManager.isGuestUser()) {
+            return false;
+        }
+        return true;
+    }
+
 }

diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
index f7b3222..db7f68e 100644
--- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java

@@ -26,8 +26,11 @@
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
+import android.os.Binder;
 import android.provider.Settings;
 import android.service.notification.ConditionProviderService;
+import android.util.Log;
+import android.util.Slog;
 
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
@@ -36,6 +39,7 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.Map;
+import java.util.Objects;
 
 abstract public class AbstractZenModeAutomaticRulePreferenceController extends
         AbstractZenModePreferenceController implements PreferenceControllerMixin {
@@ -92,7 +96,7 @@
                 ? ci.metaData.getString(ConditionProviderService.META_DATA_RULE_TYPE)
                 : ci.metaData.getString(NotificationManager.META_DATA_AUTOMATIC_RULE_TYPE);
 
-        final ComponentName configurationActivity = getSettingsActivity(null, ci);
+        final ComponentName configurationActivity = getSettingsActivity(pm, null, ci);
         if (ruleType != null && !ruleType.trim().isEmpty() && configurationActivity != null) {
             final ZenRuleInfo ri = new ZenRuleInfo();
             ri.serviceComponent =
@@ -110,28 +114,44 @@
         return null;
     }
 
-    protected static ComponentName getSettingsActivity(AutomaticZenRule rule, ComponentInfo ci) {
+    protected static ComponentName getSettingsActivity(PackageManager pm, AutomaticZenRule rule,
+            ComponentInfo ci) {
+        String owner = rule != null ? rule.getPackageName() : ci.packageName;
+        ComponentName settingsActivity = null;
         // prefer config activity on the rule itself; fallback to manifest definition
         if (rule != null && rule.getConfigurationActivity() != null) {
-            return rule.getConfigurationActivity();
-        }
-        if (ci == null) {
-            return null;
-        }
-        // new activity backed rule
-        if (ci instanceof ActivityInfo) {
-            return new ComponentName(ci.packageName, ci.name);
-        }
-        // old service backed rule
-        if (ci.metaData != null) {
-            final String configurationActivity = ci.metaData.getString(
-                    ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
-            if (configurationActivity != null) {
-                return ComponentName.unflattenFromString(configurationActivity);
+            settingsActivity = rule.getConfigurationActivity();
+        } else {
+            if (ci == null) {
+                settingsActivity = null;
+            } else if (ci instanceof ActivityInfo) {
+                // new activity backed rule
+                settingsActivity = new ComponentName(ci.packageName, ci.name);
+            } else if (ci.metaData != null) {
+                // old service backed rule
+                final String configurationActivity = ci.metaData.getString(
+                        ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
+                if (configurationActivity != null) {
+                    settingsActivity = ComponentName.unflattenFromString(configurationActivity);
+                }
             }
         }
-
-        return null;
+        if (settingsActivity == null || owner == null) {
+            return settingsActivity;
+        }
+        try {
+            int ownerUid = pm.getPackageUid(owner, 0);
+            int configActivityOwnerUid = pm.getPackageUid(settingsActivity.getPackageName(), 0);
+            if (ownerUid == configActivityOwnerUid) {
+                return settingsActivity;
+            } else {
+                Log.w(TAG, "Config activity not in owner package for " + rule.getName());
+                return null;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Failed to find config activity");
+            return null;
+        }
     }
 
     public class RuleNameChangeListener implements ZenRuleNameDialog.PositiveClickListener {

diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index a7d9f68..dfe6df2 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java

@@ -20,7 +20,6 @@
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
 import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_COMPONENT_NAME;
-import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_PACKAGE_TITLE;
 import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_USER_ID;
 
 import android.Manifest;
@@ -30,10 +29,13 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.text.TextUtils;
 import android.util.Slog;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
@@ -63,15 +65,38 @@
 
         mComponentName = getIntent().getParcelableExtra(EXTRA_COMPONENT_NAME);
         mUserId = getIntent().getIntExtra(EXTRA_USER_ID, UserHandle.USER_NULL);
-        String pkgTitle = getIntent().getStringExtra(EXTRA_PACKAGE_TITLE);
+        CharSequence mAppLabel;
+
+        if (mComponentName == null || mComponentName.getPackageName() == null) {
+            finish();
+            return;
+        }
+
+        try {
+            ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(
+                    mComponentName.getPackageName(), 0);
+            mAppLabel = applicationInfo.loadSafeLabel(getPackageManager(),
+                    PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
+                    PackageItemInfo.SAFE_LABEL_FLAG_TRIM
+                            | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);
+        } catch (PackageManager.NameNotFoundException e) {
+            Slog.e(LOG_TAG, "Couldn't find app with package name for " + mComponentName, e);
+            finish();
+            return;
+        }
+
+        if (TextUtils.isEmpty(mAppLabel)) {
+            finish();
+            return;
+        }
 
         AlertController.AlertParams p = new AlertController.AlertParams(this);
         p.mTitle = getString(
                 R.string.notification_listener_security_warning_title,
-                pkgTitle);
+                mAppLabel);
         p.mMessage = getString(
                 R.string.notification_listener_security_warning_summary,
-                pkgTitle);
+                mAppLabel);
         p.mPositiveButtonText = getString(R.string.allow);
         p.mPositiveButtonListener = (a, b) -> onAllow();
         p.mNegativeButtonText = getString(R.string.deny);

diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java
index fb6e92a..7d3dae0 100644
--- a/src/com/android/settings/notification/ZenRulePreference.java
+++ b/src/com/android/settings/notification/ZenRulePreference.java

@@ -168,7 +168,7 @@
                 : isEvent ? ZenModeEventRuleSettings.ACTION : "";
         ComponentInfo si = mServiceListing.findService(rule.getOwner());
         ComponentName settingsActivity = AbstractZenModeAutomaticRulePreferenceController.
-                getSettingsActivity(rule, si);
+                getSettingsActivity(mPm, rule, si);
         mIntent = AbstractZenModeAutomaticRulePreferenceController.getRuleIntent(action,
                 settingsActivity, mId);
         if (mIntent.resolveActivity(mPm) == null) {

diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 6780b20..7cf46b6 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java

@@ -655,10 +655,7 @@
         }
 
         private void assertSafeToStartCustomActivity(Intent intent) {
-            // Activity can be started if it belongs to the same app
-            if (intent.getPackage() != null && intent.getPackage().equals(packageName)) {
-                return;
-            }
+            EventLog.writeEvent(0x534e4554, "223578534", -1 /* UID */, "");
             ResolveInfo resolveInfo = mPackageManager.resolveActivity(
                     intent, PackageManager.MATCH_DEFAULT_ONLY);
 

diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index 5f46446..805ffb2 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java

@@ -35,11 +35,13 @@
 import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
+import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 
 import com.android.internal.net.VpnConfig;
 import com.android.internal.util.ArrayUtils;
@@ -76,7 +78,6 @@
     private String mVpnLabel;
 
     // UI preference
-    private Preference mPreferenceVersion;
     private RestrictedSwitchPreference mPreferenceAlwaysOn;
     private RestrictedSwitchPreference mPreferenceLockdown;
     private RestrictedPreference mPreferenceForget;
@@ -122,7 +123,6 @@
         mConnectivityService = IConnectivityManager.Stub
                 .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
 
-        mPreferenceVersion = findPreference(KEY_VERSION);
         mPreferenceAlwaysOn = (RestrictedSwitchPreference) findPreference(KEY_ALWAYS_ON_VPN);
         mPreferenceLockdown = (RestrictedSwitchPreference) findPreference(KEY_LOCKDOWN_VPN);
         mPreferenceForget = (RestrictedPreference) findPreference(KEY_FORGET_VPN);
@@ -138,9 +138,52 @@
 
         boolean isInfoLoaded = loadInfo();
         if (isInfoLoaded) {
-            mPreferenceVersion.setTitle(
-                    getPrefContext().getString(R.string.vpn_version, mPackageInfo.versionName));
             updateUI();
+
+            Preference version = getPreferenceScreen().findPreference(KEY_VERSION);
+            if (version != null) {
+                // Version field has been added.
+                return;
+            }
+
+            /**
+             * Create version field at runtime, and set max height on the display area.
+             *
+             * When long length of text given within version field, a large text area
+             * might be created and inconvenient to the user (User need to scroll
+             * for a long time in order to get to the Preferences after this field.)
+             */
+            version = new Preference(getPrefContext()) {
+                @Override
+                public void onBindViewHolder(PreferenceViewHolder holder) {
+                    super.onBindViewHolder(holder);
+
+                    TextView titleView =
+                            (TextView) holder.findViewById(android.R.id.title);
+                    if (titleView != null) {
+                        titleView.setTextAppearance(R.style.vpn_app_management_version_title);
+                    }
+
+                    TextView summaryView =
+                            (TextView) holder.findViewById(android.R.id.summary);
+                    if (summaryView != null) {
+                        summaryView.setTextAppearance(R.style.vpn_app_management_version_summary);
+
+                        // Set max height in summary area.
+                        int versionMaxHeight = getListView().getHeight();
+                        summaryView.setMaxHeight(versionMaxHeight);
+                        summaryView.setVerticalScrollBarEnabled(false);
+                        summaryView.setHorizontallyScrolling(false);
+                    }
+                }
+            };
+            version.setOrder(0);            // Set order to 0 in order to be placed
+                                            // in front of other Preference(s).
+            version.setKey(KEY_VERSION);    // Set key to avoid from creating multi instance.
+            version.setTitle(R.string.vpn_version);
+            version.setSummary(mPackageInfo.versionName);
+            version.setSelectable(false);
+            getPreferenceScreen().addPreference(version);
         } else {
             finish();
         }

diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 2328375..4e4331e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java

@@ -51,16 +51,23 @@
         ShadowConnectivityManager.class, ShadowBluetoothAdapter.class})
 public class ConnectedDeviceDashboardFragmentTest {
     private static final String KEY_NEARBY_DEVICES = "bt_nearby_slice";
+    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
+    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
+    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";
+    private static final String TEST_APP_NAME = "com.testapp.settings";
+    private static final String TEST_ACTION = "com.testapp.settings.ACTION_START";
 
     @Mock
     private PackageManager mPackageManager;
     private Context mContext;
+    private ConnectedDeviceDashboardFragment mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(RuntimeEnvironment.application);
+        mFragment = new ConnectedDeviceDashboardFragment();
         doReturn(mPackageManager).when(mContext).getPackageManager();
         doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
     }
@@ -85,6 +92,26 @@
     }
 
     @Test
+    public void isAlwaysDiscoverable_callingAppIsNotFromSystemApp_returnsFalse() {
+        assertThat(mFragment.isAlwaysDiscoverable(TEST_APP_NAME, TEST_ACTION)).isFalse();
+    }
+
+    @Test
+    public void isAlwaysDiscoverable_callingAppIsFromSettings_returnsTrue() {
+        assertThat(mFragment.isAlwaysDiscoverable(SETTINGS_PACKAGE_NAME, TEST_ACTION)).isTrue();
+    }
+
+    @Test
+    public void isAlwaysDiscoverable_callingAppIsFromSystemUI_returnsTrue() {
+        assertThat(mFragment.isAlwaysDiscoverable(SYSTEMUI_PACKAGE_NAME, TEST_ACTION)).isTrue();
+    }
+
+    @Test
+    public void isAlwaysDiscoverable_actionIsFromSlice_returnsFalse() {
+        assertThat(mFragment.isAlwaysDiscoverable(SYSTEMUI_PACKAGE_NAME, SLICE_ACTION)).isFalse();
+    }
+
+    @Test
     public void getPreferenceControllers_containSlicePrefController() {
         final List<BasePreferenceController> controllers =
                 PreferenceControllerListHelper.getPreferenceControllersFromXml(mContext,

diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
index 15fa5de..2831a4a 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java

@@ -27,6 +27,7 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -36,6 +37,7 @@
 import static org.mockito.Mockito.CALLS_REAL_METHODS;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
@@ -109,6 +111,8 @@
     private Network mNetwork;
     @Mock
     private Preference mPreference;
+    @Mock
+    private UserManager mUserManager;
     @Captor
     private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
     private PrivateDnsPreferenceController mController;
@@ -127,6 +131,7 @@
         mShadowContentResolver = Shadow.extract(mContentResolver);
         when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
         doNothing().when(mConnectivityManager).registerDefaultNetworkCallback(
                 mCallbackCaptor.capture(), nullable(Handler.class));
 
@@ -174,6 +179,12 @@
     }
 
     @Test
+    public void getAvailabilityStatus_disabledForGuestUser() {
+        doReturn(true).when(mUserManager).isGuestUser();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER);
+    }
+
+    @Test
     public void goThroughLifecycle_shouldRegisterUnregisterSettingsObserver() {
         mLifecycle.handleLifecycleEvent(ON_START);
         verify(mContext, atLeastOnce()).getContentResolver();

diff --git a/tests/robotests/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceControllerTest.java
new file mode 100644
index 0000000..3f48260
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceControllerTest.java

@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+
+package com.android.settings.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.app.AutomaticZenRule;
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.service.notification.ConditionProviderService;
+import android.service.notification.ZenPolicy;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AbstractZenModeAutomaticRulePreferenceControllerTest {
+
+    @Mock
+    private PackageManager mPm;
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void testGetSettingsActivity_configActivity() throws Exception {
+        AutomaticZenRule rule = new AutomaticZenRule("name", null,
+                new ComponentName(mContext.getPackageName(), "test"),  Uri.EMPTY,
+                new ZenPolicy(), NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
+        rule.setPackageName(mContext.getPackageName());
+
+        when(mPm.getPackageUid(null, 0)).thenReturn(-1);
+        when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+        ComponentName actual = AbstractZenModeAutomaticRulePreferenceController
+                .getSettingsActivity(mPm, rule, null);
+
+        assertThat(actual).isEqualTo(new ComponentName(mContext.getPackageName(), "test"));
+    }
+
+    @Test
+    public void testGetSettingsActivity_configActivity_wrongPackage() throws Exception {
+        AutomaticZenRule rule = new AutomaticZenRule("name", null,
+                new ComponentName("another", "test"),  Uri.EMPTY,
+                new ZenPolicy(), NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
+        rule.setPackageName(mContext.getPackageName());
+
+        when(mPm.getPackageUid(null, 0)).thenReturn(-1);
+        when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+        ComponentName actual = AbstractZenModeAutomaticRulePreferenceController
+                .getSettingsActivity(mPm, rule, null);
+
+        assertThat(actual).isNull();
+    }
+
+    @Test
+    public void testGetSettingsActivity_configActivity_unspecifiedOwner() throws Exception {
+        AutomaticZenRule rule = new AutomaticZenRule("name", null,
+                new ComponentName("another", "test"),  Uri.EMPTY,
+                new ZenPolicy(), NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
+
+        when(mPm.getPackageUid(null, 0)).thenReturn(-1);
+        when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+        ComponentName actual = AbstractZenModeAutomaticRulePreferenceController
+                .getSettingsActivity(mPm, rule, null);
+
+        assertThat(actual).isEqualTo(new ComponentName("another", "test"));
+    }
+
+    @Test
+    public void testGetSettingsActivity_cps() throws Exception {
+        AutomaticZenRule rule = new AutomaticZenRule("name",
+                new ComponentName(mContext.getPackageName(), "service"), null, Uri.EMPTY,
+                new ZenPolicy(), NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
+        rule.setPackageName(mContext.getPackageName());
+
+        ComponentInfo ci = new ComponentInfo();
+        ci.packageName = mContext.getPackageName();
+        ci.metaData = new Bundle();
+        ci.metaData.putString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY,
+                ComponentName.flattenToShortString(
+                        new ComponentName(mContext.getPackageName(), "activity")));
+
+        when(mPm.getPackageUid(null, 0)).thenReturn(-1);
+        when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+        ComponentName actual = AbstractZenModeAutomaticRulePreferenceController
+                .getSettingsActivity(mPm, rule, ci);
+
+        assertThat(actual).isEqualTo(new ComponentName(mContext.getPackageName(), "activity"));
+    }
+
+    @Test
+    public void testGetSettingsActivity_cps_wrongPackage() throws Exception {
+        AutomaticZenRule rule = new AutomaticZenRule("name",
+                new ComponentName(mContext.getPackageName(), "service"), null, Uri.EMPTY,
+                new ZenPolicy(), NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
+        rule.setPackageName("other");
+
+        ComponentInfo ci = new ComponentInfo();
+        ci.packageName = mContext.getPackageName();
+        ci.metaData = new Bundle();
+        ci.metaData.putString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY,
+                ComponentName.flattenToShortString(
+                        new ComponentName(mContext.getPackageName(), "activity")));
+
+        when(mPm.getPackageUid(null, 0)).thenReturn(-1);
+        when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+        ComponentName actual = AbstractZenModeAutomaticRulePreferenceController
+                .getSettingsActivity(mPm, rule, ci);
+
+        assertThat(actual).isNull();
+    }
+
+    @Test
+    public void testGetSettingsActivity_cps_unspecifiedPackage() throws Exception {
+        AutomaticZenRule rule = new AutomaticZenRule("name",
+                new ComponentName(mContext.getPackageName(), "service"), null, Uri.EMPTY,
+                new ZenPolicy(), NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
+
+        ComponentInfo ci = new ComponentInfo();
+        ci.packageName = mContext.getPackageName();
+        ci.metaData = new Bundle();
+        ci.metaData.putString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY,
+                ComponentName.flattenToShortString(
+                        new ComponentName(mContext.getPackageName(), "activity")));
+
+        when(mPm.getPackageUid(null, 0)).thenReturn(-1);
+        when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+        ComponentName actual = AbstractZenModeAutomaticRulePreferenceController
+                .getSettingsActivity(mPm, rule, ci);
+
+        assertThat(actual).isEqualTo(new ComponentName(mContext.getPackageName(), "activity"));
+    }
+}
\ No newline at end of file

diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 35d2205..c643c75 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk

@@ -14,10 +14,12 @@
 
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    androidx.test.core \
     androidx.test.rules \
     androidx.test.espresso.core \
     androidx.test.espresso.contrib-nodeps \
     androidx.test.espresso.intents-nodeps \
+    androidx.test.ext.junit \
     mockito-target-minus-junit4 \
     platform-test-annotations \
     truth-prebuilt \

diff --git a/tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java b/tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java
new file mode 100644
index 0000000..7877684
--- /dev/null
+++ b/tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+package com.android.settings;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.media.RingtoneManager;
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/** Unittest for DefaultRingtonePreference. */
+@RunWith(AndroidJUnit4.class)
+public class DefaultRingtonePreferenceTest {
+
+    private DefaultRingtonePreference mDefaultRingtonePreference;
+
+    @Mock
+    private ContentResolver mContentResolver;
+    @Mock
+    private Uri mRingtoneUri;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        Context context = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mContentResolver).when(context).getContentResolver();
+
+        mDefaultRingtonePreference = spy(new DefaultRingtonePreference(context, null /* attrs */));
+        doReturn(context).when(mDefaultRingtonePreference).getContext();
+        when(mDefaultRingtonePreference.getRingtoneType())
+                .thenReturn(RingtoneManager.TYPE_RINGTONE);
+        mDefaultRingtonePreference.setUserId(1);
+        mDefaultRingtonePreference.mUserContext = context;
+    }
+
+    @Test
+    public void onSaveRingtone_nullMimeType_shouldNotSetRingtone() {
+        when(mContentResolver.getType(mRingtoneUri)).thenReturn(null);
+
+        mDefaultRingtonePreference.onSaveRingtone(mRingtoneUri);
+
+        verify(mDefaultRingtonePreference, never()).setActualDefaultRingtoneUri(mRingtoneUri);
+    }
+
+    @Test
+    public void onSaveRingtone_notAudioMimeType_shouldNotSetRingtone() {
+        when(mContentResolver.getType(mRingtoneUri)).thenReturn("text/plain");
+
+        mDefaultRingtonePreference.onSaveRingtone(mRingtoneUri);
+
+        verify(mDefaultRingtonePreference, never()).setActualDefaultRingtoneUri(mRingtoneUri);
+    }
+}
commit	b9bafa0d3d1b2bf02d9b96eee505dfc492324bec	[log] [tgz]
author	Oli Lan <olilan@google.com>	Mon Aug 22 14:27:57 2022 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Mon Aug 22 14:27:57 2022 +0000
tree	3c2494fe8e7122c3be68985e628b9502b69f6c4c
parent	65b18b5e6945a37511d46ff93d3eea3c04b5d567 [diff]
parent	c0742e745da55452a412b4bb7bd28c5ecf3a8cb2 [diff]