diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 74c271b..2cc97aa 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -301,12 +301,6 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".system.AccessibilityActivity"
-            android:theme="@style/Theme.Settings.Transparent"
-            android:configChanges="keyboard|keyboardHidden|navigation"
-            android:excludeFromRecents="true"
-            android:exported="true" />
-        <activity
             android:name=".system.CaptionSetupActivity"
             android:configChanges="keyboard|keyboardHidden|navigation"
             android:excludeFromRecents="true"
diff --git a/Settings/res/values-af/strings.xml b/Settings/res/values-af/strings.xml
index 25997b0..3f6548f 100644
--- a/Settings/res/values-af/strings.xml
+++ b/Settings/res/values-af/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Dienste"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Diensinstellings"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Hoëkontras-teks"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Toeganklikheid-kortpad"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Aktiveer toeganklikheidskortpad"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Kortpaddiens"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Wanneer die kortpad aan is, kan jy beide Tuis en Kies vir 3 sekondes druk om \'n toeganklikheidskenmerk te begin"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Onderskrifte"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Instellings vir geslote onderskrifteks-oorlegging op video"</string>
     <string name="captions_display" msgid="735692527287125548">"Vertoon"</string>
diff --git a/Settings/res/values-am/strings.xml b/Settings/res/values-am/strings.xml
index 26803ca..a7124a4 100644
--- a/Settings/res/values-am/strings.xml
+++ b/Settings/res/values-am/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"አገልግሎቶች"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"የአገልግሎት ቅንብሮች"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ከፍተኛ ንጽጽር ጽሁፍ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"የተደራሽነት አቋራጭ"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"የተደራሽነት አቋራጭ ያንቁ"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"የአቋራጭ አገልግሎት"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"አቋራጩ ሲበራ፣ የተደራሽነት ባህሪውን ለማስጀመር ሁለቱንም መነሻ ለ3 ሰከንዶች ተጭነው መያዝ ይችላሉ"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"መግለጫ ፅሑፎች"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"በቪዲዮ ላይ ያለ የዝግ ጽሑፍ ተደራቢ ቅንብሮች"</string>
     <string name="captions_display" msgid="735692527287125548">"ማሳያ"</string>
diff --git a/Settings/res/values-ar/strings.xml b/Settings/res/values-ar/strings.xml
index a49cb07..8763104 100644
--- a/Settings/res/values-ar/strings.xml
+++ b/Settings/res/values-ar/strings.xml
@@ -372,6 +372,10 @@
     <string name="system_services" msgid="7230571820151215779">"الخدمات"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"إعدادات الخدمات"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"النص ذو درجة التباين العالية"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"اختصار إمكانية الوصول"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"تمكين اختصار إمكانية الوصول"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"خدمة الاختصار"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"عند تشغيل الاختصار، يمكنك الضغط على زري الصفحة الرئيسية لمدة 3 ثوانٍ لبدء تشغيل ميزة إمكانية الوصول."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"الترجمة والشرح"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"إعدادات تركيب نص الترجمة والشرح على الفيديو"</string>
     <string name="captions_display" msgid="735692527287125548">"العرض"</string>
diff --git a/Settings/res/values-az/strings.xml b/Settings/res/values-az/strings.xml
index 9faa083..8348e9b 100644
--- a/Settings/res/values-az/strings.xml
+++ b/Settings/res/values-az/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Xidmətlər"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Xidmət ayarları"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Yüksək kontrastlı mətn"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Əlçatımlılıq qısayolu"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Əlçatımlılıq qısayolunu aktiv edin"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Qısayol xidməti"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Qısayol aktiv olduqda əsas və seçin düymələrinə 3 saniyə basmaqla əlçatımlılıq funksiyasını başladın"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Başlıqlar"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Videoda mətn qatı qapalı subtitrlər üçün ayarlar"</string>
     <string name="captions_display" msgid="735692527287125548">"Ekran"</string>
diff --git a/Settings/res/values-b+sr+Latn/strings.xml b/Settings/res/values-b+sr+Latn/strings.xml
index ce25039..7174524 100644
--- a/Settings/res/values-b+sr+Latn/strings.xml
+++ b/Settings/res/values-b+sr+Latn/strings.xml
@@ -369,6 +369,10 @@
     <string name="system_services" msgid="7230571820151215779">"Usluge"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Podešavanja usluge"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst visokog kontrasta"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Prečica za pristupačnost"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Omogući prečicu za pristupačnost"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Usluga prečice"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kada je uključena, pritiskom na Početna i Izaberi na 3 sekunde pokrećete funkciju pristupačnosti."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Titl"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Podešavanja za postavljanje teksta opcionalnog titla preko video snimka"</string>
     <string name="captions_display" msgid="735692527287125548">"Ekran"</string>
diff --git a/Settings/res/values-be/arrays.xml b/Settings/res/values-be/arrays.xml
new file mode 100644
index 0000000..b0dd40a
--- /dev/null
+++ b/Settings/res/values-be/arrays.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="sleep_timeout_entries">
+    <item msgid="1213527366819650274">"5 хвілін"</item>
+    <item msgid="6561800022721381078">"15 хвілін"</item>
+    <item msgid="7718735533503035428">"30 хвілін"</item>
+    <item msgid="8784595382489738498">"1 гадзіна"</item>
+    <item msgid="1529312035777735084">"2 гадзіны"</item>
+  </string-array>
+  <string-array name="screen_off_timeout_entries">
+    <item msgid="8244337465472020927">"30 хвілін"</item>
+    <item msgid="1001586019759702505">"1 гадзіна"</item>
+    <item msgid="5216959047515554188">"3 гадзіны"</item>
+    <item msgid="4152882798140628647">"6 гадзін"</item>
+    <item msgid="412984226950404956">"12 гадзін"</item>
+    <item msgid="2178434662173258997">"Ніколі"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="4410581208185456276">"Стандартны"</item>
+    <item msgid="9033306684422202101">"Без засечак"</item>
+    <item msgid="1864985245839120339">"Без засечак ушчыльнены"</item>
+    <item msgid="2707402752636362906">"Без засечак монашырынны"</item>
+    <item msgid="4549910217342216388">"З засечкамі"</item>
+    <item msgid="4764344884232052861">"З засечкамі монашырынны"</item>
+    <item msgid="8561996903323025702">"Звычайны"</item>
+    <item msgid="8403638572764467550">"Курсіўны"</item>
+    <item msgid="5560655268137500927">"Малыя прапісныя літары"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4304493614734189861">"Вельмі дробны"</item>
+    <item msgid="1694402928400844023">"Дробны"</item>
+    <item msgid="1235495470844109970">"Звычайны"</item>
+    <item msgid="481223375568095790">"Вялікі"</item>
+    <item msgid="8614563351231073075">"Вельмі вялікі"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="5333047169042840730">"Няма"</item>
+    <item msgid="7663488423233018922">"Контур"</item>
+    <item msgid="7891048730741670843">"Цень"</item>
+    <item msgid="6613725572146700438">"Прыўзняты"</item>
+    <item msgid="1007736533206905292">"Уціснуты"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7311196539184412021">"25 %"</item>
+    <item msgid="4609292560884303243">"50 %"</item>
+    <item msgid="1626485489418859846">"75 %"</item>
+    <item msgid="1811192455405034366">"100 %"</item>
+  </string-array>
+  <string-array name="surround_sound_entries">
+    <item msgid="5639265918353416799">"Аўтаматычна"</item>
+    <item msgid="5990497479384785807">"Заўсёды"</item>
+    <item msgid="6178602073308944697">"Ніколі"</item>
+  </string-array>
+</resources>
diff --git a/Settings/res/values-be/strings.xml b/Settings/res/values-be/strings.xml
index fd15405..14b08bc 100644
--- a/Settings/res/values-be/strings.xml
+++ b/Settings/res/values-be/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Сэрвісы"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Налады службы"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Высокая кантрастнасць тэксту"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Ярлык для спецыяльных магчымасцей"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Уключыць ярлык спецыяльных магчымасцей"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Сэрвіс ярлыкоў"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Калі ярлык уключаны, вы можаце націснуць і ўтрымліваць клавішу галоўнага экрана і клавішу выбару на працягу 3 секунд, каб запусціць функцыю спецыяльных магчымасцей"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Цітры"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Налады для накладання тэксту схаваных цітраў на відэа"</string>
     <string name="captions_display" msgid="735692527287125548">"Дысплэй"</string>
diff --git a/Settings/res/values-be/widget-strings.xml b/Settings/res/values-be/widget-strings.xml
new file mode 100644
index 0000000..61500b0
--- /dev/null
+++ b/Settings/res/values-be/widget-strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="ampm">
+    <item msgid="4375405926289364989">"да паўдня"</item>
+    <item msgid="4802437431289555052">"пасля паўдня"</item>
+  </string-array>
+    <string name="date_separator" msgid="7882269975674640060">"."</string>
+    <string name="time_separator" msgid="7760859333083008983">":"</string>
+    <string name="text_obfuscation_toggle_caption" msgid="3785289190730642093">"Схаваць пароль"</string>
+</resources>
diff --git a/Settings/res/values-bg/strings.xml b/Settings/res/values-bg/strings.xml
index 1af5f77..51c2b0a 100644
--- a/Settings/res/values-bg/strings.xml
+++ b/Settings/res/values-bg/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Услуги"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Настройки на услугите"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Текст с висок контраст"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Пряк път към функцията за достъпност"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Активиране на пряк път към функцията за достъпност"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Услуга за прекия път"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Когато прекият път е включен, можете да стартирате дадена функция за достъпност, като натиснете бутоните „Начало“ и „Избиране“ и ги задържите за 3 секунди."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Надписи"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Настройки за наслагване на надписи върху видеоклип"</string>
     <string name="captions_display" msgid="735692527287125548">"Показване"</string>
diff --git a/Settings/res/values-bn/strings.xml b/Settings/res/values-bn/strings.xml
index e7b4106..ab386eb 100644
--- a/Settings/res/values-bn/strings.xml
+++ b/Settings/res/values-bn/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"পরিষেবাগুলি"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"পরিষেবা সেটিংস"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"উচ্চ কনট্রাস্ট যুক্ত পাঠ্য"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"অ্যাক্সেসযোগ্যতার শর্টকাট"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"অ্যাক্সেসযোগ্যতা শর্টকাট সক্ষম করুন"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"শর্টকাট পরিষেবা"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"যখন শর্টকাটটি চালু থাকবে, কোনো অ্যাক্সেসযোগ্যতা বৈশিষ্ট্য চালু করতে আপনি উভয় হোম ও নির্বাচন বোতামকে ৩ সেকেন্ডের জন্য টিপে ধরতে পারেন।"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"ক্যাপশন"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"ভিডিওতে ক্লোজড ক্যাপশনিং পাঠ্য ওভারলের জন্য সেটিংস"</string>
     <string name="captions_display" msgid="735692527287125548">"প্রদর্শন"</string>
diff --git a/Settings/res/values-bs/arrays.xml b/Settings/res/values-bs/arrays.xml
new file mode 100644
index 0000000..2fc188a
--- /dev/null
+++ b/Settings/res/values-bs/arrays.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="sleep_timeout_entries">
+    <item msgid="1213527366819650274">"5 minuta"</item>
+    <item msgid="6561800022721381078">"15 minuta"</item>
+    <item msgid="7718735533503035428">"30 minuta"</item>
+    <item msgid="8784595382489738498">"1 sat"</item>
+    <item msgid="1529312035777735084">"2 sata"</item>
+  </string-array>
+  <string-array name="screen_off_timeout_entries">
+    <item msgid="8244337465472020927">"30 minuta"</item>
+    <item msgid="1001586019759702505">"1 sat"</item>
+    <item msgid="5216959047515554188">"3 sata"</item>
+    <item msgid="4152882798140628647">"6 sati"</item>
+    <item msgid="412984226950404956">"12 sati"</item>
+    <item msgid="2178434662173258997">"Nikada"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="4410581208185456276">"Zadano"</item>
+    <item msgid="9033306684422202101">"Sans-serif"</item>
+    <item msgid="1864985245839120339">"Sans-serif zbijeni"</item>
+    <item msgid="2707402752636362906">"Sans-serif fiksnog razmaka"</item>
+    <item msgid="4549910217342216388">"Serif"</item>
+    <item msgid="4764344884232052861">"Serif fiksnog razmaka"</item>
+    <item msgid="8561996903323025702">"Ležerno"</item>
+    <item msgid="8403638572764467550">"Kurziv"</item>
+    <item msgid="5560655268137500927">"Mala početna slova"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4304493614734189861">"Veoma mala"</item>
+    <item msgid="1694402928400844023">"Mala"</item>
+    <item msgid="1235495470844109970">"Normalna"</item>
+    <item msgid="481223375568095790">"Velika"</item>
+    <item msgid="8614563351231073075">"Veoma velika"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="5333047169042840730">"Ništa"</item>
+    <item msgid="7663488423233018922">"Obris"</item>
+    <item msgid="7891048730741670843">"Sjena"</item>
+    <item msgid="6613725572146700438">"Podignuto"</item>
+    <item msgid="1007736533206905292">"Udubljena"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7311196539184412021">"25%"</item>
+    <item msgid="4609292560884303243">"50%"</item>
+    <item msgid="1626485489418859846">"75%"</item>
+    <item msgid="1811192455405034366">"100%"</item>
+  </string-array>
+  <string-array name="surround_sound_entries">
+    <item msgid="5639265918353416799">"Automatski"</item>
+    <item msgid="5990497479384785807">"Uvijek"</item>
+    <item msgid="6178602073308944697">"Nikada"</item>
+  </string-array>
+</resources>
diff --git a/Settings/res/values-bs/strings.xml b/Settings/res/values-bs/strings.xml
index 7e46ada..9033e17 100644
--- a/Settings/res/values-bs/strings.xml
+++ b/Settings/res/values-bs/strings.xml
@@ -369,6 +369,10 @@
     <string name="system_services" msgid="7230571820151215779">"Usluge"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Postavke usluge"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst visokog kontrasta"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Prečica za pristupačnost"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Omogućavanje prečice za pristupačnost"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Usluga prečice"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kada je uključena prečica, možete istovremeno pritisnuti i držati 3 sekunde dugme za početni ekran i odabir da pokrenete funkciju pristupačnosti."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Titlovi"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Postavke za prikaz teksta titla preko videozapisa"</string>
     <string name="captions_display" msgid="735692527287125548">"Prikaz"</string>
diff --git a/Settings/res/values-bs/widget-strings.xml b/Settings/res/values-bs/widget-strings.xml
new file mode 100644
index 0000000..55ec2c4
--- /dev/null
+++ b/Settings/res/values-bs/widget-strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="ampm">
+    <item msgid="4375405926289364989">"prijepodne"</item>
+    <item msgid="4802437431289555052">"popodne"</item>
+  </string-array>
+    <string name="date_separator" msgid="7882269975674640060">"/"</string>
+    <string name="time_separator" msgid="7760859333083008983">":"</string>
+    <string name="text_obfuscation_toggle_caption" msgid="3785289190730642093">"Sakrij lozinku"</string>
+</resources>
diff --git a/Settings/res/values-ca/arrays.xml b/Settings/res/values-ca/arrays.xml
index abd698e..07a97a6 100644
--- a/Settings/res/values-ca/arrays.xml
+++ b/Settings/res/values-ca/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="1811192455405034366">"100%"</item>
   </string-array>
   <string-array name="surround_sound_entries">
-    <item msgid="5639265918353416799">"Automàtica"</item>
+    <item msgid="5639265918353416799">"Automàtic"</item>
     <item msgid="5990497479384785807">"Sempre"</item>
     <item msgid="6178602073308944697">"Mai"</item>
   </string-array>
diff --git a/Settings/res/values-ca/strings.xml b/Settings/res/values-ca/strings.xml
index d918313..ee040af 100644
--- a/Settings/res/values-ca/strings.xml
+++ b/Settings/res/values-ca/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Serveis"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Configuració del servei"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Text d\'alt contrast"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Drecera d\'accessibilitat"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Activa la drecera d\'accessibilitat"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Servei associat a la drecera"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Si està activada, pots iniciar una funció d\'accessibilitat prement els botons d\'inici i selecció a la vegada durant 3 segons"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtítols"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Configuració de la superposició del text dels subtítols ocults als vídeos"</string>
     <string name="captions_display" msgid="735692527287125548">"Pantalla"</string>
