diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
index 96ddeb3..32d6378 100644
--- a/res/layout/manage_applications_content.xml
+++ b/res/layout/manage_applications_content.xml
@@ -35,7 +35,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:textAppearance="@style/TextAppearance.PagerTabs">
+                android:textAppearance="@style/TextAppearance.PagerTabs"
+                android:paddingLeft="@dimen/pager_tabs_padding"
+                android:paddingRight="@dimen/pager_tabs_padding">
         </android.support.v4.view.PagerTabStrip>
     </android.support.v4.view.ViewPager>
 
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2b4f397..f8d1cb3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1307,7 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Toeganklikheid-kortpad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Druk en hou die aan/af-skakelaar en raak en hou dan met twee vingers"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Af"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wanneer hierdie kenmerk aangeskakel is, kan jy toeganklikheidskenmerke vinnig met twee stappe aktiveer:"\n\n"Stap 1: Druk en hou die kragknoppie totdat jy \'n geluid hoor of \'n trilling voel."\n\n"Stap 2: Raak en hou twee vingers totdat jy oudiobevestiging hoor."\n\n"As die toestel verskeie gebruikers het, sal hierdie kortpad op die sluitskerm tydelik toegang bied totdat die toestel ontsluit is."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wanneer hierdie kenmerk aangeskakel is, kan jy toeganklikheidskenmerke vinnig met twee stappe aktiveer:"\n\n"Stap 1: Druk en hou die kragknoppie totdat jy \'n geluid hoor of \'n vibrasie voel."\n\n"Stap 2: Raak en hou met twee vingers totdat jy oudiobevestiging hoor."\n\n"As die toestel verskeie gebruikers het, sal hierdie kortpad op die sluitskerm tydelik toegang bied totdat die toestel ontsluit is."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Groot teks"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skermvergroting"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Dateer outomaties skermvergroting op"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2eac79e..4154591 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"اختصارات تسهيل الدخول"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"اضغط مع الاستمرار على التشغيل، ثم المس مع الاستمرار بإصبعين"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"إيقاف"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"عندما يتم تشغيل هذه الميزة، يمكنك بسرعة تمكين ميزات إمكانية الدخول بخطوتين:"\n\n"الخطوة الأولى: اضغط مع الاستمرار على زر التشغيل إلى أن تسمع صوتًا أو تشعر باهتزاز."\n\n"الخطوة الثانية: المس مع الاستمرار إصبعين إلى أن تسمع تأكيدًا صوتيًا."\n\n"إذا كان الجهاز لديه مستخدمون متعددون، فإن استخدام هذا الاختصار على شاشة القفل سيؤدي مؤقتًا إلى تمكين إمكانية الدخول إلى أن يتم إلغاء قفل الجهاز."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"نص كبير"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"تكبير الشاشة"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"التحديث التلقائي لتكبير الشاشة"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index aabae50..31f057d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1303,15 +1303,12 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налады спецыяльных магчымасцей"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Сістэма"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жэсты павелiчэння"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Калi гэта функцыя ўключана, можна наблiжаць i аддаляць, тройчы нацiснуўшы на экран."\n\n"Наблiзiйшы, можна:"\n<ul><li>"Панарама: працягнiце два цi больш пальцаў па экране."</li>\n<li>"Дадаць узровень наблiжэння: звядзiце пальцы або развядзiце ў розныя бакi."</li></ul>\n\n"Таксама можна часова павялiчыць тое, што пад пальцам, тройчы нацiснуўшы i ўтрымлiваючы. У павялiчаным стане можна працягнуць палец, каб адкрыць iншыя часткi экрана. Паднiмiце палец, каб вярнуцца да папярэдняга."\n\n"Майце на ўвазе: патройнае нацiсканне працуе паўсюль, акрамя клавiятуры i панэлi навiгацыi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Цэтлiк даступнасцi"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Націсніце і ўтрымлівайце кнопку сiлкавання, а затым націсніце і ўтрымлівайце двума пальцамі"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Адключана"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Калі гэта функцыя ўключана, вы можаце хутка ўключыць функцыі доступу ў два крокі:"\n\n".Крок 1: Націсніце і ўтрымлівайце кнопку сілкавання, пакуль не пачуеце гук ці не адчуце вібрацыю."\n\n"Крок 2: Дакраніцеся да экрану двума пальцамі і ўтрымлівайце іх, пакуль не пачуеце гук пацверджання."\n\n"Калі прылада мае некалькіх карыстальнікаў, скарыстайцеся гэтым цэтлiкам на экране блакіроўкi, каб часова дазволіць доступ, пакуль прылада не будзе разблакіравана."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Вялікі шрыфт"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Павелiчэнне экрану"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аўтаматычнае абнаўленне павелiчэння экрана"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 291c081..59513cb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пряк път към ф-ята за достъпност"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Натиснете и задръжте бутона за захранване, а после докоснете и задръжте 2 пръста"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Изкл."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Когато тази функция е включена, можете бързо да активирате тези за достъпността в две стъпки:"\n\n"Стъпка 1: Натиснете и задръжте бутона за захранване, докато чуете звук или усетите вибриране."\n\n"Стъпка 2: Докоснете и задръжте два пръста, докато чуете звуково потвърждение."\n\n"Ако устройството има няколко потребители, използването на този пряк път върху заключения екран временно активира функциите за достъпност, докато устройството се отключи."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Голям текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ниво на мащаба на екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ниво на мащаба на екрана: Автоакт."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 13550a7..6d73bf5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1307,7 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Drecera d\'accessibilitat"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Mantén premut el botó d\'encesa i mantén dos dits premuts"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactiva"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quan aquesta funció està activada, pots activar ràpidament les funcions d\'accessibilitat en dos passos."\n\n"Pas 1: mantén premut el botó d\'encesa fins que no sentis un so o notis una vibració."\n\n"Pas 2: mantén premut amb dos dits fins que no sentis una confirmació d\'àudio."\n\n"Si el dispositiu té diversos usuaris, fer servir aquesta drecera a la pantalla de bloqueig activa temporalment l\'accessibilitat fins que no es desbloqueja el dispositiu."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quan aquesta funció està activada, pots activar ràpidament les funcions d\'accessibilitat en dos passos."\n\n"Pas 1: mantén premut el botó d\'encesa fins que sentis un so o notis una vibració."\n\n"Pas 2: mantén premut amb dos dits fins que sentis una confirmació d\'àudio."\n\n"Si el dispositiu té diversos usuaris, fer servir aquesta drecera a la pantalla de bloqueig activa temporalment l\'accessibilitat fins que es desbloqueja el dispositiu."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text gran"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliació de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualitza ampliació automàticament"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b532de2..6029d0d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1302,10 +1302,8 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ρυθμίσεις προσβασιμότητας"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Υπηρεσίες"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Σύστημα"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Κινήσεις μεγέθυνσης"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Όταν είναι ενεργοποιημένη αυτή η λειτουργία, μπορείτε να κάνετε μεγέθυνση και σμίκρυνση πατώντας τρεις φορές την οθόνη."\n\n"Κατά τη μεγέθυνση, μπορείτε να κάνετε:"\n<ul><li>"Πανοραμική λήψη: σύρετε δύο ή περισσότερα δάχτυλα κατά μήκος της οθόνης."</li>\n<li>"Προσαρμογή του επιπέδου μεγέθυνσης: πλησιάστε δύο ή περισσότερα δάχτυλα ή απομακρύνετέ τα."</li></ul>\n\n"Μπορείτε επίσης να μεγεθύνετε προσωρινά το περιεχόμενο που βρίσκεται κάτω από το δάχτυλό σας πατώντας τρεις φορές και κρατώντας παρατεταμένα. Κατά τη μεγέθυνση, μπορείτε να σύρετε το δάχτυλό σας για να εξερευνήσετε διάφορα τμήματα της οθόνης. Σηκώστε το δάχτυλό σας για να επιστρέψετε στην προηγούμενη κατάσταση."\n\n"Σημείωση: το πάτημα τρεις φορές για μεγέθυνση λειτουργεί παντού εκτός από το πληκτρολόγιο και τη γραμμή πλοήγησης."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Συντόμευση προσβασιμότητας"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Κρατ. πατημ. το κουμπί λειτ.και αγγίξτε παρατ.με δύο δάχτυλα"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Απενεργοποίηση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4834605..b8aa1d6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -612,7 +612,7 @@
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVERTENCIA: Tu tableta no podrá verificar si el software está actualizado."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVERTENCIA: Tu dispositivo no podrá verificar si el software está actualizado."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"La tableta no se ha podido conectar a esta red Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El teléfono no se ha podido conectar a esta red Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El dispositivo no se ha podido conectar a esta red Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avanzada"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar el rango de frecuencia de la operación"</string>
@@ -722,7 +722,7 @@
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Cualquiera de las dos opciones"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando esté conectado"</string>
-    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Apagado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar qué sucede cuando el dispositivo está conectado o inactivo, activa el modo de suspensión."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Cuándo activar el modo de suspensión"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Activar modo de suspensión ahora"</string>
@@ -1302,14 +1302,12 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliación"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Cuando esta función está activada, puedes acercar y alejar la imagen con solo tocar tres veces la pantalla."\n\n"A continuación se indican las acciones que puedes hacer con la imagen acercada."\n<ul><li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"También puedes ampliar el contenido seleccionado de forma temporal con solo tocar la pantalla tres veces y mantenerla pulsada. Con el contenido ampliado, puedes arrastrar el dedo para explorar diferentes partes de la pantalla. Levanta el dedo para volver al estado anterior."\n\n"Nota: puedes tocar tres veces la pantalla para ampliar el contenido en cualquier parte, excepto en el teclado y en la barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a la accesibilidad"</string>
-    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Mantén presionado el botón de encendido, luego toca y mantén presionada el área con dos dedos."</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Mantén presionado el botón de encendido, luego mantén presionada el área con dos dedos."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes habilitar las funciones de accesibilidad rápidamente en dos pasos."\n\n"Paso 1: mantén presionado el botón de encendido hasta que oigas un sonido o notes una vibración."\n\n"Paso 2: mantén la pantalla presionada con dos dedos hasta que oigas una confirmación."\n\n"Si el dispositivo tiene varios usuarios, este acceso directo en la pantalla de bloqueo permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes activar las funciones de accesibilidad rápidamente en dos pasos."\n\n"Paso 1: mantén presionado el botón de encendido hasta que oigas un sonido o notes una vibración."\n\n"Paso 2: mantén la pantalla presionada con dos dedos hasta que oigas una confirmación."\n\n"Si el dispositivo tiene varios usuarios, este acceso directo en la pantalla de bloqueo permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar automáticamente la ampliación de pantalla"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b02bedb..a9ee624 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1303,12 +1303,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Teenused"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Süsteem"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Suurendamisliigutused"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kui see funktsioon on sisse lülitatud, saate suurendada ja vähendada, puudutades kolm korda ekraani."\n\n"Suurendatult saab teha järgmist."\n<ul><li>"Paanida: lohistage kahe või enama sõrmega üle ekraani."</li>\n<li>"Korrigeerida suumitaset: liigutage kahte või enamat sõrme kokku või lahku."</li></ul>\n\n"Saate ka ajutiselt suurendada sõrme all olevat kujutist, puudutades kolm korda ekraani ja hoides sõrme ekraanil. Selles suurendatud olekus saate sõrme ekraanil lohistada, et vaadata kuva erinevaid osi. Eelmisesse olekusse naasmiseks tõstke sõrm ekraanilt."\n\n"Märkus: kolm korda puudutamine suurendamiseks toimib kõikjal, v.a klaviatuur ja navigeerimisriba."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kui see funktsioon on sisse lülitatud, saate suurendada ja vähendada, kolmikpuudutades ekraani."\n\n"Suurendatult saab teha järgmist."\n<ul><li>"Paanida: lohistage kahe või enama sõrmega üle ekraani."</li>\n<li>"Korrigeerida suumitaset: liigutage kahte või enamat sõrme kokku või lahku."</li></ul>\n\n"Saate ka ajutiselt suurendada sõrme all olevat kujutist, kolmikpuudutades ekraani ja hoides sõrme ekraanil. Selles suurendatud olekus saate sõrme ekraanil lohistada, et vaadata kuva erinevaid osi. Eelmisesse olekusse naasmiseks tõstke sõrm ekraanilt."\n\n"Märkus: kolmikpuudutamine suurendamiseks toimib kõikjal, v.a klaviatuur ja navigeerimisriba."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hõlbustuse otsetee"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Vajutage, hoidke toitenuppu, puud. ja hoidke kaht sõrme all"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Välja"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kui see funktsioon sisse lülitatud, saate kiiresti lubada juurdepääsetavuse funktsiooni kahe sammuga:"\n\n"1. samm: vajutage ja hoidke all toitenuppu, kuni kuulete heli või tunnete vibratsiooni."\n\n"2. samm: puudutage ja hoidke kahe sõrmega, kuni kuulete helikinnitust."\n\n"Kui seadmel on mitu kasutajat, kasutage lukustusekraanil seda otseteed, et ajutiselt lubada juurdepääs seadme avamiseni."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suur tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekraanisuurendus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekraanisuurenduse värskendus"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d1e24ce..c7d981e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Pression prolongée sur Marche/Arrêt, puis avec deux doigts"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Désactivé"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Lorsque cette fonctionnalité est activée, vous pouvez rapidement activer les fonctionnalités d\'accessibilité en deux étapes :"\n\n"Étape 1 : Appuyez de manière prolongée sur le bouton Marche/Arrêt jusqu\'à ce que le téléphone sonne ou vibre."\n\n"Étape 2 : Appuyez de manière prolongée avec deux doigts jusqu\'à ce que vous entendiez la confirmation audio."\n\n"Si l\'appareil est utilisé par plusieurs personnes, l’utilisation de ce raccourci sur l\'écran de verrouillage active l\'accessibilité de manière temporaire jusqu\'au déverrouillage de l\'appareil."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Grands caractères"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 74e8170..38d3012 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"पहुंच-योग्यता शॉर्टकट"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"पावर को दबाकर रखें, फिर दो अंगुलियों से स्पर्श करके रखें"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"बंद"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"यह सुविधा चालू होने पर आप पहुंच-योग्यता सुविधाओं को दो चरणों में तेज़ी से सक्षम कर सकते हैं:"\n\n"चरण 1: पावर बटन को तब तक दबाए रखें जब तक आपको ध्वनि न सुनाई दे या कंपन महसूस न हो."\n\n"चरण 2: दो अंगुलियों से तब तक स्पर्श करके रखें जब तक आपको ऑडियो पुष्टिकरण न सुनाई दे."\n\n"यदि उपकरण के एक से अधिक उपयोगकर्ता हैं, तो लॉक स्क्रीन पर इस शॉर्टकट का उपयोग करने से पहुंच-योग्यता तब तक के लिए अस्थायी रूप से सक्षम हो जाती है जब तक कि उपकरण अनलॉक न किया जाए."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"बड़ा पाठ"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"स्क्रीन आवर्धन"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन आवर्धन को स्वतः अपडेट करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9adb60d..cac7f6b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečac pristupačnosti"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Prit. i držite tipku uklj. pa dodirnite i držite s dva prsta"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Isključeno"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kada je ova značajka uključena, možete brzo omogućiti značajke pristupačnosti u dva koraka:"\n\n"1. korak: pritisnite i držite gumb za uključivanje/isključivanje dok ne začujete zvuk ili osjetite vibraciju."\n\n"2. korak: dodirnite i držite s dva prsta dok ne začujete zvučnu potvrdu."\n\n"Ako uređaj ima više korisnika, ovaj prečac na zaključanom zaslonu omogućuje pristupačnost dok se uređaj ne otključa."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliki tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Uvećanje zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Autom. ažuriranje uvećanja zaslona"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index da090b7..60daa9e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan aksesibilitas"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Tekan dan tahan daya, lalu sentuh dan tahan dua jari"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Mati"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Jika fitur ini diaktifkan, Anda dapat mengaktifkan fitur aksesibilitas dengan cepat dalam dua langkah:"\n\n"Langkah 1: Tekan terus tombol daya sampai terdengar suara atau terasa getaran."\n\n"Langkah 2: Sentuh dan tahan dua jari sampai terdengar konfirmasi audio."\n\n"Jika perangkat memiliki beberapa pengguna, pintasan pada layar kunci ini dapat digunakan untuk mengaktifkan aksesibilitas sementara sampai perangkat terbuka kuncinya."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Perbarui otomatis pembesaran layar"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 897f2d9..3dcdedb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1309,8 +1309,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ユーザー補助のショートカット"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"電源ボタンを押し続け、次に2本の指でタップして押し続ける"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"OFF"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"この機能を有効にすると、次の2つのステップでユーザー補助機能をすぐに有効にできます:"\n\n"ステップ1: 音が鳴るか振動するまで電源ボタンを押し続けます。"\n\n"ステップ2: 確認音が鳴るまで2本の指でタップして押し続けます。"\n\n"複数のユーザーでこの端末を使用している場合は、ロック画面でこのショートカットを使用すると、端末がロック解除されるまでユーザー補助機能が一時的に有効になります。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大きい文字サイズ"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"画面の拡大"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"画面の拡大を自動更新"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 238dd56..d3b4396 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"접근성 단축키"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"전원을 길게 누르고 두 손가락으로 길게 터치합니다."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"사용 안함"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"이 기능을 사용하면 다음 두 단계를 통해 접근성 기능을 빠르게 사용하도록 설정할 수 있습니다."\n\n"1단계: 소리가 나거나 진동이 느껴질 때까지 전원 버튼을 길게 누릅니다."\n\n"2단계: 확인음이 들릴 때까지 두 손가락으로 길게 터치합니다."\n\n"기기를 여러 사용자가 사용하는 경우 잠금 화면에 있는 바로가기를 사용하여 기기가 잠길 때까지 임시적으로 접근성 기능을 사용하도록 설정할 수 있습니다."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"큰 텍스트"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"화면 확대"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"화면 확대 자동 업데이트"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 55306fe..e3b6407 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pieejamības saīsne"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Nosp. un turiet bar. p.; piesk. un turiet divus pirkstus."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izslēgta"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ja šī funkcija ir ieslēgta, varat ātri iespējot pieejamības funkcijas, veicot divas darbības."\n\n"1. darbība: nospiediet barošanas pogu un turiet to, līdz izdzirdat kādu skaņu vai sajūtat vibrāciju."\n\n"2. darbība: pieskarieties ar diviem pirkstiem un uzgaidiet, līdz izdzirdat audio apstiprinājumu."\n\n"Ja ierīcei ir vairāki lietotāji, izmantojot šo saīsni bloķēšanas ekrānā, varat uz laiku iespējot pieejamību līdz ierīces atbloķēšanai."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Liels teksts"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekrāna palielinājums"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekrāna palielinājuma autom. atjaun."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 83ed842..603a03b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Untuk mengawal apa yang berlaku semasa telefon didok dan/atau tidur, hidupkan Mod Tidur."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Bila masa untuk tidur"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Tidur sekarang"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Tetapan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Saiz fon"</string>
@@ -1303,15 +1302,12 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tetapan kebolehaksesan"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Perkhidmatan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gerak isyarat pembesaran"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Apabila ciri ini dihidupkan, anda boleh mengezum masuk dan keluar dengan mengetik skrin tiga kali."\n\n"Semasa dizum masuk, anda boleh:"\n<ul><li>"Menyorot: Seret menggunakan dua atau lebih jari merentasi skrin."</li>\n<li>"Melaraskan tahap zum: Rapatkan atau jarakkan dua atau lebih jari."</li></ul>\n\n"Anda juga boleh membesarkan item di bawah jari anda untuk sementara waktu dengan mengetik tiga kali dan menahannya. Dalam keadaan zum besar ini, anda boleh menyeret jari anda untuk meneroka bahagian-bahagian lain pada skrin. Angkat jari anda untuk kembali kepada keadaan sebelumnya."\n\n"Nota: Ketik tiga kali untuk pembesaran berfungsi di semua tempat kecuali pada papan kekunci dan bar navigasi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan kebolehcapaian"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Tekan dan tahan kuasa, kemudian sentuh dan tahan dgn dua jari"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Matikan"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Apabila ciri ini dihidupkan, anda boleh mendayakan ciri kebolehaksesan dengan cepat dalam dua langkah:"\n\n"Langkah 1: Tekan dan tahan butang kuasa sehingga anda mendengar bunyi atau merasai getaran."\n\n"Langkah 2: Sentuh terus menggunakan dua jari sehingga anda mendengar pengesahan audio."\n\n"Jika peranti digunakan oleh beberapa orang pengguna, menggunakan pintasan ini pada skrin kunci akan mendayakan kebolehaksesan untuk sementara waktu sehingga peranti dibuka kuncinya."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran skrin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto kemas kini pembesaran skrin"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d2e9c6b..c498071 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1303,10 +1303,10 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usługi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesty powiększenia"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kiedy ta funkcja jest włączona, możesz powiększyć i pomniejszyć obraz, trzykrotnie klikając ekran."\n\n"W trybie powiększenia możesz:"\n<ul><li>"Przesuwać: przeciągnij palcami po ekranie."</li>\n<li>"Wyregulować powiększenie: ściągnij lub rozsuń palce."</li></ul>\n\n"Możesz też tymczasowo powiększyć miejsce pod palcem, klikając trzykrotnie i przytrzymując palec na ekranie. W takim widoku „lupy” możesz przesuwać palcem po ekranie i powiększać różne miejsca. Podniesienie palca spowoduje powrót do poprzedniego widoku."\n\n"Uwaga: trzykrotnie kliknięcie powiększające działa wszędzie poza klawiaturą i paskiem nawigacji."</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesty powiększania"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kiedy ta funkcja jest włączona, możesz powiększyć i pomniejszyć obraz, trzykrotnie klikając ekran."\n\n"W trybie powiększenia możesz:"\n<ul><li>"Przesuwać: przeciągnij palcami po ekranie."</li>\n<li>"Regulować powiększenie: ściągnij lub rozsuń palce."</li></ul>\n\n"Możesz też tymczasowo powiększyć miejsce pod palcem, klikając trzykrotnie i przytrzymując palec na ekranie. W takim widoku „lupy” możesz przesuwać palcem po ekranie i powiększać różne miejsca. Podniesienie palca spowoduje powrót do poprzedniego widoku."\n\n"Uwaga: trzykrotne kliknięcie powiększające działa wszędzie poza klawiaturą i paskiem nawigacji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
-    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Naciśnij i przytrzymaj zasilanie, potem dotknij i przytrzymaj dwoma palcami"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Naciśnij i przytrzymaj włącznik, potem dotknij i przytrzymaj 2 palcami"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Wył."</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kiedy ta funkcja jest aktywna, możesz szybko włączyć ułatwienia dostępu w dwóch krokach:"\n\n"Krok 1: naciśnij i przytrzymaj przycisk zasilania, aż usłyszysz sygnał lub poczujesz wibracje."\n\n"Krok 2: naciśnij i przytrzymaj ekran dwoma palcami, aż usłyszysz potwierdzenie dźwiękowe."\n\n"Jeśli z tego urządzenia korzysta kilka osób, użycie tego skrótu na zablokowanym ekranie spowoduje tymczasowe włączenie ułatwień dostępu do momentu zablokowania urządzenia."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Duży tekst"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 129db6a..33ab1c0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Segure o botão liga/desliga, toque e segure com dois dedos"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desativado"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando este recurso está ativado, você pode ativar rapidamente os recursos de acessibilidade em duas etapas:"\n\n"Etapa 1: pressione e segure o botão liga/desliga até ouvir um som ou sentir uma vibração."\n\n"Etapa 2: toque e segure com dois dedos até ouvir a confirmação de áudio."\n\n"Caso o dispositivo tenha vários usuários, este atalho na tela de bloqueio pode ativar temporariamente a acessibilidade até que o dispositivo seja desbloqueado."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4376b4e..3812777 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1304,12 +1304,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicii"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesturi pentru mărire"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"După activarea acestei funcţii, puteţi mări şi micşora atingând de trei ori ecranul."\n\n"În timp ce măriţi, puteţi:"\n<ul><li>"să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"</li>\n<li>"să ajustaţi nivelul de zoom: ciupiţi sau extindeţi cu două sau mai multe degete."</li></ul>\n\n"De asemenea, puteţi să măriţi temporar ce se află sub degetul dvs. atingând ecranul de trei ori şi menţinând degetul pe ecran. În această stare mărită, puteţi să glisaţi degetul pentru a explora diferite părţi ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară."\n\n"Notă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii şi a barei de navigare."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"După activarea acestei funcţii, puteţi mări şi micşora atingând de trei ori ecranul."\n\n"În timp ce măriţi, puteţi:"\n<ul><li>"să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"</li>\n<li>"să ajustaţi nivelul de zoom: ciupiţi cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriţi temporar ce se află sub degetul dvs. atingând ecranul de trei ori şi menţinând degetul pe ecran. În această stare mărită, puteţi să glisaţi degetul pentru a explora diferite părţi ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară."\n\n"Notă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii şi a barei de navigare."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă accesibilitate"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Apăsaţi lung butonul de pornire. Atingeţi lung cu 2 degete."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activaţi rapid funcţiile de accesibilitate în doi paşi:"\n\n"Pasul 1: apăsaţi şi menţineţi apăsat butonul de pornire până când auziţi un sunet sau simţiţi o vibraţie."\n\n"Pasul 2: atingeţi ecranul cu două degete şi menţineţi degetele pe ecran până când auziţi o confirmare audio."\n\n"Dacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text mare"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizaţi auto. mărirea ecranului"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 12af5ed..ab08694 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1302,15 +1302,12 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки специальных возможностей"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жесты для увеличения"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Эта функция позволяет увеличивать и уменьшать изображение, трижды нажав на экран."\n\n"При увеличенном масштабе можно:"\n<ul><li>"панорамировать – проведите пальцами по экрану;"</li>\n<li>"изменять масштаб – сведите или разведите пальцы."</li></ul>\n\n"Чтобы временно увеличить изображение под пальцем, трижды нажмите на экран и удерживайте его. Проведя пальцем, вы можете посмотреть на другие области экрана. Чтобы вернуть экран в прежнее состояние, уберите палец."\n\n"Примечание. Тройным нажатием увеличиваются все области, кроме клавиатуры и панели навигации."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Быстрое включение"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Нажмите и удерживайте кнопку питания, а затем нажмите на экран двумя пальцами и удерживайте их"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ВЫКЛ"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Вы сможете быстро включать специальные возможности. Вот как это сделать."\n\n"1. Нажмите кнопку питания и удерживайте ее, пока не раздастся звуковой сигнал или вибросигнал."\n\n"2. Нажмите на экран двумя пальцами и не отпускайте их, пока не услышите сообщение о том, что команда выполнена."\n\n"Если устройством пользуется несколько человек, специальные возможности будут включены до тех пор, пока устройство не будет разблокировано или не будет выбран другой пользователь."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Крупный текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Сохранять масштаб"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b96effe..d444b2a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skratka zjednodušeného ovládania"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Podrž. tlač. zapnutia, potom sa dotk. dvoma prst. a podržte"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vypnuté"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ak je táto funkcia zapnutá, môžete rýchlo v dvoch krokoch povoliť funkcie zjednodušenia ovládania:"\n\n"Krok 1: Stlačte tlačidlo zapnutia a podržte ho, dokým nezaznie zvukový signál alebo nezacítite vibrácie."\n\n"Krok 2: Dotknite sa obrazovky dvoma prstami a podržte ju, dokým nezaznie zvuk potvrdenia."\n\n"Ak má zariadenie viacero používateľov, pomocou tejto skratky je možné na uzamknutej obrazovke dočasne povoliť zjednodušenie ovládania, dokým sa zariadenie neodomkne."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veľké písmo"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Priblíženie obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto. aktualiz. priblíž. obrazovky"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f1236b7..1561426 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1303,11 +1303,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Storitve"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Poteze za povečavo"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Če je ta funkcija vklopljena, lahko povečate ali pomanjšate tako, da se trikrat dotaknete zaslona."\n\n"Pri povečavi lahko:"\n<ul><li>"Pomikate vsebino na zaslonu: Dva prsta ali več povlecite po zaslonu."</li>\n<li>"Prilagodite stopnjo povečave/pomanjšave: Najmanj dva prsta približajte ali povlecite narazen."</li></ul>\n\n"Začasno lahko tisto, kar je pod vašim prstom, povečate tudi tako, da se zaslona trikrat dotaknete in ga pridržite. V tem načinu povečave lahko povlečete s prstom in raziščete različne dele zaslona. Dvignite prst, če se želite vrniti v prejšnje stanje."\n\n"Opomba: Trojni dotik za povečavo deluje povsod, razen pri tipkovnici in v vrstici za krmarjenje"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Če je ta funkcija vklopljena, lahko vsebino na zaslonu povečate ali pomanjšate tako, da se trikrat dotaknete zaslona."\n\n"Pri povečavi lahko:"\n<ul><li>"Pomikate vsebino na zaslonu: Dva prsta ali več povlecite po zaslonu."</li>\n<li>"Prilagodite stopnjo povečave/pomanjšave: Najmanj dva prsta približajte ali razširite."</li></ul>\n\n"Začasno lahko tisto, kar je pod vašim prstom, povečate tudi tako, da se zaslona trikrat dotaknete in ga pridržite. V tem načinu povečave lahko povlečete s prstom in raziščete različne dele zaslona. Dvignite prst, če se želite vrniti v prejšnje stanje."\n\n"Opomba: Trojni dotik za povečavo deluje povsod, razen pri tipkovnici in v vrstici za krmarjenje"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bližnj. prip. za ljudi s pos. pot."</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Pridržite gumb za napajanje, nato še dva prsta na zaslonu"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izklopljeno"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Če je ta funkcija vklopljena, lahko v dveh korakih hitro omogočite funkcije za ljudi s posebnimi potrebami:"\n\n"1. korak: Pritisnite in pridržite gumb za vklop, dokler ne zaslišite zvoka ali začutite vibracije."\n\n"2. korak: Dotaknite se in držite dva prsta, dokler ne zaslišite zvočne potrditve."\n\n"Če napravo uporablja več uporabnikov, z uporabo te bližnjice na zaslonu za zaklepanje začasno omogočite funkcije za ljudi s posebnimi potrebami, dokler naprave ne odklenete."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Če je ta funkcija vklopljena, lahko v dveh korakih hitro omogočite funkcije za ljudi s posebnimi potrebami:"\n\n"1. korak: Pritisnite in pridržite gumb za vklop, dokler ne zaslišite zvoka ali začutite vibracije."\n\n"2. korak: Dotaknite se zaslona z dvema prstoma in pridržite, dokler ne zaslišite zvočne potrditve."\n\n"Če napravo uporablja več uporabnikov, z uporabo te bližnjice na zaslonu za zaklepanje začasno omogočite funkcije za ljudi s posebnimi potrebami, dokler naprave ne odklenete."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliko besedilo"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Povečava zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Samodejno posodobi povečavo zaslona"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2f320a9..7db5bd3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пречица за приступачност"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Притисните и задржите напајање, па додирните и задржите са два прста"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Искључено"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Када је ова функција укључена, функције приступачности можете брзо да омогућите у два корака:"\n\n"1. корак: Притисните и задржите дугме за напајање док не чујете звук или осетите вибрацију."\n\n"2. корак: Додирните и задржите са два прста док не чујете звучну потврду."\n\n"Ако постоји више корисника уређаја, помоћу ове пречице на закључавању екрана можете привремено да омогућите приступачност док је уређај откључан."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Велики текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Увеличавање екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аутоматски ажурирај увелич. екрана"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index aeeec7c..ee8c5ec 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1295,11 +1295,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Huduma"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Mfumo"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Ishara za ukuzaji"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza karibu na kufifiza kwa kugonga skrini mara tatu."\n\n"Unapokuwa umekuza karibu, unaweza:"\n<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole viwili au zaidi pamoja au visambaze mbalimbali."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali."\n\n"Dokezo: Mgongo wa mara tatu wa ukuzaji unafanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kuabiri."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza na kufifiza kwa kugonga skrini mara tatu."\n\n"Unapokuwa umekuza, unaweza:"\n<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole mbiwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali."\n\n"Dokezo: Mgongo wa mara tatu wa ukuzaji unafanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kuabiri."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikivu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Bonyeza na ushikilie kitufe cha kuwasha, kisha uguse na kushikilia kwa vidole viwili"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Imezimwa"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kipengele hiki kinapowashwa, unaweza kuwezesha haraka vipengele vya ufikivu kwa hatua mbili:"\n\n"Hatua ya 1: Bonyeza na ushikilie kitufe cha kawi mpaka utakaposikia sauti au kuhisi mtetemo."\n\n"Hatua ya 2: Gusa na ushikilie vidole viwili mpaka utakaposikia uthibitishaji wa sauti."\n\n"Ikiwa kifaa kina watumiaji wengi, kuutumia mkato huu kwenye skrini ya kufunga kunawezesha ufikivu kwa muda mpaka kifaa kitakapofunguliwa."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kipengele hiki kinapowashwa, unaweza kuwezesha haraka vipengele vya ufikivu kwa hatua mbili:"\n\n"Hatua ya 1: Bonyeza na ushikilie kitufe cha kuwasha/kuzima mpaka utakaposikia sauti au kuhisi mtetemo."\n\n"Hatua ya 2: Gusa na ushikilie vidole viwili mpaka utakaposikia uthibitishaji wa sauti."\n\n"Ikiwa kifaa kina watumiaji wengi, kuutumia mkato huu kwenye skrini ya kufunga kunawezesha ufikivu kwa muda mpaka kifaa kitakapofunguliwa."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Maandishi makubwa"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ukuzaji wa skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Sasisha otomatiki ukuzaji wa skrini"</string>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
new file mode 100644
index 0000000..5a58609
--- /dev/null
+++ b/res/values-sw720dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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>
+    <dimen name="pager_tabs_padding">@*android:dimen/preference_fragment_padding_side</dimen>
+</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b7c204c..34ace50 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -607,7 +607,7 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"ยกเลิก"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"ข้ามไปเลย"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"ไม่ข้าม"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ"\n\n"การตั้งค่าแท็บเล็ตอาจต้องใช้กิจกรรมเครือข่ายที่ใ้ช้ปริมาณข้อมูลสูง"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ"\n\n"การตั้งค่าแท็บเล็ตอาจต้องใช้กิจกรรมเครือข่ายที่ใช้ปริมาณข้อมูลสูง"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ"\n\n"การตั้งค่าโทรศัพท์อาจต้องใช้กิจกรรมเครือข่ายที่ใ้ช้ปริมาณข้อมูลสูง"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"คำเตือน: แท็บเล็ตจะไม่สามารถยืนยันว่าซอฟต์แวร์ของคุณเป็นรุ่นปัจจุบัน"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"คำเตือน: โทรศัพท์จะไม่สามารถยืนยันว่าซอฟต์แวร์ของคุณเป็นรุ่นปัจจุบัน"</string>
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ทางลัดสำหรับการเข้าถึง"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"กดปุ่มเปิด/ปิดค้างไว้ จากนั้นใช้สองนิ้วแตะค้าง"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ปิด"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"เมื่อเปิดคุณลักษณะนี้ไว้ คุณจะสามารถเปิดใช้งานคุณลักษณะการเข้าถึงได้อย่างรวดเร็วในสองขั้นตอน:"\n\n"ขั้นตอนที่ 1: กดปุ่มเปิด/ปิดค้างไว้จนกว่าจะได้ยินเสียงหรือรู้สึกว่าอุปกรณ์สั่น"\n\n"ขั้นตอนที่ 2: ใช้สองนิ้วแตะค้างไว้จนกว่าจะได้ยินเสียงยืนยัน"\n\n"หากมีผู้ใช้อุปกรณ์หลายคน การใช้ทางลัดนี้ในหน้าจอล็อกจะเป็นการเปิดใช้งานการเข้าถึงชั่วคราวจนกว่าจะปลดล็อกอุปกรณ์"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"ข้อความขนาดใหญ่"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"การขยายหน้าจอ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"อัปเดตการขยายหน้าจอโดยอัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 58214cd..88d78ec 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shortcut sa pagiging naa-access"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Pindutin nang matagal ang power, pindutin nang matagal gamit dalawang daliri"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"I-off"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kapag naka-on ang tampok na ito, mabilis mong mapapagana ang mga tampok ng accessibility sa dalawang hakbang:"\n\n"Hakbang 1: Pindutin nang matagal ang power button hanggang sa may marinig kang tunog o maramdamang vibration."\n\n"Hakbang 2: Pindutin nang matagal gamit ang dalawang daliri hanggang sa makarinig ka ng kumpirmasyong audio."\n\n"Kung marami ang user ng device, pansamantalang pinapagana ng paggamit sa shortcut na ito sa lock screen ang accessibility hanggang sa ma-unlock ang device."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Malaking teksto"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"I-auto update pag-magnify ng screen"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1696545..27f361a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1303,7 +1303,7 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Hizmetler"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Büyüteç hareketleri"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe vurarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz."\n\n"Yakınlaştırdığınızda şunları yapabilirsiniz"\n<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Zum düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın."\n\n"Not: Üç kez hafifçe vurarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe vurarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz."\n\n"Yakınlaştırdığınızda şunları yapabilirsiniz"\n<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın."\n\n"Not: Üç kez hafifçe vurarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Güç düğmesini basılı tutun, sonra iki parmağınızla dokunup bekleyin"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Kapalı"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c41d685..6f11870 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1303,12 +1303,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dịch vụ"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Hệ thống"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Thao tác thu phóng"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Khi tính năng này được bật, bạn có thể phóng to và thu nhỏ bằng cách nhấn ba lần vào màn hình."\n\n"Trong khi phóng to, bạn có thể:"\n<ul><li>"Xoay: Kéo hai hoặc nhiều ngón tay qua màn hình."</li>\n<li>"Điều chỉnh mức thu phóng: Chụm hai hoặc nhiều ngón tay với nhau hoặc tách chúng ra."</li></ul>\n\n"Bạn cũng có thể tạm thời thu phóng các mục bên dưới ngón tay bạn bằng cách nhấn ba lần và giữ. Ở trạng thái thu phóng này, bạn có thể kéo ngón tay để khám phá các phần khác nhau của màn hình. Thả ngón tay để trở về trạng thái trước."\n\n"Lưu ý: Nhấn ba lần để thu phóng toàn bộ trừ bàn phím và thanh điều hướng."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Khi tính năng này được bật, bạn có thể phóng to và thu nhỏ bằng cách chạm ba lần vào màn hình."\n\n"Trong khi phóng to, bạn có thể:"\n<ul><li>"Xoay: Kéo hai hoặc nhiều ngón tay qua màn hình."</li>\n<li>"Điều chỉnh mức thu phóng: Chụm hai hoặc nhiều ngón tay với nhau hoặc tách chúng ra."</li></ul>\n\n"Bạn cũng có thể tạm thời thu phóng các mục bên dưới ngón tay bạn bằng cách nhấn ba lần và giữ. Ở trạng thái thu phóng này, bạn có thể kéo ngón tay để khám phá các phần khác nhau của màn hình. Thả ngón tay để trở về trạng thái trước."\n\n"Lưu ý: Nhấn ba lần để thu phóng toàn bộ trừ bàn phím và thanh điều hướng."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Phím tắt trợ năng"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Nhấn và giữ nút nguồn, sau đó chạm và giữ hai ngón tay"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Tắt"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Khi tính năng này được bật, bạn có thể nhanh chóng bật các tính năng hỗ trợ truy cập trong hai bước:"\n\n"Bước 1: Bấm và giữ nút nguồn cho đến khi bạn nghe thấy một âm thanh hoặc cảm thấy rung."\n\n"Bước 2: Chạm và giữ hai ngón tay cho đến khi bạn nghe thấy xác nhận bằng âm thanh."\n\n"Nếu thiết bị có nhiều người dùng, việc sử dụng lối tắt này trên màn hình khóa tạm thời bật hỗ trợ truy cập cho đến khi thiết bị được mở khóa."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Chữ lớn"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Thu phóng màn hình"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Tự động cập nhật thu phóng màn hình"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0c6e071..3748f0e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1307,8 +1307,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"辅助功能快捷方式"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"按住电源按钮，然后用双指触摸并按住"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"已关闭"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"启用该功能后，您只需两步即可迅速启用辅助功能："\n\n"步骤 1：持续按住电源按钮，直到您听到提示音或感觉到震动。"\n\n"步骤 2：用两根手指触摸屏幕并按住，直到您听到确认提示音。"\n\n"如果该设备有多个用户，在锁定屏幕上进行此快捷操作可暂时启用辅助功能，直到该设备解锁。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大号字体"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"屏幕放大"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自动更新屏幕放大状态"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a5c4385..e30cb5f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -607,10 +607,10 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"略過"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"不要略過"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需支付額外數據傳輸費用。"\n\n"平板電腦設定程序可能需要佔用大量網路流量。"</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需支付額外數據傳輸費用。"\n\n"手機設定程序可能需要佔用大量網路流量。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告：您的平板電腦無法驗證軟體是否為最新版本。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告：您的手機無法驗證軟體是否為最新版本。"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需支付額外的數據傳輸費用。"\n\n"平板電腦設定程序可能需要佔用大量網路流量。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需支付額外的數據傳輸費用。"\n\n"手機設定程序可能需要佔用大量網路流量。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告：無法透過您的平板電腦驗證軟體是否為最新版本。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告：無法透過您的手機驗證軟體是否為最新版本。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"您的平板電腦無法連線到這個 WiFi 網路。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"您的手機無法連線到這個 WiFi 網路。"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"進階 Wi-Fi"</string>
@@ -1305,7 +1305,7 @@
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"放大手勢"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"啟用這項功能時，只要在螢幕上輕按三下即可縮放。"\n\n"放大時，您可以："\n<ul><li>"平移：使用兩指或多指在螢幕上拖曳。"</li>\n<li>"調整縮放等級：使用兩指或多指往內撥或往外撥。"</li></ul>\n\n"此外，您只要輕按三下並持續按住，即可暫時放大手指所觸畫面。在這種放大狀態下，您可以使用手指拖曳，藉此探索畫面的不同部分。手指離開後，畫面隨即恢復原先的狀態。"\n\n"注意：除了鍵盤與導覽列部分以外，其他地方均適用輕按三下以放大畫面的做法。"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"協助工具捷徑"</string>
-    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"持續按住電源按鈕，然後使用兩指輕觸並按住"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"持續按住電源按鈕，然後用兩指輕觸並按住"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"關閉"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"開啟這項功能時，您可以透過兩個步驟快速啟用協助工具功能："\n\n"步驟 1：持續按住電源按鈕，直到聽見音效或感到震動。"\n\n"步驟 2：使用兩指輕觸並按住，直到聽見確認音效。"\n\n"如有多位使用者共用裝置，在鎖定畫面上使用這個捷徑會暫時啟用協助工具，直到裝置遭到解鎖為止。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大字體"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9335788..34b2d86 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,4 +51,7 @@
     <dimen name="header_icon_width">28dp</dimen>
     <dimen name="appwidget_min_width">260dip</dimen>
     <dimen name="appwidget_min_height">40dip</dimen>