diff --git a/Settings/res/values-cs/strings.xml b/Settings/res/values-cs/strings.xml
index 691a4e4..980272c 100644
--- a/Settings/res/values-cs/strings.xml
+++ b/Settings/res/values-cs/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Služby"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Nastavení služby"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Text s vysokým kontrastem"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Zkratka usnadnění"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Aktivovat zkratku přístupnosti"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Služba ovládaná zkratkou"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Když je tato zkratka zapnutá, můžete funkci přístupnosti spustit tím, že na tři sekundy podržíte tlačítka plochy a výběru."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Titulky"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Nastavení překryvné vrstvy s textem skrytých titulků ve videu"</string>
     <string name="captions_display" msgid="735692527287125548">"Zobrazení"</string>
diff --git a/Settings/res/values-da/strings.xml b/Settings/res/values-da/strings.xml
index 447c5b2..def78f1 100644
--- a/Settings/res/values-da/strings.xml
+++ b/Settings/res/values-da/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Tjenester"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Tjenesteindstillinger"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst med stor kontrast"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Genvej til hjælpefunktion"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Aktivér genvej til Hjælpefunktioner"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Genvejstjeneste"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Når genvejen er slået til, kan du starte en hjælpefunktion ved at trykke på både Start og Vælg i tre sekunder."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Undertekster"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Indstillinger for tekstoverlejring af undertekster på video"</string>
     <string name="captions_display" msgid="735692527287125548">"Vis undertekster"</string>
diff --git a/Settings/res/values-de/strings.xml b/Settings/res/values-de/strings.xml
index 8421b8e..0ff07b5 100644
--- a/Settings/res/values-de/strings.xml
+++ b/Settings/res/values-de/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Dienste"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Diensteinstellungen"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Text mit hohem Kontrast"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Verknüpfung für Bedienungshilfen"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Verknüpfung für Bedienungshilfen aktivieren"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Verknüpfter Dienst"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Wenn die Verknüpfung aktiviert ist, kannst du die Startbildschirmtaste und die Auswahltaste drei Sekunden lang gedrückt halten, um eine Bedienungshilfe zu starten"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Untertitel"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Einstellungen für Untertitel-Overlays in einem Video"</string>
     <string name="captions_display" msgid="735692527287125548">"Anzeige"</string>
diff --git a/Settings/res/values-el/strings.xml b/Settings/res/values-el/strings.xml
index 3a71243..3437945 100644
--- a/Settings/res/values-el/strings.xml
+++ b/Settings/res/values-el/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Υπηρεσίες"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Ρυθμίσεις υπηρεσίας"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Κείμενο υψηλής αντίθεσης"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Συντόμευση προσβασιμότητας"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Ενεργοποίηση συντόμευσης προσβασιμότητας"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Υπηρεσία συντόμευσης"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Με τη συντόμευση ενεργή, πατήστε \"Αρχική οθόνη\" ή \"Επιλογή\" για 3 δευτ. για έναρξη λειτ. προσβασιμ."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Υπότιτλοι"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Ρυθμίσεις για την επικάλυψη κειμένου υποτίτλων στο βίντεο"</string>
     <string name="captions_display" msgid="735692527287125548">"Προβολή"</string>
diff --git a/Settings/res/values-en-rAU/strings.xml b/Settings/res/values-en-rAU/strings.xml
index fbbd867..378f3fa 100644
--- a/Settings/res/values-en-rAU/strings.xml
+++ b/Settings/res/values-en-rAU/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Services"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Service settings"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"High-contrast text"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Accessibility shortcut"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Enable accessibility shortcut"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Shortcut service"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"When the shortcut is on, you can press both home and select for 3 seconds to start an accessibility feature"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Captions"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Settings for closed captioning text overlay on video"</string>
     <string name="captions_display" msgid="735692527287125548">"Display"</string>
diff --git a/Settings/res/values-en-rGB/strings.xml b/Settings/res/values-en-rGB/strings.xml
index fbbd867..378f3fa 100644
--- a/Settings/res/values-en-rGB/strings.xml
+++ b/Settings/res/values-en-rGB/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Services"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Service settings"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"High-contrast text"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Accessibility shortcut"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Enable accessibility shortcut"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Shortcut service"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"When the shortcut is on, you can press both home and select for 3 seconds to start an accessibility feature"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Captions"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Settings for closed captioning text overlay on video"</string>
     <string name="captions_display" msgid="735692527287125548">"Display"</string>
diff --git a/Settings/res/values-en-rIN/strings.xml b/Settings/res/values-en-rIN/strings.xml
index fbbd867..378f3fa 100644
--- a/Settings/res/values-en-rIN/strings.xml
+++ b/Settings/res/values-en-rIN/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Services"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Service settings"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"High-contrast text"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Accessibility shortcut"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Enable accessibility shortcut"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Shortcut service"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"When the shortcut is on, you can press both home and select for 3 seconds to start an accessibility feature"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Captions"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Settings for closed captioning text overlay on video"</string>
     <string name="captions_display" msgid="735692527287125548">"Display"</string>
diff --git a/Settings/res/values-es-rUS/strings.xml b/Settings/res/values-es-rUS/strings.xml
index aa4357f..fe9b6d7 100644
--- a/Settings/res/values-es-rUS/strings.xml
+++ b/Settings/res/values-es-rUS/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Servicios"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Configuración del servicio"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texto de alto contraste"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Acceso directo a accesibilidad"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Habilitar combinación de teclas de accesibilidad"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Servicio de combinación de teclas"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Combinación de teclas activada: Presiona Inicio y selección por 3 segundos para abrir accesibilidad"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtítulos"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Configuración del texto de subtítulos opcionales superpuestos en el video"</string>
     <string name="captions_display" msgid="735692527287125548">"Pantalla"</string>
diff --git a/Settings/res/values-es/strings.xml b/Settings/res/values-es/strings.xml
index a98a155..1708cd3 100644
--- a/Settings/res/values-es/strings.xml
+++ b/Settings/res/values-es/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Servicios"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Configuración del servicio"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texto de alto contraste"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Acceso directo a accesibilidad"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Habilitar acceso directo de accesibilidad"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Servicio del acceso directo"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Si acceso directo está activado, pulsa botones inicio y selección tres segundos para iniciar accesibilidad."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtítulos"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Ajustes para la superposición de texto de subtítulos en vídeo"</string>
     <string name="captions_display" msgid="735692527287125548">"Mostrar"</string>
diff --git a/Settings/res/values-et/strings.xml b/Settings/res/values-et/strings.xml
index a0c2d00..ab0bb53 100644
--- a/Settings/res/values-et/strings.xml
+++ b/Settings/res/values-et/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Teenused"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Teenuse seaded"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Suure kontrastsusega tekst"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Juurdepääsetavuse otsetee"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Luba juurdepääsetavuse otsetee"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Otsetee teenus"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kui otsetee on s. lülitatud, hoidke avalehe ja valimise nuppu kolm sekundit all, et käiv. juurdep-funktsioon"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtiitrid"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Video subtiitrite teksti ülekatte seaded"</string>
     <string name="captions_display" msgid="735692527287125548">"Kuvamine"</string>
diff --git a/Settings/res/values-eu/strings.xml b/Settings/res/values-eu/strings.xml
index 87211c6..c55ebec 100644
--- a/Settings/res/values-eu/strings.xml
+++ b/Settings/res/values-eu/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Zerbitzuak"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Zerbitzuaren ezarpenak"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Kontraste handiko testua"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Erabilerraztasunaren lasterbidea"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Gaitu erabilerraztasunaren lasterbidea"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Lasterbideari esleitutako zerbitzua"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Aktibatuz gero, hasiera- eta hautapen-botoiak 3 segundoz sakatuta abiarazten da eginbidea"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Azpitituluak"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Bideoetako azpitituluen testua gainjartzeko ezarpenak"</string>
     <string name="captions_display" msgid="735692527287125548">"Bistaratzea"</string>
diff --git a/Settings/res/values-fa/strings.xml b/Settings/res/values-fa/strings.xml
index 2a67fee..3ddd40b 100644
--- a/Settings/res/values-fa/strings.xml
+++ b/Settings/res/values-fa/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"سرویس‌ها"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"تنظیمات سرویس"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"نوشتار با کنتراست بالا"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"میان‌بر دسترس‌پذیری"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"فعال کردن میان‌بر دسترسی‌پذیری"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"سرویس میان‌بر"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"وقتی میان‌بر روشن است، برای شروع قابلیت دسترس‌پذیری صفحه اصلی و انتخاب را به‌مدت ۳ ثانیه فشار دهید."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"زیرنویس"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"تنظیمات وضعیت متن زیرنویس روی ویدئو"</string>
     <string name="captions_display" msgid="735692527287125548">"نمایشگر"</string>
diff --git a/Settings/res/values-fi/strings.xml b/Settings/res/values-fi/strings.xml
index 24fa13b..3740d2f 100644
--- a/Settings/res/values-fi/strings.xml
+++ b/Settings/res/values-fi/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Palvelut"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Palveluasetukset"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Suurikontrastinen teksti"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Esteettömyystilan pikanäppäin"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Ota esteettömyystilan pikakuvake käyttöön"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Pikanäppäinpalvelu"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kun pikanäppäin on käytössä, voit käynnistää esteettömyystilan pitämällä koti- ja valintanäppäimiä painettuina kolmen sekunnin ajan."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Tekstitykset"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Videon päällä näytettävän tekstityksen asetukset"</string>
     <string name="captions_display" msgid="735692527287125548">"Ruutu"</string>
diff --git a/Settings/res/values-fr-rCA/strings.xml b/Settings/res/values-fr-rCA/strings.xml
index 8ac48be..5759901 100644
--- a/Settings/res/values-fr-rCA/strings.xml
+++ b/Settings/res/values-fr-rCA/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Services"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Paramètres du service"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texte avec contraste élevé"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Raccourci d\'accessibilité"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Activer le raccourci d\'accessibilité"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Service de raccourcis"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Lorsque le racc. est activé, appuyez sur les boutons Accueil et Sélection pour démarr. une fonction d\'accessibilité"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Sous-titres"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Paramètres de superposition du texte des sous-titres sur la vidéo"</string>
     <string name="captions_display" msgid="735692527287125548">"Affichage"</string>
diff --git a/Settings/res/values-fr/strings.xml b/Settings/res/values-fr/strings.xml
index 55e258a..ded5d35 100644
--- a/Settings/res/values-fr/strings.xml
+++ b/Settings/res/values-fr/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Services"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Paramètres du service"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texte avec contraste élevé"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Raccourci d\'accessibilité"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Activer le raccourci d\'accessibilité"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Service associé au raccourci"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Lorsque le raccourci est activé, vous pouvez appuyer simultanément sur les boutons d\'accueil et de sélection pendant trois secondes pour lancer une fonctionnalité d\'accessibilité."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Sous-titres"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Paramètres de superposition du texte des sous-titres sur la vidéo"</string>
     <string name="captions_display" msgid="735692527287125548">"Affichage"</string>
diff --git a/Settings/res/values-gl/strings.xml b/Settings/res/values-gl/strings.xml
index 8163ddc..d0180b9 100644
--- a/Settings/res/values-gl/strings.xml
+++ b/Settings/res/values-gl/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Servizos"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Configuración dos servizos"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texto de alto contraste"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Atallo de accesibilidade"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Activar atallo de accesibilidade"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Servizo de atallo"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Cando o atallo está activado, para iniciar unha función de accesibilidade preme durante 3 segundos Inicio e Seleccionar."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtítulos"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Configuración para a superposición de texto de subtítulos en vídeo"</string>
     <string name="captions_display" msgid="735692527287125548">"Pantalla"</string>
diff --git a/Settings/res/values-gu/arrays.xml b/Settings/res/values-gu/arrays.xml
new file mode 100644
index 0000000..10ebb74
--- /dev/null
+++ b/Settings/res/values-gu/arrays.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="sleep_timeout_entries">
+    <item msgid="1213527366819650274">"5 મિનિટ"</item>
+    <item msgid="6561800022721381078">"15 મિનિટ"</item>
+    <item msgid="7718735533503035428">"30 મિનિટ"</item>
+    <item msgid="8784595382489738498">"1 કલાક"</item>
+    <item msgid="1529312035777735084">"2 કલાક"</item>
+  </string-array>
+  <string-array name="screen_off_timeout_entries">
+    <item msgid="8244337465472020927">"30 મિનિટ"</item>
+    <item msgid="1001586019759702505">"1 કલાક"</item>
+    <item msgid="5216959047515554188">"3 કલાક"</item>
+    <item msgid="4152882798140628647">"6 કલાક"</item>
+    <item msgid="412984226950404956">"12 કલાક"</item>
+    <item msgid="2178434662173258997">"ક્યારેય નહીં"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="4410581208185456276">"ડિફૉલ્ટ"</item>
+    <item msgid="9033306684422202101">"Sans-serif"</item>
+    <item msgid="1864985245839120339">"Sans-serif condensed"</item>
+    <item msgid="2707402752636362906">"Sans-serif monospace"</item>
+    <item msgid="4549910217342216388">"Serif"</item>
+    <item msgid="4764344884232052861">"Serif monospace"</item>
+    <item msgid="8561996903323025702">"કેઝ્યુઅલ"</item>
+    <item msgid="8403638572764467550">"કર્સિવ"</item>
+    <item msgid="5560655268137500927">"નાના કેપિટલ"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4304493614734189861">"ઘણું નાનું"</item>
+    <item msgid="1694402928400844023">"નાનું"</item>
+    <item msgid="1235495470844109970">"સામાન્ય"</item>
+    <item msgid="481223375568095790">"મોટું"</item>
+    <item msgid="8614563351231073075">"ઘણું મોટું"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="5333047169042840730">"કોઈ નહીં"</item>
+    <item msgid="7663488423233018922">"બાહ્યરેખા"</item>
+    <item msgid="7891048730741670843">"ડ્રૉપ શૅડો"</item>
+    <item msgid="6613725572146700438">"ઉઠાવેલું"</item>
+    <item msgid="1007736533206905292">"સંક્ષિપ્ત"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7311196539184412021">"25%"</item>
+    <item msgid="4609292560884303243">"50%"</item>
+    <item msgid="1626485489418859846">"75%"</item>
+    <item msgid="1811192455405034366">"100%"</item>
+  </string-array>
+  <string-array name="surround_sound_entries">
+    <item msgid="5639265918353416799">"સ્વતઃ"</item>
+    <item msgid="5990497479384785807">"હંમેશાં"</item>
+    <item msgid="6178602073308944697">"ક્યારેય નહીં"</item>
+  </string-array>
+</resources>
diff --git a/Settings/res/values-gu/strings.xml b/Settings/res/values-gu/strings.xml
index d771103..f950a0c 100644
--- a/Settings/res/values-gu/strings.xml
+++ b/Settings/res/values-gu/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"સેવાઓ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"સેવા સેટિંગ્સ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ઉચ્ચ કોન્ટ્રાસ્ટ ટેક્સ્ટ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ઍક્સેસિબિલિટી શૉર્ટકટ"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ઍક્સેસિબિલિટી શૉર્ટકટ સક્ષમ કરો"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"શૉર્ટકટ સેવા"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને હોમ બટનને દબાવી અને 3 સેકન્ડ સુધી પસંદ કરી શકો છો."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"ઉપશીર્ષકો"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"વિડિઓ પર ઉપશીર્ષક ટેક્સ્ટ ઓવરલે માટે સેટિંગ્સ"</string>
     <string name="captions_display" msgid="735692527287125548">"પ્રદર્શન"</string>
diff --git a/Settings/res/values-gu/widget-strings.xml b/Settings/res/values-gu/widget-strings.xml
new file mode 100644
index 0000000..c7fc0a4
--- /dev/null
+++ b/Settings/res/values-gu/widget-strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="ampm">
+    <item msgid="4375405926289364989">"AM"</item>
+    <item msgid="4802437431289555052">"PM"</item>
+  </string-array>
+    <string name="date_separator" msgid="7882269975674640060">"/"</string>
+    <string name="time_separator" msgid="7760859333083008983">":"</string>
+    <string name="text_obfuscation_toggle_caption" msgid="3785289190730642093">"પાસવર્ડ છુપાવો"</string>
+</resources>
diff --git a/Settings/res/values-hi/arrays.xml b/Settings/res/values-hi/arrays.xml
index 617bee5..bbdbb36 100644
--- a/Settings/res/values-hi/arrays.xml
+++ b/Settings/res/values-hi/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="1811192455405034366">"100%"</item>
   </string-array>
   <string-array name="surround_sound_entries">
-    <item msgid="5639265918353416799">"स्वतः"</item>
+    <item msgid="5639265918353416799">"ऑटो"</item>
     <item msgid="5990497479384785807">"हमेशा"</item>
     <item msgid="6178602073308944697">"कभी नहीं"</item>
   </string-array>