+
+    <dimen name="pager_tabs_padding">0dp</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f66ca3a..679cd4e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,7 +26,13 @@
     <!-- Device Info --> <skip />
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
     <string name="device_info_default">Unknown</string>
-
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+    <string name="show_dev_countdown">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from being a developer.</string>
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+    <string name="show_dev_on">You are now a developer!</string>
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+    <string name="show_dev_already">No need, you are already a developer.</string>
+    
     <!-- Category headings in left-pane header menu --> <skip />
     <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
     <string name="header_category_wireless_networks">WIRELESS &amp; NETWORKS</string>
@@ -3097,7 +3103,7 @@
     <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
     <string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string>
     <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
-    <string name="accessibility_global_gesture_preference_summary_on">Press and hold power, then touch and hold two fingers</string>
+    <string name="accessibility_global_gesture_preference_summary_on">On</string>
     <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
     <string name="accessibility_global_gesture_preference_summary_off">Off</string>
     <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index c95596b..566f8c2 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -51,10 +51,6 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <CheckBoxPreference
-            android:key="unlock_tactile_feedback"
-            android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
         <PreferenceScreen
            android:key="choose_lockscreen_status_widget"
            android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 47fa1cc..b764c13 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -42,10 +42,6 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <CheckBoxPreference
-            android:key="unlock_tactile_feedback"
-            android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
         <PreferenceScreen
            android:key="choose_lockscreen_status_widget"
            android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index a019125..f0aacaa 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -38,10 +38,6 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <CheckBoxPreference
-            android:key="unlock_tactile_feedback"
-            android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
         <PreferenceScreen
            android:key="choose_lockscreen_status_widget"
            android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index d055345..b6556a9 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -23,6 +23,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -125,6 +126,7 @@
     private static final String EXTRA_DISABLE_WARNING_MESSAGE = "disable_warning_message";
     private static final String EXTRA_SETTINGS_TITLE = "settings_title";
     private static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
+    private static final String EXTRA_SERVICE_COMPONENT_NAME = "service_component_name";
 
     // Dialog IDs.
     private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
@@ -152,7 +154,13 @@
     };
 
     private final SettingsContentObserver mSettingsContentObserver =
-            new SettingsContentObserver(mHandler);
+            new SettingsContentObserver(mHandler) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            loadInstalledServices();
+            updateServicesPreferences();
+        }
+    };
 
     private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
             new RotationPolicy.RotationPolicyListener() {
@@ -194,7 +202,7 @@
         offerInstallAccessibilitySerivceOnce();
 
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
-        mSettingsContentObserver.register();
+        mSettingsContentObserver.register(getContentResolver());
         RotationPolicy.registerRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
     }
@@ -204,7 +212,7 @@
         mSettingsPackageMonitor.unregister();
         RotationPolicy.unregisterRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
-        mSettingsContentObserver.unregister();
+        mSettingsContentObserver.unregister(getContentResolver());
         super.onPause();
     }
 