diff --git a/Settings/res/values-hi/strings.xml b/Settings/res/values-hi/strings.xml
index c7991a9..54409b3 100644
--- a/Settings/res/values-hi/strings.xml
+++ b/Settings/res/values-hi/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"सेवाएं"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"सेवा सेटिंग"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"उच्च कंट्रास्ट लेख"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"एक्सेस-योग्यता शॉर्टकट"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"एक्सेस-योग्यता शॉर्टकट सक्षम करें"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"शॉर्टकट सेवा"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"शॉर्टकट चालू होने पर, होम और चुनें दोनों को 3 सेकंड दबाकर आप एक्सेस-योग्यता सेवा चालू कर सकते हैं."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"कैप्शन"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"वीडियो पर बंद अनुशीर्षक देने वाले लेख ओवरले की सेटिंग"</string>
     <string name="captions_display" msgid="735692527287125548">"प्रदर्शन"</string>
diff --git a/Settings/res/values-hr/strings.xml b/Settings/res/values-hr/strings.xml
index ffda964..4d3a166 100644
--- a/Settings/res/values-hr/strings.xml
+++ b/Settings/res/values-hr/strings.xml
@@ -369,6 +369,10 @@
     <string name="system_services" msgid="7230571820151215779">"Usluge"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Postavke usluge"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst s visokim kontrastom"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Prečac pristupačnosti"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Omogući prečac pristupačnosti"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Usluga prečaca"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kad je taj prečac uključen, možete na tri sekunde pritisnuti oba gumba početnog zaslona kako biste pokrenuli značajku pristupačnosti"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Titlovi"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Postavke za preklapanje teksta titlova u videozapisu"</string>
     <string name="captions_display" msgid="735692527287125548">"Zaslon"</string>
diff --git a/Settings/res/values-hu/strings.xml b/Settings/res/values-hu/strings.xml
index 545283a..b755809 100644
--- a/Settings/res/values-hu/strings.xml
+++ b/Settings/res/values-hu/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Szolgáltatások"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Szolgáltatás beállításai"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Nagy kontrasztú szöveg"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Billentyűparancs kisegítő lehetőségekhez"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Kisegítő lehetőségek engedélyezése"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Billentyűparancs szolgáltatás"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Ha be van kapcsolva a billentyűparancs, a Főoldal és Kiválasztás gomb 3 másodpercig tartó lenyomásával elindíthatja a kisegítő lehetőségek funkciót"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Feliratok"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Mentett feliratok szövegrétegének beállítása videóknál"</string>
     <string name="captions_display" msgid="735692527287125548">"Megjelenítés"</string>
diff --git a/Settings/res/values-hy/strings.xml b/Settings/res/values-hy/strings.xml
index b8834f2..78aaf1b 100644
--- a/Settings/res/values-hy/strings.xml
+++ b/Settings/res/values-hy/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Ծառայություններ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Ծառայության կարգավորումներ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Ցայտուն տեքստ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Մատչելիության դյուրանցում"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Միացնել մատչելիության դյուրացումը"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Դյուրանցման ծառայություն"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Դյուրանցման միջոցով կարող եք անցնել մատչելիության ռեժիմ, Տուն և Ընտրել կոճակները 3 վայրկյան սեղմելով։"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Ենթագրեր"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Տեսանյութի խորագրերի կարգավորում"</string>
     <string name="captions_display" msgid="735692527287125548">"Էկրան"</string>
diff --git a/Settings/res/values-in/arrays.xml b/Settings/res/values-in/arrays.xml
index 82998ff..199d6da 100644
--- a/Settings/res/values-in/arrays.xml
+++ b/Settings/res/values-in/arrays.xml
@@ -52,7 +52,7 @@
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="5333047169042840730">"Tidak ada"</item>
     <item msgid="7663488423233018922">"Garis batas"</item>
-    <item msgid="7891048730741670843">"Bayangan jatuh"</item>
+    <item msgid="7891048730741670843">"Drop shadow"</item>
     <item msgid="6613725572146700438">"Dinaikkan"</item>
     <item msgid="1007736533206905292">"Diturunkan"</item>
   </string-array>
diff --git a/Settings/res/values-in/strings.xml b/Settings/res/values-in/strings.xml
index 310c68b..c5b6002 100644
--- a/Settings/res/values-in/strings.xml
+++ b/Settings/res/values-in/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Layanan"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Setelan layanan"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Teks kontras tinggi"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Pintasan aksesibilitas"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Aktifkan pintasan aksesibilitas"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Layanan pintasan"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Jika pintasan aktif, Anda bisa menekan beranda dan pilih selama 3 detik untuk memulai aksesibilitas."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Teks"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Setelan hamparan teks di video"</string>
     <string name="captions_display" msgid="735692527287125548">"Layar"</string>
diff --git a/Settings/res/values-is/strings.xml b/Settings/res/values-is/strings.xml
index c5ad7b7..c84d92a 100644
--- a/Settings/res/values-is/strings.xml
+++ b/Settings/res/values-is/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Þjónusta"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Stillingar þjónustu"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texti með miklum birtuskilum"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Flýtileið aðgengisstillingar"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Virkja flýtileið aðgengisstillingar"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Flýtileiðarþjónusta"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Þegar kveikt er á flýtileiðinni geturðu ýtt á heimahnappinn og valhnappinn í þrjár sekúndur til að opna aðgengiseiginleika"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Skjátextar"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Stillingar skjátexta á myndefni"</string>
     <string name="captions_display" msgid="735692527287125548">"Skjár"</string>
diff --git a/Settings/res/values-it/strings.xml b/Settings/res/values-it/strings.xml
index bc4c530..7873dbb 100644
--- a/Settings/res/values-it/strings.xml
+++ b/Settings/res/values-it/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Servizi"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Impostazioni servizio"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Testo alto contrasto"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Scorciatoia Accessibilità"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Abilita Scorciatoia Accessibilità"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Servizio scorciatoia"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Quando è attiva la scorciatoia, premere HOME e Seleziona per 3 sec. per avviare una funzione di accessibilità"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Sottotitoli"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Impostazioni per la sovrapposizione del testo dei sottotitoli sul video"</string>
     <string name="captions_display" msgid="735692527287125548">"Visualizzazione"</string>
diff --git a/Settings/res/values-iw/strings.xml b/Settings/res/values-iw/strings.xml
index 67eda14..3bf92da 100644
--- a/Settings/res/values-iw/strings.xml
+++ b/Settings/res/values-iw/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"שירותים"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"הגדרות שירות"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"טקסט עם ניגודיות גבוהה"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"קיצור דרך לנגישות"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"הפעל את קיצור הדרך לנגישות"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"שירות קיצורי הדרך"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"כשקיצור הדרך פועל, אפשר ללחוץ בו זמנית על Home ועל Select למשך שלוש שניות כדי להפעיל תכונת נגישות."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"כתוביות"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"הגדרות עבור שכבת-על של טקסט כתוביות בסרטון"</string>
     <string name="captions_display" msgid="735692527287125548">"תצוגה"</string>
diff --git a/Settings/res/values-ja/arrays.xml b/Settings/res/values-ja/arrays.xml
index d978371..ecbb5c5 100644
--- a/Settings/res/values-ja/arrays.xml
+++ b/Settings/res/values-ja/arrays.xml
@@ -17,19 +17,19 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="sleep_timeout_entries">
-    <item msgid="1213527366819650274">"5分"</item>
-    <item msgid="6561800022721381078">"15分"</item>
-    <item msgid="7718735533503035428">"30分"</item>
-    <item msgid="8784595382489738498">"1時間"</item>
-    <item msgid="1529312035777735084">"2時間"</item>
+    <item msgid="1213527366819650274">"5 分"</item>
+    <item msgid="6561800022721381078">"15 分"</item>
+    <item msgid="7718735533503035428">"30 分"</item>
+    <item msgid="8784595382489738498">"1 時間"</item>
+    <item msgid="1529312035777735084">"2 時間"</item>
   </string-array>
   <string-array name="screen_off_timeout_entries">
-    <item msgid="8244337465472020927">"30分"</item>
-    <item msgid="1001586019759702505">"1時間"</item>
-    <item msgid="5216959047515554188">"3時間"</item>
-    <item msgid="4152882798140628647">"6時間"</item>
-    <item msgid="412984226950404956">"12時間"</item>
-    <item msgid="2178434662173258997">"OFFにしない"</item>
+    <item msgid="8244337465472020927">"30 分"</item>
+    <item msgid="1001586019759702505">"1 時間"</item>
+    <item msgid="5216959047515554188">"3 時間"</item>
+    <item msgid="4152882798140628647">"6 時間"</item>
+    <item msgid="412984226950404956">"12 時間"</item>
+    <item msgid="2178434662173258997">"スリープにしない"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="4410581208185456276">"デフォルト"</item>
@@ -64,7 +64,7 @@
   </string-array>
   <string-array name="surround_sound_entries">
     <item msgid="5639265918353416799">"自動"</item>
-    <item msgid="5990497479384785807">"常に使用する"</item>
-    <item msgid="6178602073308944697">"使用しない"</item>
+    <item msgid="5990497479384785807">"常時 ON"</item>
+    <item msgid="6178602073308944697">"常時 OFF"</item>
   </string-array>
 </resources>
diff --git a/Settings/res/values-ja/strings.xml b/Settings/res/values-ja/strings.xml
index a2a5ed5..ef6d224 100644
--- a/Settings/res/values-ja/strings.xml
+++ b/Settings/res/values-ja/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"サービス"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"サービスの設定"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"高コントラスト テキスト"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ユーザー補助のショートカット"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ユーザー補助機能のショートカットを有効にする"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"ショートカット サービス"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"このショートカットを ON にすると、ホームボタンと選択ボタンの両方を 3 秒間押し続けてユーザー補助機能を開始できます"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"字幕"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"動画の字幕テキストオーバーレイの設定"</string>
     <string name="captions_display" msgid="735692527287125548">"ディスプレイ"</string>
diff --git a/Settings/res/values-ka/strings.xml b/Settings/res/values-ka/strings.xml
index 212882c..f799306 100644
--- a/Settings/res/values-ka/strings.xml
+++ b/Settings/res/values-ka/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"სერვისები"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"სერვისის პარამეტრები"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"მაღალკონტრასტული ტექსტი"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"მარტივი წვდომის მალსახმობი"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"მარტივი წვდომის მალსახმობის ჩართვა"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"მალსახმობი სერვისი"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"მალსახმობის ჩართვის შემდეგ მარტივი წვდომის ფუნქციის გაშვებას შეძლებთ მთავარ და არჩევის ღილაკებზე 3 წამის განმავლობაში დაჭერით"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"ტიტრები"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"დახურული ტიტრების ტექსტის ვიდეოზე გადაფარვის პარამეტრები"</string>
     <string name="captions_display" msgid="735692527287125548">"ეკრანი"</string>
diff --git a/Settings/res/values-kk/strings.xml b/Settings/res/values-kk/strings.xml
index 1432f72..4536f38 100644
--- a/Settings/res/values-kk/strings.xml
+++ b/Settings/res/values-kk/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Қызметтер"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Қызмет параметрлері"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Жоғары контрастты мәтін"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Арнайы мүмкіндік пернелер тіркесімі"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Арнайы мүмкіндіктер таңбашасын қосу"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Таңбашамен байланыстырылған қызмет"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Арнайы мүмкіндіктер функциясы үшін төте жол қосулы кезде \"Негізгі бет\" түймесін 3 секунд басыңыз"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Титрлар"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Бейнедегі титрлер мәтіні қабатының параметрлері"</string>
     <string name="captions_display" msgid="735692527287125548">"Дисплей"</string>
diff --git a/Settings/res/values-km/strings.xml b/Settings/res/values-km/strings.xml
index 091305e..b64718b 100644
--- a/Settings/res/values-km/strings.xml
+++ b/Settings/res/values-km/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"សេវាកម្ម"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"ការ​កំណត់​សេវាកម្ម"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"អត្ថបទមានកម្រិតភាពដិតខ្ពស់"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ផ្លូវកាត់​ភាព​ងាយ​ស្រួល"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"បើកផ្លូវកាត់​ភាព​ងាយស្រួល"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"សេវាកម្មផ្លូវកាត់"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"នៅពេលដែលផ្លូវកាត់នេះបើក អ្នកអាច​ចុចទាំងប៊ូតុង​ដើម និងប៊ូតុងជ្រើសរើស​ឲ្យបាន 3 វិនាទី ដើម្បី​ចាប់ផ្តើម​មុខងារភាពងាយស្រួល"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"ចំណងជើង"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"ការ​កំណត់​សម្រាប់​អត្ថបទ​ដែល​មាន​ចំណងជើង​បិទ​​គ្រប់​ពី​លើ​វីដេអូ"</string>
     <string name="captions_display" msgid="735692527287125548">"បង្ហាញ"</string>
diff --git a/Settings/res/values-kn/strings.xml b/Settings/res/values-kn/strings.xml
index 8d51adc..d71492f 100644
--- a/Settings/res/values-kn/strings.xml
+++ b/Settings/res/values-kn/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"ಸೇವೆಗಳು"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"ಸೇವಾ ಸೆಟ್ಟಿಂಗ್‌‌ಗಳು"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ಹೆಚ್ಚು ಕಾಂಟ್ರಾಸ್ಟ್‌ನ ಪಠ್ಯ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ಪ್ರವೇಶ ಶಾರ್ಟ್‌ಕಟ್‌"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್‌ಕಟ್‌ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"ಶಾರ್ಟ್‌ಕಟ್ ಸೇವೆ"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"ಶಾರ್ಟ್‌ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ, ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಮುಖಪುಟ ಮತ್ತು 3 ಸೆಕೆಂಡುಗಳ ಕಾಲ ಆಯ್ಕೆ ಮಾಡಿ ಎರಡನ್ನೂ ನೀವು ಒತ್ತಬಹುದು"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"ಶೀರ್ಷಿಕೆಗಳು"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"ವೀಡಿಯೊದಲ್ಲಿ ಮುಚ್ಚಿದ ಶೀರ್ಷಿಕೆ ಪಠ್ಯದ ಓವರ್‌ಲೇಗಾಗಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="captions_display" msgid="735692527287125548">"ಪ್ರದರ್ಶನ"</string>
diff --git a/Settings/res/values-ko/strings.xml b/Settings/res/values-ko/strings.xml
index bef47ef..8e94e21 100644
--- a/Settings/res/values-ko/strings.xml
+++ b/Settings/res/values-ko/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"서비스"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"서비스 설정"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"고대비 텍스트"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"접근성 단축키"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"접근성 단축키 사용"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"단축키 서비스"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"단축키가 사용 설정되어 있는 경우 홈과 선택 버튼을 3초 동안 누르면 접근성 기능을 시작할 수 있습니다."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"자막"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"동영상 캡션 텍스트 오버레이 설정"</string>
     <string name="captions_display" msgid="735692527287125548">"디스플레이"</string>
diff --git a/Settings/res/values-ky/strings.xml b/Settings/res/values-ky/strings.xml
index 96aa259..4559422 100644
--- a/Settings/res/values-ky/strings.xml
+++ b/Settings/res/values-ky/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Кызматтар"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Кызмат жөндөөлөрү"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Жогорку контрасттагы текст"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Атайын мүмкүнчүлүктөр функциясынын кыска жолу"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Атайын мүмкүнчүлүктөр функциясынын кыска жолун иштетүү"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Кыска жол кызматы"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Атайын мүмкүнчүлүктөр функциясын пайдалануу үчүн, анын кыска жолу күйгүзүлгөндө, башкы бет жана тандоо баскычын үч секунда коё бербей басып туруңуз."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Түшүндүрмөлөр"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Видеого жашыруун түшүндүрмө тексттерди жазуу жөндөөлөрү"</string>
     <string name="captions_display" msgid="735692527287125548">"Дисплей"</string>
diff --git a/Settings/res/values-lo/strings.xml b/Settings/res/values-lo/strings.xml
index 4cd98e9..81d7353 100644
--- a/Settings/res/values-lo/strings.xml
+++ b/Settings/res/values-lo/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"ບໍລິການ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"​ການ​ຕັ້ງ​ຄ່າ​ບໍ​ລິ​ການ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ຂໍ້ຄວາມທີ່ມີຄວາມຄົມຊັດສູງ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ປຸ່ມລັດ​ສຳລັບ​ການ​ເຂົ້າ​ເຖິງ"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ເປີດໃຊ້ປຸ່ມລັດການຊ່ວຍເຂົ້າເຖິງ"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"ບໍລິການປຸ່ມທາງລັດ"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"ເມື່ອທ່ານເປີດໃຊ້ປຸ່ມລັດແລ້ວ, ທ່ານສາມາດກົດປຸ່ມ home ທັງສອງແລ້ວເລືອກເປັນເວລາ 3 ວິນາທີເພື່ອເລີ່ມໃຊ້ຄຸນສົມບັດການຊ່ວຍເຂົ້າເຖິງໄດ້"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"ຄຳບັນຍາຍ"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"​ການ​ຕັ້ງ​ຄ່າ​ສຳ​ລັບ​ຂໍ້​ຄວາມ​ຄຳ​ບັນ​ຍາຍ​ຢູ່​ເທິງວິ​ດີ​ໂອ"</string>
     <string name="captions_display" msgid="735692527287125548">"ການສະແດງຜົນ"</string>