@@ -431,6 +439,8 @@
                                 settingsClassName).flattenToString());
             }
 
+            extras.putString(EXTRA_SERVICE_COMPONENT_NAME, componentName.flattenToString());
+
             mServicesCategory.addPreference(preference);
         }
 
@@ -689,14 +699,39 @@
         private static final int DIALOG_ID_ENABLE_WARNING = 1;
         private static final int DIALOG_ID_DISABLE_WARNING = 2;
 
+        private final SettingsContentObserver mSettingsContentObserver =
+                new SettingsContentObserver(new Handler()) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                String settingValue = Settings.Secure.getString(getContentResolver(),
+                        Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+                final boolean enabled = settingValue.contains(mComponentName);
+                mToggleSwitch.setCheckedInternal(enabled);
+            }
+        };
+
         private CharSequence mEnableWarningTitle;
         private CharSequence mEnableWarningMessage;
         private CharSequence mDisableWarningTitle;
         private CharSequence mDisableWarningMessage;
 
+        private String mComponentName;
+
         private int mShownDialogId;
 
         @Override
+        public void onResume() {
+            mSettingsContentObserver.register(getContentResolver());
+            super.onResume();
+        }
+
+        @Override
+        public void onPause() {
+            mSettingsContentObserver.unregister(getContentResolver());
+            super.onPause();
+        }
+
+        @Override
         public void onPreferenceToggled(String preferenceKey, boolean enabled) {
             // Parse the enabled services.
             Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
@@ -851,6 +886,8 @@
             // Disable warning message.
             mDisableWarningMessage = arguments.getString(
                     AccessibilitySettings.EXTRA_DISABLE_WARNING_MESSAGE);
+            // Component name.
+            mComponentName = arguments.getString(EXTRA_SERVICE_COMPONENT_NAME);
         }
     }
 
@@ -1016,27 +1053,24 @@
         }
     }
 
-    private final class SettingsContentObserver extends ContentObserver {
+    private static abstract class SettingsContentObserver extends ContentObserver {
 
         public SettingsContentObserver(Handler handler) {
             super(handler);
         }
 
-        public void register() {
-            getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
+        public void register(ContentResolver contentResolver) {
+            contentResolver.registerContentObserver(Settings.Secure.getUriFor(
                     Settings.Secure.ACCESSIBILITY_ENABLED), false, this);
-            getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
+            contentResolver.registerContentObserver(Settings.Secure.getUriFor(
                     Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES), false, this);
         }
 
-        public void unregister() {
-            getContentResolver().unregisterContentObserver(this);
+        public void unregister(ContentResolver contentResolver) {
+            contentResolver.unregisterContentObserver(this);
         }
 
         @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            loadInstalledServices();
-            updateServicesPreferences();
-        }
+        public abstract void onChange(boolean selfChange, Uri uri);
     }
 }
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 295e8ea..f9c01b6 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -521,7 +521,6 @@
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
-                utils.setTactileFeedbackEnabled(false);
             }
 
             getActivity().setResult(RESULT_FINISHED);
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 6468f94..d1f9b55 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -56,6 +56,7 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.HardwareRenderer;
 import android.view.IWindowManager;