diff --git a/Settings/res/values-lt/strings.xml b/Settings/res/values-lt/strings.xml
index 9059d84..5fdb1f1 100644
--- a/Settings/res/values-lt/strings.xml
+++ b/Settings/res/values-lt/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Paslaugos"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Paslaugos nustatymai"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Didelio kontrasto tekstas"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Spartusis pritaikymo neįgaliesiems funkc. klavišas"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Įgal. spartųjį pritaik. neįgal. funk. klavišą"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Sparčiojo klavišo paslauga"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kai sp. klav. įj., gal. pasp. pagr. ekr. ir pasir. mygt. ir pal. 3 sek., kad b. pal. prit. neįg. f."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtitrai"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Subtitrų teksto perdangos vaizdo įrašuose nustatymai"</string>
     <string name="captions_display" msgid="735692527287125548">"Pateiktis"</string>
diff --git a/Settings/res/values-lv/strings.xml b/Settings/res/values-lv/strings.xml
index 5be3079..9946e6e 100644
--- a/Settings/res/values-lv/strings.xml
+++ b/Settings/res/values-lv/strings.xml
@@ -369,6 +369,10 @@
     <string name="system_services" msgid="7230571820151215779">"Pakalpojumi"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Pakalpojumu iestatījumi"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Liela kontrasta teksts"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Pieejamības īsinājumtaustiņš"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Iespējot pieejamības īsinājumtaustiņu"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Īsinājumtaustiņa pakalpojums"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kad pieejamības īsinājumtaustiņš ir ieslēgts, 3 sekundes turiet nospiestu sākuma un atlasīšanas pogu."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtitri"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Videoklipa slēgto parakstu teksta pārklājuma iestatījumi"</string>
     <string name="captions_display" msgid="735692527287125548">"Displejs"</string>
diff --git a/Settings/res/values-mk/strings.xml b/Settings/res/values-mk/strings.xml
index 727ee49..db97990 100644
--- a/Settings/res/values-mk/strings.xml
+++ b/Settings/res/values-mk/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Услуги"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Поставки на услуга"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Текст со висок контраст"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Кратенка за пристапност"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Овозможување кратенка за пристапност"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Услуга со кратенка"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Кога е вклучена кратенката, може да ги притиснете и „Дома“ и „Избери“ во траење од 3 секунди за стартување функција за пристапност"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Титли"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Поставки за затворени слоеви од титлови на видео"</string>
     <string name="captions_display" msgid="735692527287125548">"Приказ"</string>
diff --git a/Settings/res/values-ml/strings.xml b/Settings/res/values-ml/strings.xml
index 8eafd3b..962093a 100644
--- a/Settings/res/values-ml/strings.xml
+++ b/Settings/res/values-ml/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"സേവനങ്ങള്‍"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"സേവന ക്രമീകരണങ്ങള്‍"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ദൃശ്യതീവ്രതയേറിയ ടെക്‌സ്റ്റ്"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ഉപയോഗസഹായി കുറുക്കുവഴി"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ഉപയോഗസഹായി കുറുക്കുവഴി പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"കുറുക്കുവഴി സേവനം"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"കുറുക്കുവഴി ഓണായിരിക്കുമ്പോൾ, \'ഹോം, തിരഞ്ഞെടുക്കുക\' എന്നിവ ഒരുമിച്ച് 3 സെക്കൻഡ് നേരം അമർത്തിപ്പിടിച്ച് നിങ്ങൾക്ക് ഉപയോഗസഹായി ഫീച്ചർ ആരംഭിക്കാം"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"അടിക്കുറിപ്പുകൾ"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"വീഡിയോയിൽ അടച്ച അടിക്കുറിപ്പിന്റെ ടെക്‌സ്റ്റ് ഓവർലേയ്ക്കായുള്ള ക്രമീകരണങ്ങൾ"</string>
     <string name="captions_display" msgid="735692527287125548">"ഡിസ്‌പ്ലേ"</string>
diff --git a/Settings/res/values-mn/strings.xml b/Settings/res/values-mn/strings.xml
index 7cca578..0cd9b61 100644
--- a/Settings/res/values-mn/strings.xml
+++ b/Settings/res/values-mn/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Үйлчилгээ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Үйлчилгээний тохиргоо"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Өндөр ялгаралтай текст"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Хүртээмжийн товчлол"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Хүртээмжийн товчлолыг идэвхжүүлэх"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Товчлолын үйлчилгээ"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Товчлолыг асаасан үед хүртээмжийн онцлогийг нүүр хуудсан дээр 3 секунд дарж эхлүүлэх боломжтой"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Титрүүд"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Видеон дээрх текст титрийн тохиргоо"</string>
     <string name="captions_display" msgid="735692527287125548">"Дэлгэц"</string>
diff --git a/Settings/res/values-mr/strings.xml b/Settings/res/values-mr/strings.xml
index a0013f9..fe6b2d6 100644
--- a/Settings/res/values-mr/strings.xml
+++ b/Settings/res/values-mr/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"सेवा"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"सेवा सेटिंग्ज"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"उच्च तीव्रता मजकूर"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"प्रवेशयोग्यता शॉर्टकट"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"प्रवेशयोग्यता शॉर्टकट सक्षम करा"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"शॉर्टकट सेवा"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"शॉर्टकट चालू असताना प्रवेशयोग्यता वैशिष्ट्य सुरू करण्यासाठी आपण होम आणि निवडा दोन्ही 3 सेकंदांपर्यंत दाबून ठेवू शकता"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"मथळे"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"व्हिडिओवर उपशीर्षक मजकूर आच्छादनासाठी सेटिंग्ज"</string>
     <string name="captions_display" msgid="735692527287125548">"प्रदर्शन"</string>
diff --git a/Settings/res/values-ms/strings.xml b/Settings/res/values-ms/strings.xml
index 4145cad..f384682 100644
--- a/Settings/res/values-ms/strings.xml
+++ b/Settings/res/values-ms/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Perkhidmatan"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Tetapan perkhidmatan"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Teks kontras tinggi"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Pintasan kebolehaksesan"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Dayakan pintasan kebolehaksesan"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Perkhidmatan pintasan"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Apabila pintasan dihidupkan, tekan butang skrin utama &amp; pilih selama 3 saat untuk mulakan kebolehaksesan"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Kapsyen"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Tetapan untuk tindanan teks kapsyen tertutup pada video"</string>
     <string name="captions_display" msgid="735692527287125548">"Paparan"</string>
diff --git a/Settings/res/values-my/strings.xml b/Settings/res/values-my/strings.xml
index 83d700c..e62dc04 100644
--- a/Settings/res/values-my/strings.xml
+++ b/Settings/res/values-my/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"ဝန်ဆောင်မှုများ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"ဝန်ဆောင်မှု ဆက်တင်များ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ဖြူမဲခြားနားချက် မြင့် စာသား"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ရယူသုံးစွဲရန် ဖြတ်လမ်း"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ရယူသုံးစွဲမှု ဖြတ်လမ်းကို ဖွင့်မည်"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"ဖြတ်လမ်း ဝန်ဆောင်မှု"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"ဖြတ်လမ်းကို ဖွင့်ထားသည့်အခါ ရယူသုံးစွဲမှုစနစ်ကို စတင်ရန် ပင်မခလုတ်နှင့် ရွေးချယ်မှုတို့ကို ၃ စက္ကန့်ကြာ ဖိထားနိုင်ပါသည်။"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"စာတန်းများ"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"ဗီဒီယိုမှာ အပိတ် စာတန်း စာသား အတွက် ဆက်တင်များ"</string>
     <string name="captions_display" msgid="735692527287125548">"မြင်ကွင်း"</string>
diff --git a/Settings/res/values-nb/strings.xml b/Settings/res/values-nb/strings.xml
index 07799a2..965c41b 100644
--- a/Settings/res/values-nb/strings.xml
+++ b/Settings/res/values-nb/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Tjenester"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Tjenesteinnstillinger"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst med høy kontrast"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Tilgjengelighetssnarvei"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Slå på tilgjengelighetssnarveien"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Snarveitjeneste"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Når snarveien er på, kan du trykke på både Hjem og Velg i tre sekunder for å starte en tilgjengelighetsfunksjon"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Teksting"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Innstillinger for å legge over teksting på videoer"</string>
     <string name="captions_display" msgid="735692527287125548">"Visning"</string>
diff --git a/Settings/res/values-ne/strings.xml b/Settings/res/values-ne/strings.xml
index 6950d6f..9e934a0 100644
--- a/Settings/res/values-ne/strings.xml
+++ b/Settings/res/values-ne/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"सेवाहरू"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"सेवा सेटिङ्हरू"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"उच्च कन्ट्रास्ट पाठ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"पहुँचको सर्टकट"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"पहुँचको सर्टकटलाई सक्षम पार्नुहोस्"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"सर्टकट सम्बन्धी सेवा"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"यो सर्टकट सक्रिय हुँदा तपाईं पहुँच सम्बन्धी कुनै सुविधा सुरु गर्न गृह र चयन गर्ने बटन दुवैलाई ३ सेकेन्डसम्म थिच्न सक्नुहुन्छ।"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"क्याप्सन"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"भिडियोमा मिलेका क्याप्सन पाठ ओभरलेका लागि सेटिङ्"</string>
     <string name="captions_display" msgid="735692527287125548">"प्रदर्शन गर्नुहोस्"</string>
diff --git a/Settings/res/values-nl/strings.xml b/Settings/res/values-nl/strings.xml
index a5846ca..8af86f0 100644
--- a/Settings/res/values-nl/strings.xml
+++ b/Settings/res/values-nl/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Services"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Service-instellingen"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst met hoog contrast"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Snelle link voor toegankelijkheid"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Snelkoppeling toegankelijkheid inschakelen"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Service van sneltoets"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Als de snelkoppeling is ingeschakeld, kun je een toegankelijkheidsfunctie openen door drie seconden op de knoppen \'home\' en \'selecteren\' te drukken."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Ondertiteling"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Instellingen voor ondertitelingsoverlay in video"</string>
     <string name="captions_display" msgid="735692527287125548">"Weergave"</string>
diff --git a/Settings/res/values-pa/arrays.xml b/Settings/res/values-pa/arrays.xml
new file mode 100644
index 0000000..cbd501e
--- /dev/null
+++ b/Settings/res/values-pa/arrays.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="sleep_timeout_entries">
+    <item msgid="1213527366819650274">"5 ਮਿੰਟ"</item>
+    <item msgid="6561800022721381078">"15 ਮਿੰਟ"</item>
+    <item msgid="7718735533503035428">"30 ਮਿੰਟ"</item>
+    <item msgid="8784595382489738498">"1 ਘੰਟਾ"</item>
+    <item msgid="1529312035777735084">"2 ਘੰਟੇ"</item>
+  </string-array>
+  <string-array name="screen_off_timeout_entries">
+    <item msgid="8244337465472020927">"30 ਮਿੰਟ"</item>
+    <item msgid="1001586019759702505">"1 ਘੰਟਾ"</item>
+    <item msgid="5216959047515554188">"3 ਘੰਟੇ"</item>
+    <item msgid="4152882798140628647">"6 ਘੰਟੇ"</item>
+    <item msgid="412984226950404956">"12 ਘੰਟੇ"</item>
+    <item msgid="2178434662173258997">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="4410581208185456276">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</item>
+    <item msgid="9033306684422202101">"Sans-serif"</item>
+    <item msgid="1864985245839120339">"Sans-serif ਸੌੜਾ"</item>
+    <item msgid="2707402752636362906">"Sans-serif ਮੋਨੋਸਪੇਸ"</item>
+    <item msgid="4549910217342216388">"Serif"</item>
+    <item msgid="4764344884232052861">"Serif ਮੋਨੋਸਪੇਸ"</item>
+    <item msgid="8561996903323025702">"ਅਨਿਯਮਤ"</item>
+    <item msgid="8403638572764467550">"ਪ੍ਰਵਾਹਮਈ"</item>
+    <item msgid="5560655268137500927">"ਅੰਗਰੇਜ਼ੀ ਦੇ ਵੱਡੇ ਅੱਖਰ ਛੋਟੇ ਆਕਾਰ ਵਿੱਚ"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4304493614734189861">"ਬਹੁਤ ਛੋਟਾ"</item>
+    <item msgid="1694402928400844023">"ਛੋਟਾ"</item>
+    <item msgid="1235495470844109970">"ਸਧਾਰਨ"</item>
+    <item msgid="481223375568095790">"ਵੱਡਾ"</item>
+    <item msgid="8614563351231073075">"ਬਹੁਤ ਵੱਡਾ"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="5333047169042840730">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="7663488423233018922">"ਰੂਪ-ਰੇਖਾ"</item>
+    <item msgid="7891048730741670843">"ਡ੍ਰੌਪ ਸ਼ੈਡੋ"</item>
+    <item msgid="6613725572146700438">"ਉਭਰੇ ਹੋਏ ਕਿਨਾਰੇ"</item>
+    <item msgid="1007736533206905292">"ਨਿਰਾਸ਼"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7311196539184412021">"25%"</item>
+    <item msgid="4609292560884303243">"50%"</item>
+    <item msgid="1626485489418859846">"75%"</item>
+    <item msgid="1811192455405034366">"100%"</item>
+  </string-array>
+  <string-array name="surround_sound_entries">
+    <item msgid="5639265918353416799">"ਸਵੈ"</item>
+    <item msgid="5990497479384785807">"ਹਮੇਸ਼ਾ"</item>
+    <item msgid="6178602073308944697">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
+  </string-array>
+</resources>
diff --git a/Settings/res/values-pa/strings.xml b/Settings/res/values-pa/strings.xml
index 13c8e9c..f699b0d 100644
--- a/Settings/res/values-pa/strings.xml
+++ b/Settings/res/values-pa/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"ਸੇਵਾਵਾਂ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"ਸੇਵਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ਉੱਚ ਵਖਰੇਵਾਂ ਲਿਖਤ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟ"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਯੋਗ ਬਣਾਓ"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"ਸ਼ਾਰਟਕੱਟ ਸੇਵਾ"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਹੋਮ ਅਤੇ &amp;apos;ਚੁਣੋ&amp;apos; ਦੋਵਾਂ ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦਬਾਕੇ ਰੱਖ ਸਕਦੇ ਹੋ।"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"ਸੁਰਖੀਆਂ"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"ਵੀਡੀਓ ਫ਼ਾਈਲ \'ਤੇ ਬੰਦ ਸੁਰਖੀਆਂ ਦੇਣ ਵਾਲੇ ਟੈਕਸਟ ਓਵਰਲੇ ਲਈ ਸੈਟਿੰਗਾਂ"</string>
     <string name="captions_display" msgid="735692527287125548">"ਡਿਸਪਲੇ"</string>
diff --git a/Settings/res/values-pa/widget-strings.xml b/Settings/res/values-pa/widget-strings.xml
new file mode 100644
index 0000000..7ae1f5e
--- /dev/null
+++ b/Settings/res/values-pa/widget-strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="ampm">
+    <item msgid="4375405926289364989">"ਪੂਰਵ-ਦੁਪਹਿਰ"</item>
+    <item msgid="4802437431289555052">"ਬਾਅਦ-ਦੁਪਹਿਰ"</item>
+  </string-array>
+    <string name="date_separator" msgid="7882269975674640060">"/"</string>
+    <string name="time_separator" msgid="7760859333083008983">":"</string>
+    <string name="text_obfuscation_toggle_caption" msgid="3785289190730642093">"ਪਾਸਵਰਡ ਲੁਕਾਓ"</string>
+</resources>
diff --git a/Settings/res/values-pl/arrays.xml b/Settings/res/values-pl/arrays.xml
index 4beb49c..7e7438c 100644
--- a/Settings/res/values-pl/arrays.xml
+++ b/Settings/res/values-pl/arrays.xml
@@ -18,10 +18,10 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="sleep_timeout_entries">
     <item msgid="1213527366819650274">"5 min"</item>