@@ -74,6 +75,16 @@
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
                 OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
 
+    /**
+     * Preference file were development settings prefs are stored.
+     */
+    public static final String PREF_FILE = "development";
+
+    /**
+     * Whether to show the development settings to the user.  Default is false.
+     */
+    public static final String PREF_SHOW = "show";
+
     private static final String ENABLE_ADB = "enable_adb";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
@@ -350,6 +361,7 @@
             Settings.Global.putInt(getActivity().getContentResolver(),
                     Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
             mLastEnabledState = true;
+            mEnabledSwitch.setChecked(mLastEnabledState);
             setPrefsEnabledState(mLastEnabledState);
         }
     }
@@ -1100,6 +1112,9 @@
                     try {
                         obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
                     } catch (RemoteException e) {
+                    } catch (Exception e) {
+                        Log.i("DevSettings", "Somone wrote a bad service '" + service
+                                + "' that doesn't like to be poked: " + e);
                     }
                     data.recycle();
                 }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 5f35871..a4abfea 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -17,10 +17,8 @@
 package com.android.settings;
 
 import android.app.Activity;
-import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SELinux;
@@ -30,13 +28,12 @@
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.provider.Settings;
 import android.util.Log;
+import android.widget.Toast;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -67,7 +64,11 @@
     private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";
     private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
 
+    static final int TAPS_TO_BE_A_DEVELOPER = 7;
+
     long[] mHits = new long[3];
+    int mDevHitCountdown;
+    Toast mDevHitToast;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -82,6 +83,7 @@
         setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);
         setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
+        findPreference(KEY_BUILD_NUMBER).setEnabled(true);
         findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
 
         if (!SELinux.isSELinuxEnabled()) {
@@ -148,6 +150,15 @@
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        mDevHitCountdown = getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                Context.MODE_PRIVATE).getBoolean(DevelopmentSettings.PREF_SHOW,
+                        android.os.Build.TYPE.equals("eng")) ? -1 : TAPS_TO_BE_A_DEVELOPER;
+        mDevHitToast = null;
+    }
+
+    @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference.getKey().equals(KEY_FIRMWARE_VERSION)) {
             System.arraycopy(mHits, 1, mHits, 0, mHits.length-1);
@@ -162,6 +173,37 @@
                     Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
                 }
             }
+        } else if (preference.getKey().equals(KEY_BUILD_NUMBER)) {
+            if (mDevHitCountdown > 0) {
+                mDevHitCountdown--;
+                if (mDevHitCountdown == 0) {
+                    getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                            Context.MODE_PRIVATE).edit().putBoolean(
+                                    DevelopmentSettings.PREF_SHOW, true).apply();
+                    if (mDevHitToast != null) {
+                        mDevHitToast.cancel();
+                    }
+                    mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_on,
+                            Toast.LENGTH_LONG);
+                    mDevHitToast.show();
+                } else if (mDevHitCountdown > 0
+                        && mDevHitCountdown < (TAPS_TO_BE_A_DEVELOPER-2)) {
+                    if (mDevHitToast != null) {
+                        mDevHitToast.cancel();
+                    }
+                    mDevHitToast = Toast.makeText(getActivity(), getResources().getString(
+                            R.string.show_dev_countdown, mDevHitCountdown),
+                            Toast.LENGTH_SHORT);
+                    mDevHitToast.show();
+                }
+            } else if (mDevHitCountdown < 0) {
+                if (mDevHitToast != null) {
+                    mDevHitToast.cancel();
+                }
+                mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_already,
+                        Toast.LENGTH_LONG);
+                mDevHitToast.show();
+            }
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index f56fc25..aed6cf3 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -71,7 +71,6 @@
     private static final String KEY_BIOMETRIC_WEAK_LIVELINESS = "biometric_weak_liveliness";
     private static final String KEY_LOCK_ENABLED = "lockenabled";
     private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