-    <item msgid="6561800022721381078">"15 minut"</item>
-    <item msgid="7718735533503035428">"30 minut"</item>
-    <item msgid="8784595382489738498">"1 godzina"</item>
-    <item msgid="1529312035777735084">"2 godziny"</item>
+    <item msgid="6561800022721381078">"15 min"</item>
+    <item msgid="7718735533503035428">"30 min"</item>
+    <item msgid="8784595382489738498">"1 godz."</item>
+    <item msgid="1529312035777735084">"2 godz."</item>
   </string-array>
   <string-array name="screen_off_timeout_entries">
     <item msgid="8244337465472020927">"30 min"</item>
diff --git a/Settings/res/values-pl/strings.xml b/Settings/res/values-pl/strings.xml
index 03e121a..9969733 100644
--- a/Settings/res/values-pl/strings.xml
+++ b/Settings/res/values-pl/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Usługi"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Ustawienia usługi"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst o dużym kontraście"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Skrót ułatwień dostępu"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Włącz skrót ułatwień dostępu"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Usługa skrótu"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Gdy skrót jest włączony, możesz przytrzymać naciśnięte przyciski HOME i SELECT przez trzy sekundy, by uruchomić funkcję ułatwień dostępu."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Napisy"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Ustawienia napisów nałożonych na film"</string>
     <string name="captions_display" msgid="735692527287125548">"Wyświetlanie"</string>
diff --git a/Settings/res/values-pt-rBR/strings.xml b/Settings/res/values-pt-rBR/strings.xml
index 0c86dce..273cb81 100644
--- a/Settings/res/values-pt-rBR/strings.xml
+++ b/Settings/res/values-pt-rBR/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Serviços"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Configurações do serviço"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texto em alto contraste"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Atalho de acessibilidade"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Ativar o atalho de acessibilidade"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Serviço do atalho"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Função: pressionar o botão home e o de seleção juntos por 3s inicia um recurso de acessibilidade."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Legendas"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Configurações para sobreposição de texto de legenda no vídeo"</string>
     <string name="captions_display" msgid="735692527287125548">"Exibir legendas"</string>
diff --git a/Settings/res/values-pt-rPT/strings.xml b/Settings/res/values-pt-rPT/strings.xml
index d55cfd6..2b06c75 100644
--- a/Settings/res/values-pt-rPT/strings.xml
+++ b/Settings/res/values-pt-rPT/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Serviços"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Definições de serviços"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texto de alto contraste"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Atalho de acessibilidade"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Ativar atalho de acessibilidade"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Serviço do atalho"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Quando o atalho estiver ativado, pode premir o botão Início e o botão de seleção em simultâneo durante 3 segundos para iniciar uma funcionalidade de acessibilidade."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Legendas"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Definições para sobreposição de texto de legendas ocultas em vídeo"</string>
     <string name="captions_display" msgid="735692527287125548">"Visualização"</string>
diff --git a/Settings/res/values-pt/strings.xml b/Settings/res/values-pt/strings.xml
index 0c86dce..273cb81 100644
--- a/Settings/res/values-pt/strings.xml
+++ b/Settings/res/values-pt/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Serviços"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Configurações do serviço"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Texto em alto contraste"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Atalho de acessibilidade"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Ativar o atalho de acessibilidade"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Serviço do atalho"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Função: pressionar o botão home e o de seleção juntos por 3s inicia um recurso de acessibilidade."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Legendas"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Configurações para sobreposição de texto de legenda no vídeo"</string>
     <string name="captions_display" msgid="735692527287125548">"Exibir legendas"</string>
diff --git a/Settings/res/values-ro/strings.xml b/Settings/res/values-ro/strings.xml
index d2cca1f..fe3b291 100644
--- a/Settings/res/values-ro/strings.xml
+++ b/Settings/res/values-ro/strings.xml
@@ -369,6 +369,10 @@
     <string name="system_services" msgid="7230571820151215779">"Servicii"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Setări serviciu"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Text cu contrast mare"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Comandă rapidă pentru accesibilitate"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Activați comanda rapidă pentru accesibilitate"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Serviciul comenzii rapide"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Când comanda rapidă e activată, ca să lansați o funcție de accesibilitate, apăsați simultan 3 secunde pe butoanele ecran de pornire/selectare"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Subtitrări"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Setări pentru suprapunerea textului subtitrării pe videoclip"</string>
     <string name="captions_display" msgid="735692527287125548">"Afișare"</string>
diff --git a/Settings/res/values-ru/arrays.xml b/Settings/res/values-ru/arrays.xml
index 56f297b..901bb93 100644
--- a/Settings/res/values-ru/arrays.xml
+++ b/Settings/res/values-ru/arrays.xml
@@ -17,18 +17,18 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="sleep_timeout_entries">
-    <item msgid="1213527366819650274">"5 мин."</item>
+    <item msgid="1213527366819650274">"5 минут"</item>
     <item msgid="6561800022721381078">"15 минут"</item>
     <item msgid="7718735533503035428">"30 минут"</item>
     <item msgid="8784595382489738498">"1 час"</item>
     <item msgid="1529312035777735084">"2 часа"</item>
   </string-array>
   <string-array name="screen_off_timeout_entries">
-    <item msgid="8244337465472020927">"30 мин."</item>
-    <item msgid="1001586019759702505">"1 ч."</item>
-    <item msgid="5216959047515554188">"3 ч."</item>
-    <item msgid="4152882798140628647">"6 ч."</item>
-    <item msgid="412984226950404956">"12 ч."</item>
+    <item msgid="8244337465472020927">"30 минут"</item>
+    <item msgid="1001586019759702505">"1 час"</item>
+    <item msgid="5216959047515554188">"3 часа"</item>
+    <item msgid="4152882798140628647">"6 часов"</item>
+    <item msgid="412984226950404956">"12 часов"</item>
     <item msgid="2178434662173258997">"Не выключать экран"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
diff --git a/Settings/res/values-ru/strings.xml b/Settings/res/values-ru/strings.xml
index 88ed9f9..7f96b4f 100644
--- a/Settings/res/values-ru/strings.xml
+++ b/Settings/res/values-ru/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Сервисы"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Настройки службы"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Высококонтрастный текст"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Быстрое включение"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Быстрое включение"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Быстрое включение сервиса"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Если эта функция включена, вы можете активировать специальные возможности, одновременно нажав и удерживая в течение трех секунд кнопки главного экрана и выбора."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Субтитры"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Настройки субтитров в видео"</string>
     <string name="captions_display" msgid="735692527287125548">"Экран"</string>
diff --git a/Settings/res/values-si/strings.xml b/Settings/res/values-si/strings.xml
index a966bc7..9c4b1f3 100644
--- a/Settings/res/values-si/strings.xml
+++ b/Settings/res/values-si/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"සේවා"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"සේවා සැකසුම්"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ඉහළම විභේදනයක් ඇති පෙළ"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ප්‍රවේශ්‍යතා කෙටි මග"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ප්‍රවේශ්‍යතා කෙටි මග සබල කරන්න"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"කෙටි මං සේවා"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"කෙටි මඟ ක්‍රියාත්මක විට, ප්‍රවේශ්‍යතා විශේෂාංගයක් ආරම්භ කිරීමට ඔබට මුල් පිටු බොත්තම් දෙකම තත්පර 3ක් ඔබා ගෙන සිටිය හැකිය."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"සිරස්තල"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"වීඩියෝව මත යටි ලියමන කළ පෙළ වාසාලිම වැසීම සඳහා සැකසීම්"</string>
     <string name="captions_display" msgid="735692527287125548">"දර්ශනය"</string>
diff --git a/Settings/res/values-sk/strings.xml b/Settings/res/values-sk/strings.xml
index 014deb6..11ed1ab 100644
--- a/Settings/res/values-sk/strings.xml
+++ b/Settings/res/values-sk/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Služby"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Nastavenia služby"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Text s vysokým kontrastom"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Skratka dostupnosti"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Povoliť skratku dostupnosti"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Služba klávesových skratiek"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Keď je skratka zapnutá, funkciu dostupnosti môžete zapnúť tým, že na tri sekundy stlačíte tlačidlá plochy a výberu"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Titulky"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Nastavenia textového prekrytia videa skrytými titulkami"</string>
     <string name="captions_display" msgid="735692527287125548">"Zobrazenie"</string>
diff --git a/Settings/res/values-sl/arrays.xml b/Settings/res/values-sl/arrays.xml
index 1c29e3f..3dc515b 100644
--- a/Settings/res/values-sl/arrays.xml
+++ b/Settings/res/values-sl/arrays.xml
@@ -17,18 +17,18 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="sleep_timeout_entries">
-    <item msgid="1213527366819650274">"5 min"</item>
+    <item msgid="1213527366819650274">"5 minut"</item>
     <item msgid="6561800022721381078">"15 minut"</item>
     <item msgid="7718735533503035428">"30 minut"</item>
     <item msgid="8784595382489738498">"1 ura"</item>
     <item msgid="1529312035777735084">"2 uri"</item>
   </string-array>
   <string-array name="screen_off_timeout_entries">
-    <item msgid="8244337465472020927">"30 min"</item>
+    <item msgid="8244337465472020927">"30 minut"</item>
     <item msgid="1001586019759702505">"1 h"</item>
-    <item msgid="5216959047515554188">"3 h"</item>
-    <item msgid="4152882798140628647">"6 h"</item>
-    <item msgid="412984226950404956">"12 h"</item>
+    <item msgid="5216959047515554188">"3 ure"</item>
+    <item msgid="4152882798140628647">"6 ur"</item>
+    <item msgid="412984226950404956">"12 ur"</item>
     <item msgid="2178434662173258997">"Nikoli"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
diff --git a/Settings/res/values-sl/strings.xml b/Settings/res/values-sl/strings.xml
index b44a1aa..19a392c 100644
--- a/Settings/res/values-sl/strings.xml
+++ b/Settings/res/values-sl/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Storitve"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Nastavitve storitve"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Visokokontrastno besedilo"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Bližnjica za pripomočke za ljudi s poseb. potreb."</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Omogoči bližnjico funkcij za ljudi s posebnimi potrebami"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Storitev z bližnjico"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Ko je bližnjica vklopljena, lahko funkcijo za ljudi s posebnimi potrebami zaženete tako, da pritisnete gumb za vrnitev na začetni zaslon in gumb za izbiro ter ju pridržite tri sekunde."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Napisi"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Nastavitve prekrivanja za besedilo podnapisov v videoposnetku"</string>
     <string name="captions_display" msgid="735692527287125548">"Zaslon"</string>
diff --git a/Settings/res/values-sq/arrays.xml b/Settings/res/values-sq/arrays.xml
new file mode 100644
index 0000000..148f76e
--- /dev/null
+++ b/Settings/res/values-sq/arrays.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="sleep_timeout_entries">
+    <item msgid="1213527366819650274">"5 minuta"</item>
+    <item msgid="6561800022721381078">"15 minuta"</item>
+    <item msgid="7718735533503035428">"30 minuta"</item>
+    <item msgid="8784595382489738498">"1 orë"</item>
+    <item msgid="1529312035777735084">"2 orë"</item>
+  </string-array>
+  <string-array name="screen_off_timeout_entries">
+    <item msgid="8244337465472020927">"30 minuta"</item>
+    <item msgid="1001586019759702505">"1 orë"</item>
+    <item msgid="5216959047515554188">"3 orë"</item>
+    <item msgid="4152882798140628647">"6 orë"</item>
+    <item msgid="412984226950404956">"12 orë"</item>
+    <item msgid="2178434662173258997">"Asnjëherë"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="4410581208185456276">"I parazgjedhur"</item>
+    <item msgid="9033306684422202101">"Sans-serif"</item>
+    <item msgid="1864985245839120339">"Sans-serif i kondensuar"</item>
+    <item msgid="2707402752636362906">"Sans-serif me hapësirë fikse"</item>
+    <item msgid="4549910217342216388">"Serif"</item>
+    <item msgid="4764344884232052861">"Serif me hapësirë fikse"</item>
+    <item msgid="8561996903323025702">"Rastësor"</item>
+    <item msgid="8403638572764467550">"Të pjerrëta"</item>
+    <item msgid="5560655268137500927">"Kapitale të vogla"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4304493614734189861">"Shumë e vogël"</item>
+    <item msgid="1694402928400844023">"E vogël"</item>
+    <item msgid="1235495470844109970">"Normale"</item>
+    <item msgid="481223375568095790">"E madhe"</item>
+    <item msgid="8614563351231073075">"Shumë e madhe"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="5333047169042840730">"Asnjë"</item>
+    <item msgid="7663488423233018922">"Konturi"</item>
+    <item msgid="7891048730741670843">"Me hijezim"</item>
+    <item msgid="6613725572146700438">"I ngritur"</item>
+    <item msgid="1007736533206905292">"I ulur"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7311196539184412021">"25%"</item>
+    <item msgid="4609292560884303243">"50%"</item>
+    <item msgid="1626485489418859846">"75%"</item>
+    <item msgid="1811192455405034366">"100%"</item>
+  </string-array>
+  <string-array name="surround_sound_entries">
+    <item msgid="5639265918353416799">"Automatik"</item>
+    <item msgid="5990497479384785807">"Gjithmonë"</item>
+    <item msgid="6178602073308944697">"Asnjëherë"</item>
+  </string-array>
+</resources>
diff --git a/Settings/res/values-sq/strings.xml b/Settings/res/values-sq/strings.xml
index 6d19f46..23fd96c 100644
--- a/Settings/res/values-sq/strings.xml
+++ b/Settings/res/values-sq/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Shërbimet"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Cilësimet e shërbimit"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Tekst me kontrast të lartë"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Shkurtorja e qasshmërisë"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Aktivizo shkurtoren e qasshmërisë"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Shërbimi i shkurtores"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kur shkurtorja është aktive, mund të shtypësh butonin bazë dhe ta zgjedhësh për 3 sekonda për të hapur një funksion të qasshmërisë."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Titrat"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Cilësimet për mbivendosjen e tekstit të titrave në video"</string>
     <string name="captions_display" msgid="735692527287125548">"Ekrani"</string>
diff --git a/Settings/res/values-sq/widget-strings.xml b/Settings/res/values-sq/widget-strings.xml
new file mode 100644
index 0000000..08fd147
--- /dev/null
+++ b/Settings/res/values-sq/widget-strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="ampm">
+    <item msgid="4375405926289364989">"paradite"</item>
+    <item msgid="4802437431289555052">"pasdite"</item>
+  </string-array>
+    <string name="date_separator" msgid="7882269975674640060">"."</string>
+    <string name="time_separator" msgid="7760859333083008983">":"</string>
+    <string name="text_obfuscation_toggle_caption" msgid="3785289190730642093">"Fshih fjalëkalimin"</string>
+</resources>
diff --git a/Settings/res/values-sr/strings.xml b/Settings/res/values-sr/strings.xml
index 24072c4..058269c 100644
--- a/Settings/res/values-sr/strings.xml
+++ b/Settings/res/values-sr/strings.xml
@@ -369,6 +369,10 @@
     <string name="system_services" msgid="7230571820151215779">"Услуге"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Подешавања услуге"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Текст високог контраста"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Пречица за приступачност"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Омогући пречицу за приступачност"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Услуга пречице"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Када је укључена, притиском на Почетна и Изабери на 3 секунде покрећете функцију приступачности."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Титл"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Подешавања за постављање текста опционалног титла преко видео снимка"</string>
     <string name="captions_display" msgid="735692527287125548">"Екран"</string>
diff --git a/Settings/res/values-sv/strings.xml b/Settings/res/values-sv/strings.xml
index 1919d6e..5d5b176 100644
--- a/Settings/res/values-sv/strings.xml
+++ b/Settings/res/values-sv/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Tjänster"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Tjänstinställningar"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Text med hög kontrast"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Aktivera tillgänglighet snabbt"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Använd Aktivera tillgänglighet snabbt"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Tjänst för kortkommando"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Aktivera en tillgänglighetsfunktion snabbt: håll ned Startskärm och Välj i tre sekunder när detta är på"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Textning"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Inställningar för textning i video"</string>
     <string name="captions_display" msgid="735692527287125548">"Skärm"</string>
diff --git a/Settings/res/values-sw/strings.xml b/Settings/res/values-sw/strings.xml
index 9e473e8..2244e77 100644
--- a/Settings/res/values-sw/strings.xml
+++ b/Settings/res/values-sw/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Huduma"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Mipangilio ya huduma"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Maandishi yenye utofautishaji bora"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Njia ya mkato kwa walio na matatizo ya kuona au kusikia"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Washa njia ya mkato kwa walio na matatizo ya kuona au kusikia"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Huduma ya njia ya mkato"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Ukiwasha njia ya mkato, unaweza kubonyeza kitufe cha mwanzo na uchague kwa sekunde 3 ili uanzishe kipengele cha zana za walio na matatizo ya kuona au kusikia"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Manukuu"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Mipangilio ya kugaga maandishi ya manukuu kwenye video"</string>
     <string name="captions_display" msgid="735692527287125548">"Kuonyeshwa"</string>
diff --git a/Settings/res/values-ta/strings.xml b/Settings/res/values-ta/strings.xml
index e484c79..b0fb63d 100644
--- a/Settings/res/values-ta/strings.xml
+++ b/Settings/res/values-ta/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"சேவைகள்"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"சேவை அமைப்புகள்"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"அதிக ஒளி மாறுபாடுடைய உரை"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"அணுகல்தன்மைக் குறுக்குவழி"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"அணுகல்தன்மைக் குறுக்குவழியை இயக்கு"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"குறுக்குவழிச் சேவை"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"இயக்கினால், முகப்பு &amp; தேர்ந்தெடு பொத்தான்களை 3 வினாடிகளுக்கு அழுத்தி அணுகல்தன்மை அம்சத்தை தொடங்கலாம்"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"தலைப்புகள்"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"வீடியோவில் தோன்றும் வசனங்களுக்கான அமைப்புகள்"</string>
     <string name="captions_display" msgid="735692527287125548">"காட்சி"</string>
diff --git a/Settings/res/values-te/strings.xml b/Settings/res/values-te/strings.xml
index b9813c4..ed77c10 100644
--- a/Settings/res/values-te/strings.xml
+++ b/Settings/res/values-te/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"సేవలు"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"సేవా సెట్టింగ్‌లు"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"అధిక కాంట్రాస్ట్ వచనం"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ప్రాప్యత సత్వరమార్గం"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ప్రాప్యత సత్వరమార్గాన్ని ప్రారంభించండి"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"సత్వరమార్గం సేవ"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"సత్వరమార్గం ఆన్‌లో ఉన్నప్పుడు హోమ్, ఎంపిక బటన్‌లను 3 సెకన్లు నొక్కడం ద్వారా ప్రాప్యత లక్షణాన్ని ప్రారంభించవచ్చు"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"శీర్షికలు"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"వీడియోలో సంవృత శీర్షిక వచన అతివ్యాప్తికి సెట్టింగ్‌లు"</string>
     <string name="captions_display" msgid="735692527287125548">"ప్రదర్శన"</string>
diff --git a/Settings/res/values-th/strings.xml b/Settings/res/values-th/strings.xml
index fbcb49e..16db86e 100644
--- a/Settings/res/values-th/strings.xml
+++ b/Settings/res/values-th/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"บริการ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"การตั้งค่าบริการ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"ข้อความคอนทราสต์สูง"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ทางลัดสำหรับการเข้าถึง"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"เปิดใช้ทางลัดการเข้าถึง"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"บริการทางลัด"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"เมื่อทางลัดเปิดอยู่ คุณสามารถกดปุ่มเลือกและหน้าแรกค้างไว้ 3 วินาทีเพื่อเริ่มฟีเจอร์การเข้าถึง"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"คำบรรยาย"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"การตั้งค่าการวางซ้อนข้อความคำบรรยายในวิดีโอ"</string>
     <string name="captions_display" msgid="735692527287125548">"จอแสดงผล"</string>
diff --git a/Settings/res/values-tl/strings.xml b/Settings/res/values-tl/strings.xml
index 87b225a..c34748d 100644
--- a/Settings/res/values-tl/strings.xml
+++ b/Settings/res/values-tl/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Mga Serbisyo"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Mga setting ng serbisyo"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Text na high contrast"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Shortcut sa pagiging naa-access"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"I-enable ang shortcut sa pagiging naa-access"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Serbisyo ng shortcut"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kapag naka-on, magsisimula ng accessibility feature kapag pinindot ang home at select nang 3 segundo"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Mga Caption"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Mga setting para sa text overlay para sa paglalagay ng mga nakasarang caption sa video"</string>
     <string name="captions_display" msgid="735692527287125548">"Display"</string>
diff --git a/Settings/res/values-tr/strings.xml b/Settings/res/values-tr/strings.xml
index 5b45a72..7714dc6 100644
--- a/Settings/res/values-tr/strings.xml
+++ b/Settings/res/values-tr/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Hizmetler"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Hizmet ayarları"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Yüksek kontrastlı metin"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Erişilebilirlik kısayolu"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Erişilebilirlik kısayolunu etkinleştir"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Kısayol hizmeti"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Kısayol etkinken, ana sayfa ve seç düğmelerinin ikisini birden üç saniye boyunca basılı tutarak bir erişilebilirlik özelliğini etkinleştirebilirsiniz."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Altyazılar"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Video üzerinde altyazı metni yer paylaşımı için ayarlar"</string>
     <string name="captions_display" msgid="735692527287125548">"Görüntüleme"</string>
diff --git a/Settings/res/values-uk/strings.xml b/Settings/res/values-uk/strings.xml
index 3471ced..a38c496 100644
--- a/Settings/res/values-uk/strings.xml
+++ b/Settings/res/values-uk/strings.xml
@@ -370,6 +370,10 @@
     <string name="system_services" msgid="7230571820151215779">"Служби"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Налаштування служби"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Висококонтрастний текст"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Ярлик спеціальних можливостей"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Увімкнути ярлик спеціальних можливостей"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Служба, пов’язана з ярликом"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Якщо ярлик ввімкнено, ви можете активувати функцію спеціальних можливостей, натиснувши обидві клавіші головного екрана та вибору й утримуючи їх протягом 3 секунд."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Субтитри"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Параметри накладання тексту прихованих субтитрів на відео"</string>
     <string name="captions_display" msgid="735692527287125548">"Показ"</string>
diff --git a/Settings/res/values-ur/strings.xml b/Settings/res/values-ur/strings.xml
index 01a8a1e..cc68e88 100644
--- a/Settings/res/values-ur/strings.xml
+++ b/Settings/res/values-ur/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"سروسز"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"سروس کی ترتیبات"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"اعلی تناسب امتزاج والا متن"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"ایکسیسبیلٹی شارٹ کٹ"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"ایکسیسبیلٹی شارٹ کٹ کو فعال کریں"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"شارٹ کٹ سروس"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"شارٹ کٹ آن ہونے پر، آپ ایکسیسبیلٹی خصوصیت شروع کرنے کیلئے ہوم اور منتخب کریں دونوں کو 3 سیکنڈ تک دبائے رکھ سکتے ہیں۔"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"کیپشنز"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"ویڈیو پر سب ٹائٹلز ٹیسکٹ اوورلے کیلئے ترتیبات"</string>
     <string name="captions_display" msgid="735692527287125548">"ڈسپلے"</string>
diff --git a/Settings/res/values-uz/strings.xml b/Settings/res/values-uz/strings.xml
index 296caf1..8cf781f 100644
--- a/Settings/res/values-uz/strings.xml
+++ b/Settings/res/values-uz/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Xizmatlar"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Xizmat sozlanmalari"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Yuqori kontrastli matn"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Tezkor ishga tushirish"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Tezkor ishga tushirish"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Xizmatni tezkor ishga tushirish"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Agar tezkor tugmalar yoniq bo‘lsa, maxsus imkoniyatlar funksiyasini ishga tushirish uchun bosh ekran va tanlash tugmasini 3 soniya bosib turing."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Sarlavhalar"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Yopiq sarlavhalar matni uchun sozlanmalar video ustiga qo‘yilgan"</string>
     <string name="captions_display" msgid="735692527287125548">"Ekran"</string>
diff --git a/Settings/res/values-vi/strings.xml b/Settings/res/values-vi/strings.xml
index e556de5..c66b1e5 100644
--- a/Settings/res/values-vi/strings.xml
+++ b/Settings/res/values-vi/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Dịch vụ"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Cài đặt dịch vụ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Văn bản có độ tương phản cao"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Phím tắt trợ năng"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Bật phím tắt trợ năng?"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Dịch vụ phím tắt"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Khi phím tắt được bật, bạn có thể nhấn cả hai nút trang chủ và nút chọn trong 3 giây để khởi động tính năng trợ năng."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Phụ đề"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Cài đặt cho lớp phủ văn bản phụ đề đóng trên video"</string>
     <string name="captions_display" msgid="735692527287125548">"Hiển thị"</string>
diff --git a/Settings/res/values-zh-rCN/arrays.xml b/Settings/res/values-zh-rCN/arrays.xml
index ac359c1..09536c3 100644
--- a/Settings/res/values-zh-rCN/arrays.xml
+++ b/Settings/res/values-zh-rCN/arrays.xml
@@ -17,18 +17,18 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="sleep_timeout_entries">
-    <item msgid="1213527366819650274">"5分钟"</item>
+    <item msgid="1213527366819650274">"5 分钟"</item>
     <item msgid="6561800022721381078">"15 分钟"</item>
     <item msgid="7718735533503035428">"30 分钟"</item>
     <item msgid="8784595382489738498">"1 小时"</item>
     <item msgid="1529312035777735084">"2 小时"</item>
   </string-array>
   <string-array name="screen_off_timeout_entries">
-    <item msgid="8244337465472020927">"30分钟"</item>
-    <item msgid="1001586019759702505">"1小时"</item>
-    <item msgid="5216959047515554188">"3小时"</item>
-    <item msgid="4152882798140628647">"6小时"</item>
-    <item msgid="412984226950404956">"12小时"</item>
+    <item msgid="8244337465472020927">"30 分钟"</item>
+    <item msgid="1001586019759702505">"1 小时"</item>
+    <item msgid="5216959047515554188">"3 小时"</item>
+    <item msgid="4152882798140628647">"6 小时"</item>
+    <item msgid="412984226950404956">"12 小时"</item>
     <item msgid="2178434662173258997">"永不"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
diff --git a/Settings/res/values-zh-rCN/strings.xml b/Settings/res/values-zh-rCN/strings.xml
index cd77c68..5262dc3 100644
--- a/Settings/res/values-zh-rCN/strings.xml
+++ b/Settings/res/values-zh-rCN/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"服务"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"服务设置"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"高对比度文字"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"无障碍功能快捷方式"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"启用无障碍功能快捷方式"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"快捷方式服务"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"开启这项快捷方式后，同时按下主屏幕按钮和选择按钮 3 秒钟即可启动无障碍功能"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"字幕"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"视频字幕的文字叠加层设置"</string>
     <string name="captions_display" msgid="735692527287125548">"显示"</string>
diff --git a/Settings/res/values-zh-rHK/strings.xml b/Settings/res/values-zh-rHK/strings.xml
index bf3dff1..87e4845 100644
--- a/Settings/res/values-zh-rHK/strings.xml
+++ b/Settings/res/values-zh-rHK/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"服務"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"服務設定"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"高對比文字"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"無障礙功能快速鍵"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"啟用無障礙功能快速鍵"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"快速鍵服務"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"啟用快速鍵後，同時按下主畫面和選取按鈕 3 秒即可啟動無障礙功能"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"字幕"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"影片隱藏式字幕文字重疊設定"</string>
     <string name="captions_display" msgid="735692527287125548">"顯示"</string>
diff --git a/Settings/res/values-zh-rTW/strings.xml b/Settings/res/values-zh-rTW/strings.xml
index 7fd658f..05e34a6 100644
--- a/Settings/res/values-zh-rTW/strings.xml
+++ b/Settings/res/values-zh-rTW/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"服務"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"服務設定"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"高對比文字"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"協助工具快速鍵"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"啟用協助工具快速鍵"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"快速鍵服務"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"啟用這組快速鍵後，你只需同時按下主螢幕按鈕和選取按鈕達三秒，就能開啟協助工具功能"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"字幕"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"影片字幕文字重疊設定"</string>
     <string name="captions_display" msgid="735692527287125548">"顯示"</string>
diff --git a/Settings/res/values-zu/strings.xml b/Settings/res/values-zu/strings.xml
index 8d64e28..0fd41f9 100644
--- a/Settings/res/values-zu/strings.xml
+++ b/Settings/res/values-zu/strings.xml
@@ -368,6 +368,10 @@
     <string name="system_services" msgid="7230571820151215779">"Amasevisi"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"Izilungiselelo zesevisi"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="4970438261747914408">"Umbhala ogqame kakhulu"</string>
+    <string name="accessibility_shortcut" msgid="6726361991387558828">"Isinqamuleli sokufinyeleleka"</string>
+    <string name="accessibility_shortcut_enable" msgid="1801656084705223078">"Nika amandla isinqamuleli sokufinyelela"</string>
+    <string name="accessibility_shortcut_service" msgid="1978686501861996601">"Isevisi yesinqamuleli"</string>
+    <string name="accessibility_shortcut_description" msgid="3241203131630578108">"Uma isinqamuleli sivulekile, ungacindezela izinkinobho zevolomu amasekhodi angu-3 ukuze uqale isici sokufinyelela."</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"Amazwibela"</string>
     <string name="accessibility_captions_description" msgid="4290317621720499628">"Izilungiselelo zombhalo wamazwibela avaliwe kuzimbondela ezikuvidiyo"</string>
     <string name="captions_display" msgid="735692527287125548">"Isibonisi"</string>
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index a546dd0..dc262ed 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -798,7 +798,14 @@
     <string name="accessibility_service_settings">Service settings</string>
     <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_high_text_contrast_preference_title">High contrast text</string>
-
+    <!-- Title for accessibility shortcut preference and screen [CHAR LIMIT=50] -->
+    <string name="accessibility_shortcut">Accessibility shortcut</string>
+    <!-- Title for accessibility shortcut toggle [CHAR LIMIT=50] -->
+    <string name="accessibility_shortcut_enable">Enable accessibility shortcut</string>
+    <!-- Title for accessibility shortcut service choice preference [CHAR LIMIT=50}-->
+    <string name="accessibility_shortcut_service">Shortcut service</string>
+    <!-- Description for the accessibility shortcut [CHAR LIMIT=NONE] -->
+    <string name="accessibility_shortcut_description">When the shortcut is on, you can press both home and select for 3 seconds to start an accessibility feature</string>
     <!-- Title and description for accessibility captions setting [CHAR LIMIT=50] -->
     <string name="accessibility_captions">Captions</string>
     <!-- Title and description for accessibility captions description [CHAR LIMIT=NONE] -->
diff --git a/Settings/res/xml/accessibility.xml b/Settings/res/xml/accessibility.xml
new file mode 100644
index 0000000..ba95277
--- /dev/null
+++ b/Settings/res/xml/accessibility.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 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.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/system_accessibility">
+
+    <Preference
+            android:key="captions"
+            android:title="@string/accessibility_captions">
+        <intent
+                android:action="android.intent.action.MAIN"
+                android:targetClass="com.android.tv.settings.system.CaptionSetupActivity"
+                android:targetPackage="com.android.tv.settings"/>
+    </Preference>
+
+    <SwitchPreference
+            android:key="toggle_high_text_contrast"
+            android:persistent="false"
+            android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
+            android:summary="@string/experimental_preference"/>
+
+    <Preference
+            android:key="text_to_speech"
+            android:title="@string/system_accessibility_tts_output"
+            android:fragment="com.android.tv.settings.system.TextToSpeechFragment"/>
+
+    <Preference
+            android:key="accessibility_shortcut"
+            android:title="@string/accessibility_shortcut"
+            android:fragment="com.android.tv.settings.accessibility.AccessibilityShortcutFragment"/>
+
+    <PreferenceCategory
+            android:key="system_accessibility_services"
+            android:title="@string/system_services"/>
+
+</PreferenceScreen>
diff --git a/Settings/res/xml/accessibility_shortcut.xml b/Settings/res/xml/accessibility_shortcut.xml
new file mode 100644
index 0000000..7c79d86
--- /dev/null
+++ b/Settings/res/xml/accessibility_shortcut.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 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.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/accessibility_shortcut">
+    <SwitchPreference
+            android:key="enable"
+            android:persistent="false"
+            android:title="@string/accessibility_shortcut_enable" />
+    <Preference
+            android:key="service"
+            android:persistent="false"
+            android:title="@string/accessibility_shortcut_service"
+            android:fragment="com.android.tv.settings.accessibility.AccessibilityShortcutServiceFragment"/>
+    <Preference
+            android:enabled="false"
+            android:selectable="false"
+            android:title="@string/accessibility_shortcut_description"
+            android:singleLineTitle="false" />
+</PreferenceScreen>
diff --git a/Settings/res/xml/accessibility_shortcut_service.xml b/Settings/res/xml/accessibility_shortcut_service.xml
new file mode 100644
index 0000000..0c7d7bc
--- /dev/null
+++ b/Settings/res/xml/accessibility_shortcut_service.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 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.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/accessibility_shortcut_service"/>
diff --git a/Settings/res/xml/main_prefs.xml b/Settings/res/xml/main_prefs.xml
index 92c07f0..d842ca8 100644
--- a/Settings/res/xml/main_prefs.xml
+++ b/Settings/res/xml/main_prefs.xml
@@ -109,7 +109,7 @@
             android:icon="@drawable/ic_accessibility_new"
             android:key="accessibility"
             android:title="@string/system_accessibility"