-    private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback";
     private static final String KEY_SECURITY_CATEGORY = "security_category";
     private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
@@ -105,7 +104,6 @@
 
     private CheckBoxPreference mBiometricWeakLiveliness;
     private CheckBoxPreference mVisiblePattern;
-    private CheckBoxPreference mTactileFeedback;
 
     private CheckBoxPreference mShowPassword;
 
@@ -222,16 +220,6 @@
             }
         }
 
-        // tactile feedback. Should be common to all unlock preference screens.
-        mTactileFeedback = (CheckBoxPreference) root.findPreference(KEY_TACTILE_FEEDBACK_ENABLED);
-        if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
-            PreferenceGroup securityCategory = (PreferenceGroup)
-                    root.findPreference(KEY_SECURITY_CATEGORY);
-            if (securityCategory != null && mTactileFeedback != null) {
-                securityCategory.removePreference(mTactileFeedback);
-            }
-        }
-
         mUserSelectedWidget = root.findPreference(KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET);
         if (mUserSelectedWidget != null) {
             AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
@@ -469,9 +457,6 @@
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
         }
-        if (mTactileFeedback != null) {
-            mTactileFeedback.setChecked(lockPatternUtils.isTactileFeedbackEnabled());
-        }
         if (mPowerButtonInstantlyLocks != null) {
             mPowerButtonInstantlyLocks.setChecked(lockPatternUtils.getPowerButtonInstantlyLocks());
         }
@@ -608,8 +593,6 @@
             lockPatternUtils.setLockPatternEnabled(isToggled(preference));
         } else if (KEY_VISIBLE_PATTERN.equals(key)) {
             lockPatternUtils.setVisiblePatternEnabled(isToggled(preference));
-        } else if (KEY_TACTILE_FEEDBACK_ENABLED.equals(key)) {
-            lockPatternUtils.setTactileFeedbackEnabled(isToggled(preference));
         } else if (KEY_POWER_INSTANTLY_LOCKS.equals(key)) {
             lockPatternUtils.setPowerButtonInstantlyLocks(isToggled(preference));
         } else if (preference == mShowPassword) {
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index b52c2e2..2d16262 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -34,6 +34,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -121,6 +122,9 @@
             R.id.accessibility_settings
     };
 
+    private SharedPreferences mDevelopmentPreferences;
+    private SharedPreferences.OnSharedPreferenceChangeListener mDevelopmentPreferencesListener;
+
     // TODO: Update Call Settings based on airplane mode state.
 
     protected HashMap<Integer, Integer> mHeaderIndexMap = new HashMap<Integer, Integer>();
@@ -139,6 +143,9 @@
         mAuthenticatorHelper.updateAuthDescriptions(this);
         mAuthenticatorHelper.onAccountsUpdated(this, null);
 
+        mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                Context.MODE_PRIVATE);
+
         getMetaData();
         mInLocalHeaderSwitch = true;
         super.onCreate(savedInstanceState);
@@ -195,6 +202,15 @@
     public void onResume() {
         super.onResume();
 
+        mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+                invalidateHeaders();
+            }
+        };
+        mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
+                mDevelopmentPreferencesListener);
+
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).resume();
@@ -210,6 +226,10 @@
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).pause();
         }
+
+        mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener(
+                mDevelopmentPreferencesListener);
+        mDevelopmentPreferencesListener = null;
     }
 
     @Override
@@ -390,7 +410,12 @@
     }
 
     private void updateHeaderList(List<Header> target) {
+        final boolean showDev = mDevelopmentPreferences.getBoolean(
+                DevelopmentSettings.PREF_SHOW,
+                android.os.Build.TYPE.equals("eng"));
         int i = 0;
+
+        mHeaderIndexMap.clear();
         while (i < target.size()) {
             Header header = target.get(i);
             // Ids are integers, so downcasting
@@ -400,12 +425,12 @@
             } else if (id == R.id.wifi_settings) {
                 // Remove WiFi Settings if WiFi service is not available.
                 if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
-                    target.remove(header);
+                    target.remove(i);
                 }
             } else if (id == R.id.bluetooth_settings) {
                 // Remove Bluetooth Settings if Bluetooth service is not available.
                 if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
-                    target.remove(header);
+                    target.remove(i);
                 }
             } else if (id == R.id.data_usage_settings) {
                 // Remove data usage when kernel module not enabled
@@ -413,7 +438,7 @@
                         .asInterface(ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
                 try {
                     if (!netManager.isBandwidthControlEnabled()) {
-                        target.remove(header);
+                        target.remove(i);
                     }
                 } catch (RemoteException e) {
                     // ignored
@@ -425,12 +450,18 @@
                 if (!UserHandle.MU_ENABLED
                         || !UserManager.supportsMultipleUsers()
                         || Utils.isMonkeyRunning()) {
-                    target.remove(header);
+                    target.remove(i);
+                }
+            } else if (id == R.id.development_settings) {
+                if (!showDev) {
+                    target.remove(i);
                 }
             }
-            if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
+
+            if (target.get(i) == header
+                    && UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
                     && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
-                target.remove(header);
+                target.remove(i);
             }
 
             // Increment if the current one wasn't removed by the Utils code.
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index e4d34f7..5797dfa 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -21,6 +21,7 @@
 
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
+import android.app.ActivityThread;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -447,11 +448,10 @@
             } catch (PackageManager.NameNotFoundException e) {
             }
         }
-        
-        boolean updateService(Context context,
-                ActivityManager.RunningServiceInfo service) {
+
+        boolean updateService(Context context, ActivityManager.RunningServiceInfo service) {
             final PackageManager pm = context.getPackageManager();
-            
+
             boolean changed = false;
             ServiceItem si = mServices.get(service.service);
             if (si == null) {
@@ -459,9 +459,10 @@
                 si = new ServiceItem(mUserId);
                 si.mRunningService = service;
                 try {
-                    si.mServiceInfo = pm.getServiceInfo(service.service,
-                            PackageManager.GET_UNINSTALLED_PACKAGES);
-                } catch (PackageManager.NameNotFoundException e) {
+                    si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo(
+                            service.service, PackageManager.GET_UNINSTALLED_PACKAGES,
+                            UserHandle.getUserId(service.uid));
+                } catch (RemoteException e) {
                 }
                 si.mDisplayLabel = makeLabel(pm,
                         si.mRunningService.service.getClassName(), si.mServiceInfo);