-            android:fragment="com.android.tv.settings.system.AccessibilityFragment" />
+            android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment" />
         <Preference
             android:icon="@drawable/ic_settings_developeroptions"
             android:key="developer"
diff --git a/Settings/res/xml/restricted_prefs.xml b/Settings/res/xml/restricted_prefs.xml
index 999f3d4..e10e2fb 100644
--- a/Settings/res/xml/restricted_prefs.xml
+++ b/Settings/res/xml/restricted_prefs.xml
@@ -78,7 +78,7 @@
             android:icon="@drawable/ic_accessibility_new"
             android:key="accessibility"
             android:title="@string/system_accessibility"
-            android:fragment="com.android.tv.settings.system.AccessibilityFragment" />
+            android:fragment="com.android.tv.settings.accessibility.AccessibilityFragment" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
new file mode 100644
index 0000000..06607c0
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2017 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.tv.settings.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.content.pm.ServiceInfo;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.Keep;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v17.preference.LeanbackPreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.TwoStatePreference;
+import android.text.TextUtils;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settingslib.accessibility.AccessibilityUtils;
+import com.android.tv.settings.R;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Fragment for Accessibility settings
+ */
+@Keep
+public class AccessibilityFragment extends LeanbackPreferenceFragment {
+    private static final String TOGGLE_HIGH_TEXT_CONTRAST_KEY = "toggle_high_text_contrast";
+    private static final String ACCESSIBILITY_SERVICES_KEY = "system_accessibility_services";
+
+    private PreferenceGroup mServicesPref;
+
+    /**
+     * Create a new instance of the fragment
+     * @return New fragment instance
+     */
+    public static AccessibilityFragment newInstance() {
+        return new AccessibilityFragment();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mServicesPref != null) {
+            refreshServices(mServicesPref);
+        }
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.accessibility, null);
+
+        final TwoStatePreference highContrastPreference =
+                (TwoStatePreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_KEY);
+        highContrastPreference.setChecked(Settings.Secure.getInt(getContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0) == 1);
+
+        mServicesPref = (PreferenceGroup) findPreference(ACCESSIBILITY_SERVICES_KEY);
+        refreshServices(mServicesPref);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(preference.getKey(), TOGGLE_HIGH_TEXT_CONTRAST_KEY)) {
+            Settings.Secure.putInt(getActivity().getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
+                    (((SwitchPreference) preference).isChecked() ? 1 : 0));
+            return true;
+        } else {
+            return super.onPreferenceTreeClick(preference);
+        }
+    }
+
+    private void refreshServices(PreferenceGroup group) {
+        final List<AccessibilityServiceInfo> installedServiceInfos =
+                getActivity().getSystemService(AccessibilityManager.class)
+                        .getInstalledAccessibilityServiceList();
+        final Set<ComponentName> enabledServices =
+                AccessibilityUtils.getEnabledServicesFromSettings(getActivity());
+        final boolean accessibilityEnabled = Settings.Secure.getInt(
+                getActivity().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
+
+        for (final AccessibilityServiceInfo accInfo : installedServiceInfos) {
+            final ServiceInfo serviceInfo = accInfo.getResolveInfo().serviceInfo;
+            final ComponentName componentName = new ComponentName(serviceInfo.packageName,
+                    serviceInfo.name);
+
+            final boolean serviceEnabled = accessibilityEnabled
+                    && enabledServices.contains(componentName);
+
+            final String title = accInfo.getResolveInfo()
+                    .loadLabel(getActivity().getPackageManager()).toString();
+
+            final String key = "ServicePref:" + componentName.flattenToString();
+            Preference servicePref = findPreference(key);
+            if (servicePref == null) {
+                servicePref = new Preference(group.getContext());
+                servicePref.setKey(key);
+            }
+            servicePref.setTitle(title);
+            servicePref.setSummary(serviceEnabled ? R.string.settings_on : R.string.settings_off);
+            servicePref.setFragment(AccessibilityServiceFragment.class.getName());
+            AccessibilityServiceFragment.prepareArgs(servicePref.getExtras(),
+                    serviceInfo.packageName,
+                    serviceInfo.name,
+                    accInfo.getSettingsActivityName(),
+                    title);
+            group.addPreference(servicePref);
+        }
+    }
+
+}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
new file mode 100644
index 0000000..c456e04
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2017 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.tv.settings.accessibility;
+
+import android.app.Fragment;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v17.leanback.app.GuidedStepFragment;
+import android.support.v17.leanback.widget.GuidanceStylist;
+import android.support.v17.leanback.widget.GuidedAction;
+
+import com.android.tv.settings.R;
+
+import java.util.List;
+
+/**
+ * Fragment for confirming [de]activation of accessibility service
+ */
+public class AccessibilityServiceConfirmationFragment extends GuidedStepFragment {
+    private static final String ARG_LABEL = "label";
+    private static final String ARG_COMPONENT = "component";
+    private static final String ARG_ENABLING = "enabling";
+
+    /**
+     * Callback for dialog completion
+     */
+    public interface OnAccessibilityServiceConfirmedListener {
+        /**
+         * Called when enabling/disabling was confirmed by the user, not called otherwise.
+         * @param componentName Service in question
+         * @param enabling True for enabling
+         */
+        void onAccessibilityServiceConfirmed(ComponentName componentName, boolean enabling);
+    }
+
+    /**
+     * Create a new instance of the fragment
+     * @param cn Component of service
+     * @param label Human readable label
+     * @param enabling True for enabling
+     * @return new fragment instance
+     */
+    public static AccessibilityServiceConfirmationFragment newInstance(ComponentName cn,
+            CharSequence label, boolean enabling) {
+        Bundle args = new Bundle(3);
+        prepareArgs(args, cn, label, enabling);
+        AccessibilityServiceConfirmationFragment fragment =
+                new AccessibilityServiceConfirmationFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    /**
+     * Put args in bundle
+     * @param args Bundle to prepare
+     * @param cn Component of service
+     * @param label Human readable label
+     * @param enabling True for enabling
+     */
+    public static void prepareArgs(@NonNull Bundle args, ComponentName cn, CharSequence label,
+            boolean enabling) {
+        args.putParcelable(ARG_COMPONENT, cn);
+        args.putCharSequence(ARG_LABEL, label);
+        args.putBoolean(ARG_ENABLING, enabling);
+    }
+
+    @NonNull
+    @Override
+    public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
+        final CharSequence label = getArguments().getCharSequence(ARG_LABEL);
+        if (getArguments().getBoolean(ARG_ENABLING)) {
+            return new GuidanceStylist.Guidance(
+                    getString(R.string.system_accessibility_service_on_confirm_title,
+                            label),
+                    getString(R.string.system_accessibility_service_on_confirm_desc,
+                            label),
+                    null,
+                    getActivity().getDrawable(R.drawable.ic_accessibility_new_132dp)
+            );
+        } else {
+            return new GuidanceStylist.Guidance(
+                    getString(R.string.system_accessibility_service_off_confirm_title,
+                            label),
+                    getString(R.string.system_accessibility_service_off_confirm_desc,
+                            label),
+                    null,
+                    getActivity().getDrawable(R.drawable.ic_accessibility_new_132dp)
+            );
+        }
+    }
+
+    @Override
+    public void onCreateActions(@NonNull List<GuidedAction> actions,
+            Bundle savedInstanceState) {
+        final Context context = getActivity();
+        actions.add(new GuidedAction.Builder(context)
+                .clickAction(GuidedAction.ACTION_ID_OK).build());
+        actions.add(new GuidedAction.Builder(context)
+                .clickAction(GuidedAction.ACTION_ID_CANCEL).build());
+    }
+
+    @Override
+    public void onGuidedActionClicked(GuidedAction action) {
+        if (action.getId() == GuidedAction.ACTION_ID_OK) {
+            final ComponentName component = getArguments().getParcelable(ARG_COMPONENT);
+            final Fragment fragment = getTargetFragment();
+            final boolean enabling = getArguments().getBoolean(ARG_ENABLING);
+            if (fragment instanceof OnAccessibilityServiceConfirmedListener) {
+                ((OnAccessibilityServiceConfirmedListener) fragment)
+                        .onAccessibilityServiceConfirmed(component, enabling);
+            } else {
+                throw new IllegalStateException("Target fragment is not an "
+                        + "OnAccessibilityServiceConfirmedListener");
+            }
+            getFragmentManager().popBackStack();
+        } else if (action.getId() == GuidedAction.ACTION_ID_CANCEL) {
+            getFragmentManager().popBackStack();
+        } else {
+            super.onGuidedActionClicked(action);
+        }
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
new file mode 100644
index 0000000..c5a433e
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 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.tv.settings.accessibility;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v17.preference.LeanbackPreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
+import android.text.TextUtils;
+
+import com.android.settingslib.accessibility.AccessibilityUtils;
+import com.android.tv.settings.R;
+
+import java.util.Set;
+
+/**
+ * Fragment for controlling accessibility service
+ */
+public class AccessibilityServiceFragment extends LeanbackPreferenceFragment implements
+        AccessibilityServiceConfirmationFragment.OnAccessibilityServiceConfirmedListener {
+    private static final String ARG_PACKAGE_NAME = "packageName";
+    private static final String ARG_SERVICE_NAME = "serviceName";
+    private static final String ARG_SETTINGS_ACTIVITY_NAME = "settingsActivityName";
+    private static final String ARG_LABEL = "label";
+
+    private TwoStatePreference mEnablePref;
+
+    /**
+     * Put args in bundle
+     * @param args Bundle to prepare
+     * @param packageName Package of accessibility service
+     * @param serviceName Class of accessibility service
+     * @param activityName Class of accessibility service settings activity
+     * @param label Screen title
+     */
+    public static void prepareArgs(@NonNull Bundle args, String packageName, String serviceName,
+            String activityName, String label) {
+        args.putString(ARG_PACKAGE_NAME, packageName);
+        args.putString(ARG_SERVICE_NAME, serviceName);
+        args.putString(ARG_SETTINGS_ACTIVITY_NAME, activityName);
+        args.putString(ARG_LABEL, label);
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        final Context themedContext = getPreferenceManager().getContext();
+        final PreferenceScreen screen =
+                getPreferenceManager().createPreferenceScreen(themedContext);
+        screen.setTitle(getArguments().getString(ARG_LABEL));
+
+        mEnablePref = new SwitchPreference(themedContext);
+        mEnablePref.setTitle(R.string.system_accessibility_status);
+        mEnablePref.setFragment(AccessibilityServiceConfirmationFragment.class.getName());
+        screen.addPreference(mEnablePref);
+
+        final Preference settingsPref = new Preference(themedContext);
+        settingsPref.setTitle(R.string.system_accessibility_config);
+        final String activityName = getArguments().getString(ARG_SETTINGS_ACTIVITY_NAME);
+        if (!TextUtils.isEmpty(activityName)) {
+            final String packageName = getArguments().getString(ARG_PACKAGE_NAME);
+            settingsPref.setIntent(new Intent(Intent.ACTION_MAIN)
+                    .setComponent(new ComponentName(packageName, activityName)));
+        } else {
+            settingsPref.setEnabled(false);
+        }
+        screen.addPreference(settingsPref);
+
+        setPreferenceScreen(screen);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        final String packageName = getArguments().getString(ARG_PACKAGE_NAME);
+        final String serviceName = getArguments().getString(ARG_SERVICE_NAME);
+
+        final ComponentName serviceComponent = new ComponentName(packageName, serviceName);
+        final Set<ComponentName> enabledServices =
+                AccessibilityUtils.getEnabledServicesFromSettings(getActivity());
+        final boolean enabled = enabledServices.contains(serviceComponent);
+
+        mEnablePref.setChecked(enabled);
+        AccessibilityServiceConfirmationFragment.prepareArgs(mEnablePref.getExtras(),
+                new ComponentName(packageName, serviceName),
+                getArguments().getString(ARG_LABEL), !enabled);
+    }
+
+    @Override
+    public void onAccessibilityServiceConfirmed(ComponentName componentName, boolean enabling) {
+        AccessibilityUtils.setAccessibilityServiceState(getActivity(),
+                componentName, enabling);
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
new file mode 100644
index 0000000..485715c
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2017 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.tv.settings.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.annotation.Keep;
+import android.support.v17.preference.LeanbackPreferenceFragment;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
+import android.text.TextUtils;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settingslib.accessibility.AccessibilityUtils;
+import com.android.tv.settings.R;
+
+import java.util.List;
+
+/**
+ * Fragment for configuring the accessibility shortcut
+ */
+@Keep
+public class AccessibilityShortcutFragment extends LeanbackPreferenceFragment {
+    private static final String KEY_ENABLE = "enable";
+    private static final String KEY_SERVICE = "service";
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.accessibility_shortcut, null);
+
+        final TwoStatePreference enablePref = (TwoStatePreference) findPreference(KEY_ENABLE);
+        enablePref.setOnPreferenceChangeListener((preference, newValue) -> {
+            setAccessibilityShortcutEnabled((Boolean) newValue);
+            return true;
+        });
+
+        boolean shortcutEnabled = Settings.Secure.getInt(getContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 1) == 1;
+
+        enablePref.setChecked(shortcutEnabled);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        final Preference servicePref = findPreference(KEY_SERVICE);
+        final List<AccessibilityServiceInfo> installedServices = getContext()
+                .getSystemService(AccessibilityManager.class)
+                .getInstalledAccessibilityServiceList();
+        final PackageManager packageManager = getContext().getPackageManager();
+        final String currentService = getCurrentService(getContext());
+        for (AccessibilityServiceInfo service : installedServices) {
+            final String serviceString = service.getComponentName().flattenToString();
+            if (TextUtils.equals(currentService, serviceString)) {
+                servicePref.setSummary(service.getResolveInfo().loadLabel(packageManager));
+            }
+        }
+    }
+
+    private void setAccessibilityShortcutEnabled(boolean enabled) {
+        Settings.Secure.putInt(getContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, enabled ? 1 : 0);
+        final ListPreference servicePref = (ListPreference) findPreference(KEY_SERVICE);
+        servicePref.setEnabled(enabled);
+    }
+
+    static String getCurrentService(Context context) {
+        String shortcutServiceString = AccessibilityUtils
+                .getShortcutTargetServiceComponentNameString(context, UserHandle.myUserId());
+        if (shortcutServiceString != null) {
+            ComponentName shortcutName = ComponentName.unflattenFromString(shortcutServiceString);
+            if (shortcutName != null) {
+                return shortcutName.flattenToString();
+            }
+        }
+        return null;
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
new file mode 100644
index 0000000..1d8cab7
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 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.tv.settings.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.Fragment;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.Keep;
+import android.support.v17.preference.LeanbackPreferenceFragment;
+import android.support.v17.preference.LeanbackSettingsFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.tv.settings.R;
+import com.android.tv.settings.RadioPreference;
+
+import java.util.List;
+
+/**
+ * Fragment imitating a single-selection list for picking the accessibility shortcut service
+ */
+@Keep
+public class AccessibilityShortcutServiceFragment extends LeanbackPreferenceFragment implements
+        AccessibilityServiceConfirmationFragment.OnAccessibilityServiceConfirmedListener {
+    private static final String SERVICE_RADIO_GROUP = "service_group";
+
+    private final Preference.OnPreferenceChangeListener mPreferenceChangeListener =
+            (preference, newValue) -> {
+                final String newCompString = preference.getKey();
+                final String currentService =
+                        AccessibilityShortcutFragment.getCurrentService(getContext());
+                if ((Boolean) newValue && !TextUtils.equals(newCompString, currentService)) {
+                    final ComponentName cn = ComponentName.unflattenFromString(newCompString);
+                    final CharSequence label = preference.getTitle();
+                    final Fragment confirmFragment =
+                            AccessibilityServiceConfirmationFragment.newInstance(cn, label, true);
+                    confirmFragment.setTargetFragment(AccessibilityShortcutServiceFragment.this, 0);
+
+                    final Fragment settingsFragment = getCallbackFragment();
+                    if (settingsFragment instanceof LeanbackSettingsFragment) {
+                        ((LeanbackSettingsFragment) settingsFragment)
+                                .startImmersiveFragment(confirmFragment);
+                    } else {
+                        throw new IllegalStateException("Not attached to settings fragment??");
+                    }
+                }
+                return false;
+            };
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.accessibility_shortcut_service, null);
+
+        final PreferenceScreen screen = getPreferenceScreen();
+        final Context themedContext = getPreferenceManager().getContext();
+
+        final List<AccessibilityServiceInfo> installedServices = getContext()
+                .getSystemService(AccessibilityManager.class)
+                .getInstalledAccessibilityServiceList();
+        final PackageManager packageManager = getContext().getPackageManager();
+        final String currentService = AccessibilityShortcutFragment.getCurrentService(getContext());
+        for (AccessibilityServiceInfo service : installedServices) {
+            final RadioPreference preference = new RadioPreference(themedContext);
+            preference.setPersistent(false);
+            preference.setRadioGroup(SERVICE_RADIO_GROUP);
+            preference.setOnPreferenceChangeListener(mPreferenceChangeListener);
+
+            final String serviceString = service.getComponentName().flattenToString();
+            if (TextUtils.equals(currentService, serviceString)) {
+                preference.setChecked(true);
+            }
+            preference.setKey(serviceString);
+            preference.setTitle(service.getResolveInfo().loadLabel(packageManager));
+
+            screen.addPreference(preference);
+        }
+    }
+
+    @Override
+    public void onAccessibilityServiceConfirmed(ComponentName componentName, boolean enabling) {
+        final String componentString = componentName.flattenToString();
+        Settings.Secure.putString(getContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE,
+                componentString);
+        getFragmentManager().popBackStack();
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/connectivity/FormPageDisplayer.java b/Settings/src/com/android/tv/settings/connectivity/FormPageDisplayer.java
index a5fbf29..e9f9b21 100644
--- a/Settings/src/com/android/tv/settings/connectivity/FormPageDisplayer.java
+++ b/Settings/src/com/android/tv/settings/connectivity/FormPageDisplayer.java
@@ -44,10 +44,11 @@
     public static final int DISPLAY_TYPE_TEXT_INPUT = 1;
     public static final int DISPLAY_TYPE_LIST_CHOICE = 2;
     public static final int DISPLAY_TYPE_LOADING = 3;
-    // Minimum 8 characters
+    // Minimum 5 characters for WEP, 8 characters for PSK
     public static final int DISPLAY_TYPE_PSK_INPUT = 4;
 
-    private static final int PSK_MIN_LENGTH = 8;
+    private static final int WEP_MIN_LENGTH = 5;
+    public static final int PSK_MIN_LENGTH = 8;
 
     public interface FormPageInfo {
         /**
@@ -253,7 +254,7 @@
         mPasswordInputWizardFragmentListener = new PasswordInputWizardFragment.Listener() {
             @Override
             public boolean onPasswordInputComplete(String text, boolean obfuscate) {
-                if (!TextUtils.isEmpty(text) && text.length() >= PSK_MIN_LENGTH) {
+                if (!TextUtils.isEmpty(text) && text.length() >= WEP_MIN_LENGTH) {
                     Bundle result = new Bundle();
                     result.putString(FormPage.DATA_KEY_SUMMARY_STRING, text);
                     if (obfuscate) {
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiMultiPagedFormActivity.java b/Settings/src/com/android/tv/settings/connectivity/WifiMultiPagedFormActivity.java
index be5105b..366c75d 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiMultiPagedFormActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiMultiPagedFormActivity.java
@@ -143,13 +143,17 @@
         if (wifiSecurity == WifiSecurity.WEP) {
             int length = password.length();
             // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
-            if ((length == 10 || length == 26 || length == 58)
+            if ((length == 10 || length == 26 || length == 32 || length == 58)
                     && password.matches("[0-9A-Fa-f]*")) {
                 wifiConfiguration.wepKeys[0] = password;
-            } else {
+            } else if (length == 5 || length == 13 || length == 16 || length == 29) {
                 wifiConfiguration.wepKeys[0] = '"' + password + '"';
             }
         } else {
+            if (wifiSecurity == WifiSecurity.PSK
+                    && password.length() < FormPageDisplayer.PSK_MIN_LENGTH) {
+                return;
+            }
             if (password.matches("[0-9A-Fa-f]{64}")) {
                 wifiConfiguration.preSharedKey = password;
             } else {
diff --git a/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java b/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java
index 41aa8dd..a2269df 100644
--- a/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java
@@ -463,7 +463,7 @@
             if (event.getAction() == KeyEvent.ACTION_UP) {
                 int keyCode = event.getKeyCode();
                 if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) {
-                    setNextValue(keyCode - KeyEvent.KEYCODE_0);
+                    jumpNextValue(keyCode - KeyEvent.KEYCODE_0);
                 } else if (keyCode != KeyEvent.KEYCODE_DPAD_CENTER
                         && keyCode != KeyEvent.KEYCODE_ENTER) {
                     return super.dispatchKeyEvent(event);
@@ -546,12 +546,12 @@
             return mCurrentValue;
         }
 
-        // Will take effect when the focus is updated.
-        void setNextValue(int value) {
+        void jumpNextValue(int value) {
             if (value < mMinValue || value > mMaxValue) {
                 throw new IllegalStateException("Value is not set");
             }
-            mNextValue = adjustValueInValidRange(value);
+            mNextValue = mCurrentValue = adjustValueInValidRange(value);
+            updateText();
         }
 
         void updateFocus() {
diff --git a/Settings/src/com/android/tv/settings/system/AccessibilityActivity.java b/Settings/src/com/android/tv/settings/system/AccessibilityActivity.java
deleted file mode 100644
index 389fc2b..0000000
--- a/Settings/src/com/android/tv/settings/system/AccessibilityActivity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2014 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.tv.settings.system;
-
-import android.app.Fragment;
-
-import com.android.tv.settings.BaseSettingsFragment;
-import com.android.tv.settings.TvSettingsActivity;
-
-public class AccessibilityActivity extends TvSettingsActivity {
-
-    @Override
-    protected Fragment createSettingsFragment() {
-        return SettingsFragment.newInstance();
-    }
-
-    public static class SettingsFragment extends BaseSettingsFragment {
-
-        public static SettingsFragment newInstance() {
-            return new SettingsFragment();
-        }
-
-        @Override
-        public void onPreferenceStartInitialScreen() {
-            startPreferenceFragment(AccessibilityFragment.newInstance());
-        }
-    }
-}
diff --git a/Settings/src/com/android/tv/settings/system/AccessibilityFragment.java b/Settings/src/com/android/tv/settings/system/AccessibilityFragment.java
deleted file mode 100644
index e00e176..0000000
--- a/Settings/src/com/android/tv/settings/system/AccessibilityFragment.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2015 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.tv.settings.system;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ServiceInfo;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.preference.LeanbackPreferenceFragment;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.view.accessibility.AccessibilityManager;
-
-import com.android.settingslib.accessibility.AccessibilityUtils;
-import com.android.tv.settings.R;
-
-import java.util.List;
-import java.util.Set;
-
-public class AccessibilityFragment extends LeanbackPreferenceFragment {
-    private static final String TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE =
-            "toggle_high_text_contrast_preference";
-
-    private PreferenceGroup mServicesPref;
-
-    public static AccessibilityFragment newInstance() {
-        return new AccessibilityFragment();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mServicesPref != null) {
-            refreshServices(mServicesPref);
-        }
-    }
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        final Context themedContext = getPreferenceManager().getContext();
-        final PreferenceScreen screen =
-                getPreferenceManager().createPreferenceScreen(themedContext);
-        screen.setTitle(R.string.system_accessibility);
-
-        final Preference captionsPreference = new Preference(themedContext);
-        captionsPreference.setTitle(R.string.accessibility_captions);
-        captionsPreference.setIntent(new Intent(Intent.ACTION_MAIN).setComponent(
-                new ComponentName(getActivity(), CaptionSetupActivity.class)));
-        screen.addPreference(captionsPreference);
-
-        final SwitchPreference highContrastPreference = new SwitchPreference(themedContext);
-        highContrastPreference.setKey(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE);
-        highContrastPreference.setPersistent(false);
-        highContrastPreference.setTitle(
-                R.string.accessibility_toggle_high_text_contrast_preference_title);
-        highContrastPreference.setSummary(R.string.experimental_preference);
-        highContrastPreference.setChecked(Settings.Secure.getInt(getContext().getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0) == 1);
-        screen.addPreference(highContrastPreference);
-
-        mServicesPref = new PreferenceCategory(themedContext);
-        mServicesPref.setTitle(R.string.system_services);
-        screen.addPreference(mServicesPref);
-        refreshServices(mServicesPref);
-
-        final Preference ttsPref = new Preference(themedContext);
-        ttsPref.setTitle(R.string.system_accessibility_tts_output);
-        ttsPref.setFragment(TextToSpeechFragment.class.getName());
-        screen.addPreference(ttsPref);
-
-        setPreferenceScreen(screen);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (TextUtils.equals(preference.getKey(), TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE)) {
-            Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
-                    (((SwitchPreference) preference).isChecked() ? 1 : 0));
-            return true;
-        } else {
-            return super.onPreferenceTreeClick(preference);
-        }
-    }
-
-    private void refreshServices(PreferenceGroup group) {
-        final List<AccessibilityServiceInfo> installedServiceInfos = AccessibilityManager
-                .getInstance(getActivity()).getInstalledAccessibilityServiceList();
-        final Set<ComponentName> enabledServices =
-                AccessibilityUtils.getEnabledServicesFromSettings(getActivity());
-        final boolean accessibilityEnabled = Settings.Secure.getInt(
-                getActivity().getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
-
-        for (final AccessibilityServiceInfo accInfo : installedServiceInfos) {
-            final ServiceInfo serviceInfo = accInfo.getResolveInfo().serviceInfo;
-            final ComponentName componentName = new ComponentName(serviceInfo.packageName,
-                    serviceInfo.name);
-
-            final boolean serviceEnabled = accessibilityEnabled
-                    && enabledServices.contains(componentName);
-
-            final String title = accInfo.getResolveInfo()
-                    .loadLabel(getActivity().getPackageManager()).toString();
-
-            final String key = "ServicePref:" + componentName.flattenToString();
-            Preference servicePref = findPreference(key);
-            if (servicePref == null) {
-                servicePref = new Preference(group.getContext());
-                servicePref.setKey(key);
-            }
-            servicePref.setTitle(title);
-            servicePref.setSummary(serviceEnabled ? R.string.settings_on : R.string.settings_off);
-            servicePref.setFragment(AccessibilityServiceFragment.class.getName());
-            AccessibilityServiceFragment.prepareArgs(servicePref.getExtras(),
-                    serviceInfo.packageName,
-                    serviceInfo.name,
-                    accInfo.getSettingsActivityName(),
-                    title);
-            group.addPreference(servicePref);
-        }
-    }
-
-    public static class AccessibilityServiceFragment extends LeanbackPreferenceFragment {
-        private static final String ARG_PACKAGE_NAME = "packageName";
-        private static final String ARG_SERVICE_NAME = "serviceName";
-        private static final String ARG_SETTINGS_ACTIVITY_NAME = "settingsActivityName";
-        private static final String ARG_LABEL = "label";
-
-        private CheckBoxPreference mEnablePref;
-
-        public static void prepareArgs(@NonNull Bundle args, String packageName, String serviceName,
-                String activityName, String label) {
-            args.putString(ARG_PACKAGE_NAME, packageName);
-            args.putString(ARG_SERVICE_NAME, serviceName);
-            args.putString(ARG_SETTINGS_ACTIVITY_NAME, activityName);
-            args.putString(ARG_LABEL, label);
-        }
-
-        @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            final Context themedContext = getPreferenceManager().getContext();
-            final PreferenceScreen screen =
-                    getPreferenceManager().createPreferenceScreen(themedContext);
-            screen.setTitle(getArguments().getString(ARG_LABEL));
-
-            mEnablePref = new CheckBoxPreference(themedContext);
-            mEnablePref.setTitle(R.string.system_accessibility_status);
-            mEnablePref.setFragment(EnableDisableConfirmationFragment.class.getName());
-            screen.addPreference(mEnablePref);
-
-            final Preference settingsPref = new Preference(themedContext);
-            settingsPref.setTitle(R.string.system_accessibility_config);
-            final String activityName = getArguments().getString(ARG_SETTINGS_ACTIVITY_NAME);
-            if (!TextUtils.isEmpty(activityName)) {
-                final String packageName = getArguments().getString(ARG_PACKAGE_NAME);
-                settingsPref.setIntent(new Intent(Intent.ACTION_MAIN)
-                        .setComponent(new ComponentName(packageName, activityName)));
-            } else {
-                settingsPref.setEnabled(false);
-            }
-            screen.addPreference(settingsPref);
-
-            setPreferenceScreen(screen);
-        }
-
-        @Override
-        public void onResume() {
-            super.onResume();
-
-            final String packageName = getArguments().getString(ARG_PACKAGE_NAME);
-            final String serviceName = getArguments().getString(ARG_SERVICE_NAME);
-
-            final ComponentName serviceComponent = new ComponentName(packageName, serviceName);
-            final Set<ComponentName> enabledServices =
-                    AccessibilityUtils.getEnabledServicesFromSettings(getActivity());
-            final boolean enabled = enabledServices.contains(serviceComponent);
-
-            mEnablePref.setChecked(enabled);
-            EnableDisableConfirmationFragment.prepareArgs(mEnablePref.getExtras(),
-                    new ComponentName(packageName, serviceName),
-                    getArguments().getString(ARG_LABEL), !enabled);
-        }
-
-        public static class EnableDisableConfirmationFragment extends GuidedStepFragment {
-            private static final String ARG_LABEL = "label";
-            private static final String ARG_COMPONENT = "component";
-            private static final String ARG_ENABLING = "enabling";
-
-            public static void prepareArgs(@NonNull Bundle args, ComponentName cn, String label,
-                    boolean enabling) {
-                args.putParcelable(ARG_COMPONENT, cn);
-                args.putString(ARG_LABEL, label);
-                args.putBoolean(ARG_ENABLING, enabling);
-            }
-
-            @NonNull
-            @Override
-            public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
-                final String label = getArguments().getString(ARG_LABEL);
-                if (getArguments().getBoolean(ARG_ENABLING)) {
-                    return new GuidanceStylist.Guidance(
-                            getString(R.string.system_accessibility_service_on_confirm_title,
-                                    label),
-                            getString(R.string.system_accessibility_service_on_confirm_desc,
-                                    label),
-                            null,
-                            getActivity().getDrawable(R.drawable.ic_accessibility_new_132dp)
-                    );
-                } else {
-                    return new GuidanceStylist.Guidance(
-                            getString(R.string.system_accessibility_service_off_confirm_title,
-                                    label),
-                            getString(R.string.system_accessibility_service_off_confirm_desc,
-                                    label),
-                            null,
-                            getActivity().getDrawable(R.drawable.ic_accessibility_new_132dp)
-                    );
-                }
-            }
-
-            @Override
-            public void onCreateActions(@NonNull List<GuidedAction> actions,
-                    Bundle savedInstanceState) {
-                final Context context = getActivity();
-                actions.add(new GuidedAction.Builder(context)
-                        .clickAction(GuidedAction.ACTION_ID_OK).build());
-                actions.add(new GuidedAction.Builder(context)
-                        .clickAction(GuidedAction.ACTION_ID_CANCEL).build());
-            }
-
-            @Override
-            public void onGuidedActionClicked(GuidedAction action) {
-                if (action.getId() == GuidedAction.ACTION_ID_OK) {
-                    final ComponentName component = getArguments().getParcelable(ARG_COMPONENT);
-                    AccessibilityUtils.setAccessibilityServiceState(getActivity(),
-                            component, getArguments().getBoolean(ARG_ENABLING));
-                    getFragmentManager().popBackStack();
-                } else if (action.getId() == GuidedAction.ACTION_ID_CANCEL) {
-                    getFragmentManager().popBackStack();
-                } else {
-                    super.onGuidedActionClicked(action);
-                }
-            }
-        }
-    }
-}
diff --git a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
index 684e564..808c3d0 100644
--- a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
@@ -25,6 +25,7 @@
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TtsEngines;
 import android.speech.tts.UtteranceProgressListener;
+import android.support.annotation.Keep;
 import android.support.v17.preference.LeanbackPreferenceFragment;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
@@ -43,6 +44,10 @@
 import java.util.Objects;
 import java.util.Set;
 
+/**
+ * Fragment for TextToSpeech settings
+ */
+@Keep
 public class TextToSpeechFragment extends LeanbackPreferenceFragment  implements
         Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
         TtsEnginePreference.RadioButtonGroupState {