diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 7f30b4625018364d6f39fb305a3ec65a1e89f668..db7565ae43fb030da9a273de607b6177a7549fe4 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -32,10 +32,14 @@
     <string name="show_dev_already_cm">لا داعي، فخيارات المطور مفعّلة.</string>
     <!-- Hardware info -->
     <!-- Label for device's hardware platform value [CHAR LIMIT=40] -->
+    <string name="platform_revision">المنصة</string>
     <!-- Label for device's hardware ram size [CHAR LIMIT=40] -->
+    <string name="total_ram">إجمالي الذاكرة</string>
     <!-- Launch Dev Tools -->
     <string name="development_tools_title">أدوات التطوير</string>
     <!-- Advanced restart options -->
+    <string name="advanced_reboot_title">إعادة تشغيل متقدمة</string>
+    <string name="advanced_reboot_summary">عند إلغاء القفل، ستتضمن خيارات قائمة إعادة التشغيل الذهاب الى وضع الاسترداد او وضع محمل الاقلاع</string>
     <!-- Setting checkbox title for root access -->
     <string name="root_access">صلاحيات الجذر</string>
     <string name="root_access_warning_title">السماح بالوصول الجذري؟</string>
@@ -45,31 +49,45 @@
     <string name="root_access_adb">لـADB فقط</string>
     <string name="root_access_all">التطبيقات وADB</string>
     <!-- Preference link for root appops -->
+    <string name="root_appops_title">إدارة صلاحيات الجذر</string>
+    <string name="root_appops_summary">عرض قواعد الجذر والتحكم فيها</string>
     <!-- Double tap to sleep on status bar or lockscreen -->
+    <string name="status_bar_double_tap_to_sleep_title">اضغط للنوم</string>
+    <string name="status_bar_double_tap_to_sleep_summary">الضغط مرتين فوق شريط الحالة لإطفاء الشاشة</string>
     <!-- Touchscreen gesture settings -->
+    <string name="touchscreen_gesture_settings_title">الإيماءات اللمسية</string>
+    <string name="touchscreen_gesture_settings_summary">عمل إيماءات لمسية متعددة لأعمال سريعة</string>
     <!-- Proximity wake -->
     <string name="proximity_wake_title">منع الاستيقاظ العشوائي</string>
+    <string name="proximity_wake_summary">التحقق من مستشعر القرب قبل إيقاظ الشاشة</string>
     <!-- Whether the keyguard will directly show the password entry -->
     <string name="lock_directly_show_password">إظهار إدخال كلمة المرور مباشرة</string>
+    <string name="lock_directly_show_password_summary">تخطي التمرير لفتح قفل الشاشة والبدء فورا في إدخال كلمة المرور</string>
     <!-- Whether the keyguard will directly show the pattern view -->
     <string name="lock_directly_show_pattern">إظهار عرض النمط مباشرة</string>
+    <string name="lock_directly_show_pattern_summary">تخطي التمرير لفتح قفل الشاشة والبدء فورا في إدخال النقش</string>
     <!-- Whether the keyguard will directly show the PIN entry -->
     <string name="lock_directly_show_pin">إظهار إدخال رقم PIN مباشرة</string>
+    <string name="lock_directly_show_pin_summary">تخطي التمرير لفتح قفل الشاشة والبدء فورا في إدخال رمز pin</string>
     <!-- PIN scramble -->
     <string name="unlock_scramble_pin_layout_title">تخطيط الترميز</string>
     <string name="unlock_scramble_pin_layout_summary">تخطيط رقم PIN المرمز عند إلغاء تأمين الجهاز</string>
     <!-- Lock screen visualizer -->
     <string name="lockscreen_visualizer_title">عرض صورة الغلاف للموسيقى</string>
     <!-- Lock screen cover art -->
+    <string name="lockscreen_media_art_title">عرض الغلاف الفني للوسائط</string>
     <!-- Sizes for pattern lockscreen -->
+    <string name="lock_settings_picker_pattern_size_message">اختر حجم النمط</string>
     <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
     <string name="lockpattern_settings_enable_error_path_title">إظهار خطأ النمط</string>
     <!-- Whether the dots will be drawn when using the lockscreen pattern -->
     <string name="lockpattern_settings_enable_dots_title">إظهار نقاط النمط</string>
     <!-- Lock screen vibrate settings -->
     <string name="lockscreen_vibrate_enabled_title">اهتزاز</string>
+    <string name="lockscreen_vibrate_enabled_head">الاهتزاز عند الفتح</string>
     <!-- Android debugging -->
     <string name="adb_enable">تصحيح أخطاء Android</string>
+    <string name="adb_enable_summary">تمكين واجهة جسر تصحيح أخطاء أندرويد (ADB)</string>
     <!-- Android debugging notification -->
     <string name="adb_notify">إشعار تنقيح الأخطاء</string>
     <string name="adb_notify_summary">عرض إشعار عند تمكين تنقيح الأخطاء عبر USB أو الشبكات</string>
@@ -81,7 +99,12 @@
     <string name="kill_app_longpress_back">زر إلغاء التطبيق مجدداً</string>
     <string name="kill_app_longpress_back_summary">قم بإنهاء التطبيق الأمامي بالضغط الطويل على زر العودة</string>
     <!-- Format string for fingerprint location message -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">حدد موقع حساس بصمة الأصبع <xliff:g id="sensor_location">%1$s </xliff:g> من هاتفك.</string>
     <!-- Fingerprint sensor locations -->
+    <string name="security_settings_fingerprint_sensor_location_back">في الخلف</string>
+    <string name="security_settings_fingerprint_sensor_location_front">في الأمام</string>
+    <string name="security_settings_fingerprint_sensor_location_left">على الجانب الأيسر</string>
+    <string name="security_settings_fingerprint_sensor_location_right">على الجانب الأيمن</string>
     <!-- Hostname setting -->
     <string name="device_hostname">اسم مضيف الجهاز</string>
     <!-- Increasing ring tone volume -->
@@ -89,6 +112,7 @@
     <string name="increasing_ring_min_volume_title">حجم الصوت البدئيّ</string>
     <string name="increasing_ring_ramp_up_time_title">زمن التدرج</string>
     <!-- Volume link notification -->
+    <string name="volume_link_notification_title">ربط حجم صوت النغمة وصوت الإشعارات</string>
     <!-- Memory -->
     <string name="memory_startup_apps_title">التطبيقات بدأت في التمهيد</string>
     <!-- Manual provisioning support -->
@@ -114,6 +138,7 @@
     <string name="app_ops_categories_messaging">المراسلة</string>
     <string name="app_ops_categories_media">وسائط</string>
     <string name="app_ops_categories_device">الجهاز</string>
+    <string name="app_ops_categories_run_in_background">يعمل في الخلفية</string>
     <string name="app_ops_categories_bootup">إعادة تحميل</string>
     <string name="app_ops_categories_su">الوصول إلى الجذر</string>
     <string name="app_ops_categories_other">أخرى</string>
@@ -161,6 +186,7 @@
     <string name="app_ops_summaries_keep_awake">البقاء بحالة انتباه</string>
     <string name="app_ops_summaries_monitor_location">مراقبة الموقع</string>
     <string name="app_ops_summaries_monitor_high_power_location">رصد موقع عالي الطاقة</string>
+    <string name="app_ops_summaries_get_usage_stats">الحصول على إحصائيات استخدام التطبيق</string>
     <string name="app_ops_summaries_mute_unmute_microphone">كتم/إلغاء كتم الميكروفون</string>
     <string name="app_ops_summaries_toast_window">عرض الرسائل الإشعارية</string>
     <string name="app_ops_summaries_project_media">وسائط المشروع</string>
@@ -180,6 +206,13 @@
     <string name="app_ops_summaries_write_external_storage">الكتابة على الذاكرة الخارجية</string>
     <string name="app_ops_summaries_turn_screen_on">تشغيل الشاشة</string>
     <string name="app_ops_summaries_get_accounts">الحصول على الحسابات</string>
+    <string name="app_ops_summaries_run_in_background">يعمل في الخلفية</string>
+    <string name="app_ops_summaries_accessibility_volume">الوصول إلى مستوى الصوت</string>
+    <string name="app_ops_summaries_read_phone_numbers">قراءة أرقام الهاتف</string>
+    <string name="app_ops_summaries_request_install_packages">طلب حزم التثبيت</string>
+    <string name="app_ops_summaries_picture_in_picture">استخدام صورة في صورة</string>
+    <string name="app_ops_summaries_instant_app_start_foreground">بدء التطبيق الفوري في المقدمة</string>
+    <string name="app_ops_summaries_answer_phone_calls">الرد على المكالمات الهاتفية</string>
     <string name="app_ops_summaries_toggle_wifi">تبديل Wi-Fi</string>
     <string name="app_ops_summaries_toggle_bluetooth">تبديل بلوتوث</string>
     <string name="app_ops_summaries_start_at_boot">بدء تشغيل في التمهيد</string>
@@ -250,6 +283,13 @@
     <string name="app_ops_labels_write_external_storage">الكتابة على الذاكرة الخارجية</string>
     <string name="app_ops_labels_turn_screen_on">تشغيل الشاشة</string>
     <string name="app_ops_labels_get_accounts">الحصول على الحسابات</string>
+    <string name="app_ops_labels_run_in_background">يعمل في الخلفية</string>
+    <string name="app_ops_labels_accessibility_volume">إمكانية الوصول لمستوى الصوت</string>
+    <string name="app_ops_labels_read_phone_numbers">قراءة أرقام الهاتف</string>
+    <string name="app_ops_labels_request_install_packages">طلب تثبيت الحزم</string>
+    <string name="app_ops_labels_picture_in_picture">استخدام صورة في صورة</string>
+    <string name="app_ops_labels_instant_app_start_foreground">بدء التطبيق الفوري في المقدمة</string>
+    <string name="app_ops_labels_answer_phone_calls">الرد على المكالمات الهاتفية</string>
     <string name="app_ops_labels_toggle_wifi">تبديل Wi-Fi</string>
     <string name="app_ops_labels_toggle_bluetooth">تبديل بلوتوث</string>
     <string name="app_ops_labels_start_at_boot">بدء تشغيل في التمهيد</string>
@@ -265,6 +305,7 @@
     <string name="app_ops_allowed_count">المسموح بها <xliff:g id="count" example="2 times">%s</xliff:g></string>
     <string name="app_ops_ignored_count">مرفوض<xliff:g id="count" example="2 times">%s</xliff:g></string>
     <string name="app_ops_both_count">مسموح<xliff:g id="count">%1$s</xliff:g>, مرفوض<xliff:g id="count">%2$s</xliff:g></string>
+    <string name="app_ops_no_blockable_permissions">ليست هناك أذونات متاحة للحظر</string>
     <!-- App ops menu options -->
     <string name="app_ops_show_user_apps">إظهار تطبيقات المستخدم</string>
     <string name="app_ops_show_system_apps">إظهار تطبيقات مضمنة</string>
@@ -272,6 +313,7 @@
     <string name="app_ops_reset_confirm_title">تأكيد إعادة تعيين العدادات</string>
     <string name="app_ops_reset_confirm_mesg">هل أنت متأكد من رغبتك في إعادة تعيين العدادات؟</string>
     <string name="ok">موافق</string>
+    <string name="security_privacy_settings_title">الأمان والخصوصية</string>
     <!-- LineageOS legal -->
     <string name="lineagelicense_title">قانون LineageOS</string>
     <!-- Volume settings - Volume adjustment sound -->
@@ -280,6 +322,8 @@
     <string name="wake_when_plugged_or_unplugged_title">الإيقاظ عند التوصيل</string>
     <string name="wake_when_plugged_or_unplugged_summary">تشغيل الشاشة عند الاتصال أو قطع الاتصال بمصدر الطاقة</string>
     <!-- Heads-up -->
+    <string name="heads_up_notifications_enabled_title">الإشعارات العائمة</string>
+    <string name="heads_up_notifications_enabled_summary">عرض الإشعارات ذات الأولوية في إطار عائم صغير</string>
     <!-- High touch sensitivity -->
     <string name="high_touch_sensitivity_title">حساسية ذات لمس عالي</string>
     <string name="high_touch_sensitivity_summary">زيادة حساسية شاشة اللمس حتى يمكن استخدامها أثناء ارتداء القفازات</string>
@@ -287,4 +331,8 @@
     <string name="touchscreen_hovering_title">المرور فوق الشاشة اللمسية</string>
     <string name="touchscreen_hovering_summary">يسمح لك بالمرور فوق الشاشة مثل الماوس في مستعرضات الويب، أو سطح المكتب عن بُعد، إلخ</string>
     <!-- Per-app data restrictions -->
+    <string name="data_usage_app_restrict_data">بيانات شبكة الجوّال</string>
+    <string name="data_usage_app_restrict_data_summary">تمكين استخدام البيانات</string>
+    <string name="data_usage_app_restrict_wifi">بيانات WiFi</string>
+    <string name="data_usage_app_restrict_wifi_summary">تمكين استخدام بيانات WiFi</string>
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index aa0d36f81fce07ca5fac2cbc0411ff6077c0c537..08f5dfcc38266c817db48d815412642874d60378 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -28,11 +28,14 @@
     <string name="show_dev_already_cm">Nun fai falta, yá tán activaes los axustes de desendolcu.</string>
     <!-- Hardware info -->
     <!-- Label for device's hardware platform value [CHAR LIMIT=40] -->
+    <string name="platform_revision">Plataforma</string>
     <!-- Label for device's hardware ram size [CHAR LIMIT=40] -->
+    <string name="total_ram">RAM total</string>
     <!-- Launch Dev Tools -->
     <string name="development_tools_title">Ferramientes de desendolcu</string>
     <!-- Advanced restart options -->
     <string name="advanced_reboot_title">Reaniciu avanzáu</string>
+    <string name="advanced_reboot_summary">Destorgáu, inclúi opciones nel menú d\'apagáu pa reiniciar nel mou recuperación o cargador d\'arranque</string>
     <!-- Setting checkbox title for root access -->
     <string name="root_access">Accesu root</string>
     <string name="root_access_warning_title">¿Permitir l\'accesu root?</string>
@@ -45,43 +48,100 @@
     <string name="root_appops_title">Xestionar accesos root</string>
     <string name="root_appops_summary">Mira y controla les regles root</string>
     <!-- Double tap to sleep on status bar or lockscreen -->
+    <string name="status_bar_double_tap_to_sleep_title">Calca pa suspender</string>
+    <string name="status_bar_double_tap_to_sleep_summary">Calca dos vegaes na barra d\'estáu o pantalla de bloquéu p\'apagar la pantalla</string>
     <!-- Touchscreen gesture settings -->
+    <string name="touchscreen_gesture_settings_title">Xestos de pantalla táutil</string>
+    <string name="touchscreen_gesture_settings_summary">Fai dellos xestos táutiles p\'aiciones rápides</string>
     <!-- Proximity wake -->
     <string name="proximity_wake_title">Evitar esconsueñu accidental</string>
+    <string name="proximity_wake_summary">Comprueba\'l sensor de proximidá enantes de prender la pantalla</string>
     <!-- Whether the keyguard will directly show the password entry -->
+    <string name="lock_directly_show_password">Amosar direutamente la contraseña</string>
+    <string name="lock_directly_show_password_summary">Omitir l\'esbarie pa destorgar la pantalla y entamar darréu la introducción de la contraseña</string>
     <!-- Whether the keyguard will directly show the pattern view -->
+    <string name="lock_directly_show_pattern">Amosar direutamente\'l patrón</string>
+    <string name="lock_directly_show_pattern_summary">Omitir l\'esbarie pa destorgar la pantalla y entamar darréu la introducción del patrón</string>
     <!-- Whether the keyguard will directly show the PIN entry -->
+    <string name="lock_directly_show_pin">Amosar direutamente la entrada PIN</string>
+    <string name="lock_directly_show_pin_summary">Omitir l\'esbarie pa destorgar la pantalla y entamar darréu la introducción del PIN</string>
     <!-- PIN scramble -->
+    <string name="unlock_scramble_pin_layout_title">Disposición al debalu</string>
+    <string name="unlock_scramble_pin_layout_summary">Cambiar la disposición de los númberos del PIN pa desbloquiar el preséu</string>
     <!-- Lock screen visualizer -->
+    <string name="lockscreen_visualizer_title">Amosar visualizador de música</string>
     <!-- Lock screen cover art -->
+    <string name="lockscreen_media_art_title">Amosar la portada del álbum</string>
     <!-- Sizes for pattern lockscreen -->
     <string name="lock_settings_picker_pattern_size_message">Escueyi un tamañu de patrón</string>
     <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+    <string name="lockpattern_settings_enable_error_path_title">Amosar fallu de patrón</string>
     <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+    <string name="lockpattern_settings_enable_dots_title">Amosar puntos del patrón</string>
     <!-- Lock screen vibrate settings -->
+    <string name="lockscreen_vibrate_enabled_title">Vibración</string>
+    <string name="lockscreen_vibrate_enabled_head">Vibrar al desbloquiar</string>
     <!-- Android debugging -->
+    <string name="adb_enable">Depuración Android</string>
     <string name="adb_enable_summary">Habilita la interfaz de depuración ADB</string>
     <!-- Android debugging notification -->
     <string name="adb_notify">Avisu de depuración</string>
+    <string name="adb_notify_summary">Amosar un avisu cuando tea activada la depuración per USB o rede</string>
     <!-- Android debugging over network -->
+    <string name="adb_over_network">ADB sobre rede</string>
+    <string name="adb_over_network_summary">Activar la depuración TCP/IP sobre les interfaces de rede (Wi\u2011Fi, redes USB). Esta configuración restablezse al reaniciar el preséu</string>
+    <string name="adb_over_network_warning">AVISU: Cuando ta habilitáu ADB sobre rede, el teléfono ta abiertu pa intrusiones en toles redes coneutaes.\n\nUsa esta función namái coneutáu a redes de confianza.\n\n¿Daveres quies activar esta función?</string>
     <!-- Kill app long-press back -->
+    <string name="kill_app_longpress_back">Botón Volver</string>
+    <string name="kill_app_longpress_back_summary">Matar l\'aplicación actual al caltener primíu\'l botón Volver</string>
     <!-- Format string for fingerprint location message -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Alluga\'l sensor de buelgues na parte <xliff:g id="sensor_location">%1$s</xliff:g> del to teléfonu.</string>
     <!-- Fingerprint sensor locations -->
+    <string name="security_settings_fingerprint_sensor_location_back">d\'atrás</string>
+    <string name="security_settings_fingerprint_sensor_location_front">frontal</string>
+    <string name="security_settings_fingerprint_sensor_location_left">llau esquierdu</string>
+    <string name="security_settings_fingerprint_sensor_location_right">llau drechu</string>
     <!-- Hostname setting -->
+    <string name="device_hostname">Nome del preséu</string>
     <!-- Increasing ring tone volume -->
+    <string name="increasing_ring_volume_option_title">Volume de timbre ascendente</string>
     <string name="increasing_ring_min_volume_title">Volume inicial</string>
+    <string name="increasing_ring_ramp_up_time_title">Duración d\'incrementu</string>
     <!-- Volume link notification -->
+    <string name="volume_link_notification_title">Venceyar tonu de llamada &amp; y volume de les notificaciones</string>
     <!-- Memory -->
+    <string name="memory_startup_apps_title">Apps aniciaes nel arranque</string>
     <!-- Manual provisioning support -->
+    <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> ta <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
+    <string name="sim_disabled">deshabilitada</string>
+    <string name="sim_missing">ausente o defeutuosa</string>
+    <string name="sim_enabler_need_disable_sim">Desactivaráse la tarxeta SIM. ¿Quies siguir?</string>
+    <string name="sim_enabler_will_disable_sim_title">Atención</string>
+    <string name="sim_enabler_need_switch_data_service">Esta SIM va desactivase y la SIM <xliff:g id="slotid">%1$s </xliff:g> va usase pa servicios de datos. ¿De xuru que quies continuar?</string>
+    <string name="sim_enabler_airplane_on">Nun pue facese la operación entrín el mou avión tea activáu.</string>
+    <string name="sim_enabler_in_call">Nun pue facese la operación entrín teas llamando.</string>
+    <string name="sim_enabler_both_inactive">Nun puen deshabilitase toles tarxetes SIM</string>
+    <string name="sim_enabler_enabling">Activando\u2026</string>
+    <string name="sim_enabler_disabling">Desactivando\u2026</string>
+    <string name="sub_activate_success">Activóse la SIM.</string>
+    <string name="sub_activate_failed">Falló l\'activación.</string>
+    <string name="sub_deactivate_success">Desactivóse la SIM.</string>
+    <string name="sub_deactivate_failed">Falló la desactivación.</string>
     <!-- Names of categories of app ops tabs - extension of AOSP -->
     <string name="app_ops_categories_location">Allugamientu</string>
     <string name="app_ops_categories_personal">Personal</string>
     <string name="app_ops_categories_messaging">Mensaxería</string>
+    <string name="app_ops_categories_media">Multimedia</string>
     <string name="app_ops_categories_device">Preséu</string>
+    <string name="app_ops_categories_run_in_background">Executar de fondu</string>
     <string name="app_ops_categories_bootup">Arranque</string>
     <string name="app_ops_categories_su">Accesu root</string>
+    <string name="app_ops_categories_other">Otros</string>
     <!-- User display names for app ops codes - extension of AOSP -->
+    <string name="app_ops_summaries_coarse_location">allugamientu pocu precisu</string>
+    <string name="app_ops_summaries_fine_location">allugamientu precisu</string>
     <string name="app_ops_summaries_gps">GPS</string>
+    <string name="app_ops_summaries_vibrate">vibración</string>
     <string name="app_ops_summaries_read_contacts">lleer contautos</string>
     <string name="app_ops_summaries_modify_contacts">modificar contautos</string>
     <string name="app_ops_summaries_read_call_log">lleer el rexistru de llamaes</string>
@@ -89,15 +149,21 @@
     <string name="app_ops_summaries_read_calendar">lleer calendariu</string>
     <string name="app_ops_summaries_modify_calendar">modificar calendariu</string>
     <string name="app_ops_summaries_wifi_scan">escanéu Wi-Fi</string>
+    <string name="app_ops_summaries_notification">notific/not. emerxent</string>
+    <string name="app_ops_summaries_cell_scan">guetar redes</string>
+    <string name="app_ops_summaries_call_phone">Llamar per teléfonu</string>
     <string name="app_ops_summaries_read_sms">lleer SMS</string>
     <string name="app_ops_summaries_write_sms">escribir SMS</string>
     <string name="app_ops_summaries_receive_sms">recibir SMS</string>
     <string name="app_ops_summaries_receive_emergency_sms">recibir SMS d\'emerxencia</string>
     <string name="app_ops_summaries_receive_mms">recibir MMS</string>
+    <string name="app_ops_summaries_receive_wap_push">recibir WAP push</string>
     <string name="app_ops_summaries_send_sms">unviar SMS</string>
     <string name="app_ops_summaries_read_icc_sms">lleer ICC SMS</string>
     <string name="app_ops_summaries_write_icc_sms">escribir ICC SMS</string>
     <string name="app_ops_summaries_modify_settings">modificar axustes</string>
+    <string name="app_ops_summaries_draw_on_top">amosar arriba</string>
+    <string name="app_ops_summaries_access_notifications">acceder a les notificaciones</string>
     <string name="app_ops_summaries_camera">cámara</string>
     <string name="app_ops_summaries_record_audio">grabar audiu</string>
     <string name="app_ops_summaries_play_audio">reproducir audiu</string>
@@ -108,27 +174,72 @@
     <string name="app_ops_summaries_master_volume">volume principal</string>
     <string name="app_ops_summaries_voice_volume">volume de voz</string>
     <string name="app_ops_summaries_ring_volume">volume del timbre</string>
+    <string name="app_ops_summaries_media_volume">volume de multimedia</string>
     <string name="app_ops_summaries_alarm_volume">volume d\'alarma</string>
     <string name="app_ops_summaries_notification_volume">volume d\'avisu</string>
     <string name="app_ops_summaries_bluetooth_volume">volume Bluetooth</string>
+    <string name="app_ops_summaries_keep_awake">caltener encesu</string>
     <string name="app_ops_summaries_monitor_location">monitorizar allugamientu</string>
+    <string name="app_ops_summaries_monitor_high_power_location">monitorizar llocalización n\'alta precisión</string>
     <string name="app_ops_summaries_get_usage_stats">consiguir estadístiques d\'usu d\'aplicaciones</string>
     <string name="app_ops_summaries_mute_unmute_microphone">de/silenciar micrófonu</string>
+    <string name="app_ops_summaries_toast_window">amosar notificaciones emerxentes</string>
+    <string name="app_ops_summaries_project_media">proyeutar conteníu multimedia</string>
     <string name="app_ops_summaries_activate_vpn">activar VPN</string>
+    <string name="app_ops_summaries_write_wallpaper">escribir fondu de pantalla</string>
+    <string name="app_ops_summaries_assist_structure">encontu a la estructura</string>
+    <string name="app_ops_summaries_assist_screenshot">encontu a captura pantalla</string>
+    <string name="app_ops_summaries_read_phone_state">lleer estáu del teléfonu</string>
+    <string name="app_ops_summaries_add_voicemail">amestar buzón de voz</string>
+    <string name="app_ops_summaries_use_sip">usar SIP</string>
+    <string name="app_ops_summaries_make_call">facer llamada</string>
+    <string name="app_ops_summaries_use_fingerprint">usar buelga</string>
+    <string name="app_ops_summaries_use_body_sensors">usar sensores corporales</string>
+    <string name="app_ops_summaries_read_cell_broadcasts">lleer tresmisiones celulares</string>
     <string name="app_ops_summaries_mock_location">allugamientu falsu</string>
+    <string name="app_ops_summaries_read_external_storage">lleer almacenamientu esternu</string>
+    <string name="app_ops_summaries_write_external_storage">escribir al almacenamientu esternu</string>
+    <string name="app_ops_summaries_turn_screen_on">prender pantalla</string>
+    <string name="app_ops_summaries_get_accounts">consiguir cuentes</string>
     <string name="app_ops_summaries_run_in_background">executase de fondu</string>
+    <string name="app_ops_summaries_accessibility_volume">volume d\'accesibilidá d\'audiu</string>
+    <string name="app_ops_summaries_read_phone_numbers">lleer númberos telefónicos</string>
+    <string name="app_ops_summaries_request_install_packages">solicitar instalación de paquetes</string>
+    <string name="app_ops_summaries_picture_in_picture">usar Picture-in-Picture</string>
+    <string name="app_ops_summaries_instant_app_start_foreground">aniciar aplicación nel intre en primer planu</string>
+    <string name="app_ops_summaries_answer_phone_calls">contestar llamaes de teléfonu</string>
+    <string name="app_ops_summaries_toggle_wifi">alternar Wi-Fi</string>
+    <string name="app_ops_summaries_toggle_bluetooth">alternar bluetooth</string>
+    <string name="app_ops_summaries_start_at_boot">aniciar nel arranque</string>
     <string name="app_ops_summaries_toggle_nfc">alternar NFC</string>
+    <string name="app_ops_summaries_toggle_mobile_data">alternar datos móviles</string>
+    <string name="app_ops_summaries_superuser">accesu alministrativu</string>
     <!-- User display names for app ops codes - extension of AOSP -->
+    <string name="app_ops_labels_coarse_location">Llocalización aproximada</string>
+    <string name="app_ops_labels_fine_location">Llocalización fina</string>
     <string name="app_ops_labels_gps">GPS</string>
+    <string name="app_ops_labels_vibrate">Vibrar</string>
+    <string name="app_ops_labels_read_contacts">Lleer contautos</string>
+    <string name="app_ops_labels_modify_contacts">Modificar contautos</string>
+    <string name="app_ops_labels_read_call_log">Lleer rexistru de llamaes</string>
+    <string name="app_ops_labels_modify_call_log">Modificar rexistru de llamaes</string>
+    <string name="app_ops_labels_read_calendar">Lleer calendariu</string>
+    <string name="app_ops_labels_modify_calendar">Modificar calendariu</string>
+    <string name="app_ops_labels_wifi_scan">Escanear Wi-Fi</string>
+    <string name="app_ops_labels_notification">Notificación/Mensaxe</string>
+    <string name="app_ops_labels_cell_scan">Escanéu de rede móvil</string>
+    <string name="app_ops_labels_call_phone">Llamar</string>
     <string name="app_ops_labels_read_sms">Lleer SMS</string>
     <string name="app_ops_labels_write_sms">Escribir SMS</string>
     <string name="app_ops_labels_receive_sms">Recibir SMS</string>
     <string name="app_ops_labels_receive_emergency_sms">Recibir mensaxes SMS d\'emerxencia</string>
     <string name="app_ops_labels_receive_mms">Recibir MMS</string>
+    <string name="app_ops_labels_receive_wap_push">Recibir mensaxes WAP</string>
     <string name="app_ops_labels_send_sms">Unviar SMS</string>
     <string name="app_ops_labels_read_icc_sms">Lleer ICC SMS</string>
     <string name="app_ops_labels_write_icc_sms">Escribir ICC SMS</string>
     <string name="app_ops_labels_modify_settings">Modificar axustes</string>
+    <string name="app_ops_labels_draw_on_top">Amosar encima</string>
     <string name="app_ops_labels_access_notifications">Accesu a avisos</string>
     <string name="app_ops_labels_camera">Cámara</string>
     <string name="app_ops_labels_record_audio">Grabar audiu</string>
@@ -144,15 +255,36 @@
     <string name="app_ops_labels_alarm_volume">Volume d\'alarma</string>
     <string name="app_ops_labels_notification_volume">Volume d\'avisu</string>
     <string name="app_ops_labels_bluetooth_volume">Volume Bluetooth</string>
+    <string name="app_ops_labels_keep_awake">Caltener encesu</string>
+    <string name="app_ops_labels_monitor_location">Monitorear llocalización</string>
+    <string name="app_ops_labels_monitor_high_power_location">Monitorear llocalización fina</string>
+    <string name="app_ops_labels_get_usage_stats">Obtener estadístiques d\'usu</string>
+    <string name="app_ops_labels_mute_unmute_microphone">Silenciar/nun silenciar micrófonu</string>
+    <string name="app_ops_labels_toast_window">Amosar notificaciones emerxentes</string>
+    <string name="app_ops_labels_project_media">Proyeutu Media</string>
     <string name="app_ops_labels_activate_vpn">Activar VPN</string>
+    <string name="app_ops_labels_write_wallpaper">Escribir fondu de pantalla</string>
+    <string name="app_ops_labels_assist_structure">Encontu d\'estructura</string>
+    <string name="app_ops_labels_assist_screenshot">encontu a captura pantalla</string>
+    <string name="app_ops_labels_read_phone_state">lleer estáu del teléfonu</string>
+    <string name="app_ops_labels_add_voicemail">amestar buzón de voz</string>
     <string name="app_ops_labels_use_sip">Usar SIP</string>
+    <string name="app_ops_labels_make_call">Facer llamada</string>
     <string name="app_ops_labels_use_fingerprint">Usar buelga</string>
     <string name="app_ops_labels_use_body_sensors">Usar sensores corporales</string>
+    <string name="app_ops_labels_read_cell_broadcasts">Lleer tresmisiones celulares</string>
     <string name="app_ops_labels_mock_location">Allugamientu falsu</string>
     <string name="app_ops_labels_read_external_storage">Lleer almacenamientu esternu</string>
     <string name="app_ops_labels_write_external_storage">Escribir nel almacenamientu esternu</string>
     <string name="app_ops_labels_turn_screen_on">Prender pantalla</string>
     <string name="app_ops_labels_get_accounts">Consiguir cuentes</string>
+    <string name="app_ops_labels_run_in_background">Executar de fondu</string>
+    <string name="app_ops_labels_accessibility_volume">Volume d\'accesibilidá d\'audiu</string>
+    <string name="app_ops_labels_read_phone_numbers">Lleer númberos telefónicos</string>
+    <string name="app_ops_labels_request_install_packages">Riquir la instalación de paquetes</string>
+    <string name="app_ops_labels_picture_in_picture">Usar Picture in Picture</string>
+    <string name="app_ops_labels_instant_app_start_foreground">Aniciar aplicación nel intre en primer planu</string>
+    <string name="app_ops_labels_answer_phone_calls">Contestar llamaes de teléfonu</string>
     <string name="app_ops_labels_toggle_wifi">Alternar Wi-Fi</string>
     <string name="app_ops_labels_toggle_bluetooth">Alternar bluetooth</string>
     <string name="app_ops_labels_start_at_boot">Aniciar nel arranque</string>
@@ -160,13 +292,25 @@
     <string name="app_ops_labels_toggle_mobile_data">Alternar datos móviles</string>
     <string name="app_ops_labels_superuser">Accesu root</string>
     <!-- App ops permissions -->
+    <string name="app_ops_permissions_allowed">Permitíu</string>
+    <string name="app_ops_permissions_ignored">inoráu</string>
     <string name="app_ops_permissions_always_ask">Entrugar siempre</string>
     <!-- App ops detail -->
+    <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (used <xliff:g id="count">%2$s</xliff:g>)</string>
+    <string name="app_ops_allowed_count">Permitíu <xliff:g id="count" example="2 times">%s</xliff:g></string>
+    <string name="app_ops_ignored_count">Refugáu <xliff:g id="count" example="2 times">%s</xliff:g></string>
+    <string name="app_ops_both_count">Permitíu <xliff:g id="count">%1$s</xliff:g>, refugáu <xliff:g id="count">%2$s</xliff:g></string>
+    <string name="app_ops_no_blockable_permissions">Nun hai permisos disponibles pa torgar</string>
     <!-- App ops menu options -->
     <string name="app_ops_show_user_apps">Amosar aplicaciones d\'usuariu</string>
+    <string name="app_ops_show_system_apps">Amuesa les app del sistema</string>
+    <string name="app_ops_reset_counters">Restablecer contadores</string>
+    <string name="app_ops_reset_confirm_title">Confirma\'l reaniciu de los contadores</string>
     <string name="app_ops_reset_confirm_mesg">¿De xuru que quies reafitar los contadores?</string>
     <string name="ok">Aceutar</string>
+    <string name="security_privacy_settings_title">Seguranza y privacidá</string>
     <!-- LineageOS legal -->
+    <string name="lineagelicense_title">Llicencia LineageOS</string>
     <!-- Volume settings - Volume adjustment sound -->
     <string name="volume_adjust_sounds_title">Sonios d\'axuste de volume</string>
     <!-- Wake on plug -->
@@ -176,6 +320,14 @@
     <string name="heads_up_notifications_enabled_title">Avisos emerxentes</string>
     <string name="heads_up_notifications_enabled_summary">Amuesa los avisos prioritarios nuna ventana pequeña flotante</string>
     <!-- High touch sensitivity -->
+    <string name="high_touch_sensitivity_title">Sensibilidá alta al tactu</string>
+    <string name="high_touch_sensitivity_summary">Incrementar la sensibilidá del panel táctil pa que pueda usase llevando guantes</string>
     <!-- Touchscreen hovering -->
+    <string name="touchscreen_hovering_title">Pantalla táctil eslizante</string>
+    <string name="touchscreen_hovering_summary">Permite eslizase pela pantalla como un mur en navegadores, escritorios remotos, etc.</string>
     <!-- Per-app data restrictions -->
+    <string name="data_usage_app_restrict_data">Datos móviles</string>
+    <string name="data_usage_app_restrict_data_summary">Activar l\'usu de los datos móviles</string>
+    <string name="data_usage_app_restrict_wifi">Datos Wi\u2011Fi</string>
+    <string name="data_usage_app_restrict_wifi_summary">Activar l\'usu de los datos Wi\u2011Fi</string>
 </resources>
diff --git a/res/values-cy/arrays.xml b/res/values-cy/arrays.xml
index 4fd275e87255c380748f61f8fd0a3b3fc0df203c..0229e5ec54947ee0addc393fb311a7703c76feda 100644
--- a/res/values-cy/arrays.xml
+++ b/res/values-cy/arrays.xml
@@ -78,7 +78,7 @@
     <!-- Do not translate. -->
     <string-array name="entries_font_size">
         <item msgid="6490061470416867723">Bach</item>
-        <item msgid="3579015730662088893">Default</item>
+        <item msgid="3579015730662088893">Arferol</item>
         <item msgid="1678068858001018666">Mawr</item>
         <item msgid="490158884605093126">Mwyaf</item>
     </string-array>
@@ -109,7 +109,7 @@
         <!-- Status message of Wi-Fi when it is blocked. -->
         <item>Wedi\'i rhwystro</item>
         <!-- Status message of Wi-Fi when connectiong is being verified. -->
-        <item>Temporarily avoiding poor connection</item>
+        <item>Yn osgoi cysylltiad gwael am y tro</item>
     </string-array>
     <!-- Match this with the order of NetworkInfo.DetailedState. -->
     <!-- Wi-Fi settings. The status messages when the network is known. -->
@@ -152,6 +152,14 @@
     <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
     <!-- Wi-Fi WPS setup for p2p connections.  -->
     <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+    <string-array name="wifi_p2p_wps_setup">
+        <!-- Push button based configuration involves pushing a button on two connecting devices [CHAR LIMIT=30]-->
+        <item>Gwthio botwm</item>
+        <!-- This involves entering a pin obtained from a peer device [CHAR LIMIT=30] -->
+        <item>PIN gan ddyfais cyfaill</item>
+        <!-- This involves generating a pin from this device [CHAR LIMIT=20] -->
+        <item>PIN gan y ddyfais hon</item>
+    </string-array>
     <!-- Match this with the order of WifiP2pDevice.Status -->
     <!-- Wi-Fi p2p settings device status message -->
     <string-array name="wifi_p2p_status">
@@ -187,8 +195,8 @@
     </string-array>
     <!-- Display options for UsageStats class -->
     <string-array name="usage_stats_display_order_types">
-        <item>Usage time</item>
-        <item>Last time used</item>
+        <item>Amser defnydd</item>
+        <item>Defnyddiwyd ddiwethaf</item>
         <item>Enw\'r ap</item>
     </string-array>
     <!-- EAP method -->
@@ -236,10 +244,28 @@
         <item>Dim</item>
         <item>PAP</item>
         <item>CHAP</item>
-        <item>PAP or CHAP</item>
+        <item>PAP neu CHAP</item>
     </string-array>
     <!-- Authentication Types used in APN editor -->
     <!-- Bearer Info used in APN editor -->
+    <string-array name="bearer_entries">
+        <item>Anhysbys</item>
+        <item>LTE</item>
+        <item>HSPAP</item>
+        <item>HSPA</item>
+        <item>HSUPA</item>
+        <item>HSDPA</item>
+        <item>UMTS</item>
+        <item>EDGE</item>
+        <item>GPRS</item>
+        <item>eHRPD</item>
+        <item>EVDO_B</item>
+        <item>EVDO_A</item>
+        <item>EVDO_0</item>
+        <item>1xRTT</item>
+        <item>IS95B</item>
+        <item>IS95A</item>
+    </string-array>
     <!-- MVNO Info used in APN editor -->
     <string-array name="mvno_type_entries">
         <item>Dim</item>
@@ -251,13 +277,18 @@
         <item>GID</item>
     </string-array>
     <!-- Apps on SD installation location options in ApplicationSettings -->
+    <string-array name="app_install_location_entries">
+        <item>Internal device storage</item>
+        <item>Removable SD card</item>
+        <item>Gadael i\'r system benderfynu</item>
+    </string-array>
     <!-- Do not translate. -->
     <!-- Names of categories of app ops tabs -->
     <string-array name="app_ops_categories">
         <item>Lleoliad</item>
-        <item>Personal</item>
-        <item>Messaging</item>
-        <item>Media</item>
+        <item>Personol</item>
+        <item>Negesu</item>
+        <item>Cyfryngau</item>
         <item>Dyfais</item>
     </string-array>
     <!-- User display names for app ops codes -->
@@ -265,65 +296,65 @@
         <item>coarse location</item>
         <item>fine location</item>
         <item>GPS</item>
-        <item>vibrate</item>
-        <item>read contacts</item>
-        <item>modify contacts</item>
+        <item>dirgrynu</item>
+        <item>darllen cysylltiadau</item>
+        <item>addasu cysylltiadau</item>
         <item>darllen y log galwadau</item>
         <item>addasu\'r log galwadau</item>
-        <item>read calendar</item>
-        <item>modify calendar</item>
-        <item>wi-fi scan</item>
+        <item>darllen y calendr</item>
+        <item>addasu\'r calendr</item>
+        <item>sganio wi-fi</item>
         <item>hysbysiad</item>
         <item>cell scan</item>
         <item>galw ffôn</item>
-        <item>read SMS</item>
-        <item>write SMS</item>
-        <item>receive SMS</item>
-        <item>receive emergency SMS</item>
-        <item>receive MMS</item>
+        <item>darllen SMS</item>
+        <item>ysgrifennu SMS</item>
+        <item>derbyn SMS</item>
+        <item>derbyn SMS brys</item>
+        <item>derbyn MMS</item>
         <item>receive WAP push</item>
         <item>anfon SMS</item>
-        <item>read ICC SMS</item>
+        <item>darllen SMS ICC</item>
         <item>write ICC SMS</item>
         <item>addasu gosodiadau</item>
         <item>draw on top</item>
         <item>access notifications</item>
         <item>camera</item>
-        <item>record audio</item>
-        <item>play audio</item>
-        <item>read clipboard</item>
-        <item>modify clipboard</item>
-        <item>media buttons</item>
-        <item>audio focus</item>
-        <item>master volume</item>
-        <item>voice volume</item>
-        <item>ring volume</item>
-        <item>media volume</item>
+        <item>recordio sain</item>
+        <item>chwarae sain</item>
+        <item>darllen y clipfwrdd</item>
+        <item>addasu\'r clipfwrdd</item>
+        <item>botymau cyfryngau</item>
+        <item>ffocws sain</item>
+        <item>prif uchder sain</item>
+        <item>uchder sain llais</item>
+        <item>uchder sain caniad ffôn</item>
+        <item>uchder sain cyfryngau</item>
         <item>uchder sain larymau</item>
         <item>uchder sain hysbysiadau</item>
-        <item>bluetooth volume</item>
-        <item>keep awake</item>
+        <item>Uchder sain Bluetooth</item>
+        <item>cadw\'n effro</item>
         <item>monitor location</item>
         <item>monitor high power location</item>
-        <item>get usage stats</item>
-        <item>mute/unmute microphone</item>
+        <item>cael ystadegau defnydd</item>
+        <item>distewi/dad-ddistewi\'r meicroffon</item>
         <item>show toast</item>
         <item>project media</item>
         <item>activate VPN</item>
-        <item>write wallpaper</item>
+        <item>ysgrifennu papur wal</item>
         <item>assist structure</item>
         <item>assist screenshot</item>
         <item>read phone state</item>
-        <item>add voicemail</item>
+        <item>ychwanegu lleisbost</item>
         <item>use sip</item>
         <item>process outgoing call</item>
-        <item>fingerprint</item>
-        <item>body sensors</item>
+        <item>ôl bys</item>
+        <item>synwyryddion corff</item>
         <item>read cell broadcasts</item>
         <item>mock location</item>
         <item>read storage</item>
         <item>write storage</item>
-        <item>turn on screen</item>
+        <item>troi sgrin ymlaen</item>
         <item>get accounts</item>
         <item>run in background</item>
         <item>uchder sain hygyrchedd</item>
@@ -333,72 +364,91 @@
         <item>Lleoliad</item>
         <item>Lleoliad</item>
         <item>Lleoliad</item>
-        <item>Vibrate</item>
-        <item>Read contacts</item>
-        <item>Modify contacts</item>
+        <item>Dirgrynu</item>
+        <item>Darllen cysylltiadau</item>
+        <item>Addasu cysylltiadau</item>
         <item>Darllen y log galwadau</item>
         <item>Addasu\'r log galwadau</item>
-        <item>Read calendar</item>
-        <item>Modify calendar</item>
+        <item>Darllen y calendr</item>
+        <item>Addasu\'r calendr</item>
         <item>Lleoliad</item>
         <item>Post notification</item>
         <item>Lleoliad</item>
         <item>Galw ffôn</item>
-        <item>Read SMS/MMS</item>
-        <item>Write SMS/MMS</item>
-        <item>Receive SMS/MMS</item>
-        <item>Receive SMS/MMS</item>
-        <item>Receive SMS/MMS</item>
-        <item>Receive SMS/MMS</item>
+        <item>Darllen SMS/MMS</item>
+        <item>Ysgrifennu SMS/MMS</item>
+        <item>Derbyn SMS/MMS</item>
+        <item>Derbyn SMS/MMS</item>
+        <item>Derbyn SMS/MMS</item>
+        <item>Derbyn SMS/MMS</item>
         <item>Anfon SMS/MMS</item>
-        <item>Read SMS/MMS</item>
-        <item>Write SMS/MMS</item>
+        <item>Darllen SMS/MMS</item>
+        <item>Ysgrifennu SMS/MMS</item>
         <item>Addasu gosodiadau</item>
         <item>Draw on top</item>
         <item>Access notifications</item>
         <item>Camera</item>
-        <item>Record audio</item>
-        <item>Play audio</item>
-        <item>Read clipboard</item>
-        <item>Modify clipboard</item>
-        <item>Media buttons</item>
-        <item>Audio focus</item>
-        <item>Master volume</item>
-        <item>Voice volume</item>
-        <item>Ring volume</item>
-        <item>Media volume</item>
+        <item>Recordio sain</item>
+        <item>Chwarae sain</item>
+        <item>Darllen y clipfwrdd</item>
+        <item>Addasu\'r clipfwrdd</item>
+        <item>Botymau cyfryngau</item>
+        <item>Ffocws sain</item>
+        <item>Prif uchder sain</item>
+        <item>Uchder sain llais</item>
+        <item>Uchder sain caniad ffôn</item>
+        <item>Uchder sain cyfryngau</item>
         <item>Uchder sain larymau</item>
         <item>Uchder sain hysbysiadau</item>
         <item>Bluetooth volume</item>
-        <item>Keep awake</item>
+        <item>Cadw\'n effro</item>
         <item>Lleoliad</item>
         <item>Lleoliad</item>
-        <item>Get usage stats</item>
-        <item>Mute/unmute microphone</item>
+        <item>Cael ystadegau defnydd</item>
+        <item>Distewi/dad-ddistewi\'r meicroffon</item>
         <item>Show toast</item>
         <item>Project media</item>
         <item>Activate VPN</item>
-        <item>Write wallpaper</item>
+        <item>Ysgrifennu papur wal</item>
         <item>Assist structure</item>
         <item>Assist screenshot</item>
         <item>Read phone state</item>
-        <item>Add voicemail</item>
+        <item>Ychwanegu lleisbost</item>
         <item>Use sip</item>
         <item>Process outgoing call</item>
-        <item>Fingerprint</item>
-        <item>Body sensors</item>
+        <item>Ôl bys</item>
+        <item>Synwyryddion corff</item>
         <item>Read cell broadcasts</item>
         <item>Mock location</item>
         <item>Read storage</item>
         <item>Write storage</item>
-        <item>Turn on screen</item>
+        <item>Troi sgrin ymlaen</item>
         <item>Get accounts</item>
         <item>Run in background</item>
         <item>Uchder sain hygyrchedd</item>
     </string-array>
     <!-- Titles for the list of long press timeout options. -->
+    <string-array name="long_press_timeout_selector_titles">
+        <!-- A title for the option for short long-press timeout [CHAR LIMIT=25] -->
+        <item>Byr</item>
+        <!-- A title for the option for medium long-press timeout [CHAR LIMIT=25] -->
+        <item>Canolig</item>
+        <!-- A title for the option for long long-press timeout [CHAR LIMIT=25] -->
+        <item>Hir</item>
+    </string-array>
     <!-- Values for the list of long press timeout options. -->
     <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_typeface_selector_titles">
+        <item>Rhagosodiad</item>
+        <item>Sans-serif</item>
+        <item>Sans-serif condensed</item>
+        <item>Sans-serif monospace</item>
+        <item>Serif</item>
+        <item>Serif monospace</item>
+        <item>Achlysurol</item>
+        <item>Rhedol</item>
+        <item>Priflythrennau bychain</item>
+    </string-array>
     <!-- Values for captioning typeface preference. -->
     <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
     <string-array name="captioning_font_size_selector_titles">
@@ -411,12 +461,12 @@
     <!-- Values for captioning font size preference. -->
     <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
     <string-array name="captioning_edge_type_selector_titles">
-        <item>Default</item>
+        <item>Rhagosodiad</item>
         <item>Dim</item>
-        <item>Outline</item>
+        <item>Amlinell</item>
         <item>Drop shadow</item>
-        <item>Raised</item>
-        <item>Depressed</item>
+        <item>Codwyd</item>
+        <item>Gostyngwyd</item>
     </string-array>
     <!-- Values for captioning character edge type preference. -->
     <!-- Titles for captioning color preference. -->
@@ -437,56 +487,90 @@
     <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
     <!-- Match this with the constants in VpnProfile. -->
     <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+    <string-array name="vpn_types_long">
+        <item>PPTP VPN</item>
+        <item>L2TP/IPSec VPN with pre-shared keys</item>
+        <item>L2TP/IPSec VPN gyda thystysgrifau</item>
+        <item>IPSec VPN with pre-shared keys and Xauth authentication</item>
+        <item>IPSec VPN with certificates and Xauth authentication</item>
+        <item>IPSec VPN with certificates and hybrid authentication</item>
+    </string-array>
     <!-- Match this with the constants in LegacyVpnInfo. -->
     <!-- Status for a VPN network. [CHAR LIMIT=100] -->
     <string-array name="vpn_states">
         <!-- Status message when VPN is disconnected. -->
         <item>Heb gysylltu</item>
         <!-- Status message when VPN is initializing. -->
-        <item>Initializing\u2026</item>
+        <item>Yn ymgychwyn\u2026</item>
         <!-- Status message when VPN is connecting. -->
-        <item>Connecting\u2026</item>
+        <item>Yn cysylltu\u2026</item>
         <!-- Status message when VPN is connected. -->
-        <item>Connected</item>
+        <item>Wedi cysyllltu</item>
         <!-- Status message when VPN is timeout. -->
         <item>Timeout</item>
         <!-- Status message when VPN is failed. -->
-        <item>Unsuccessful</item>
+        <item>Aflwyddiannus</item>
     </string-array>
     <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
     <!-- Values for user content ratings for restricted users -->
     <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
     <string-array name="security_settings_premium_sms_values">
         <!-- Ask user before sending to premium SMS short code. -->
-        <item>Ask</item>
+        <item>Gofyn</item>
         <!-- Never allow app to send to premium SMS short code. -->
         <item>Caniatáu Byth</item>
         <!-- Always allow app to send to premium SMS short code. -->
         <item>Caniatáu Bob Tro</item>
     </string-array>
     <!-- [CHAR LIMIT=40] Labels for memory states -->
+    <string-array name="ram_states">
+        <!-- Normal desired memory state. -->
+        <item>Arferol</item>
+        <!-- Moderate memory state, not as good as normal. -->
+        <item>Cymedrol</item>
+        <!-- Memory is running low. -->
+        <item>Isel</item>
+        <!-- Memory is critical. -->
+        <item>Critigol</item>
+        <!-- Unknown memory state -->
+        <item>\?</item>
+    </string-array>
     <!-- Display color space adjustment modes for accessibility -->
     <!-- Values for display color space adjustment modes for accessibility -->
     <!-- Battery saver mode: allowable trigger threshold levels. -->
     <!-- Process stats memory use details: labels for memory states -->
+    <string-array name="proc_stats_memory_states">
+        <item>Arferol</item>
+        <item>Cymedrol</item>
+        <item>Isel</item>
+        <item>Critigol</item>
+    </string-array>
     <!-- Process stats memory use details: labels for process -->
     <string-array name="proc_stats_process_states">
         <item>Persistent</item>
         <item>Top activity</item>
-        <item>Important (foreground)</item>
-        <item>Important (background)</item>
+        <item>Pwysig (blaendir)</item>
+        <item>Pwysig (cefndir)</item>
         <item>Copi wrth gefn</item>
         <item>Heavy weight</item>
-        <item>Service (running)</item>
-        <item>Service (restarting)</item>
+        <item>Gwasanaeth (yn rhedeg)</item>
+        <item>Gwasanaeth (ailddechrau)</item>
         <item>Receiver</item>
         <item>Cartref</item>
-        <item>Last activity</item>
+        <item>Gweithred ddiwethaf</item>
         <item>Cached (activity)</item>
         <item>Cached (activity client)</item>
         <item>Cached (empty)</item>
     </string-array>
     <!-- Array of titles for sim color for multi-sim -->
+    <string-array name="color_picker">
+        <item>Glaswyrdd</item>
+        <item>Glas</item>
+        <item>Indigo</item>
+        <item>Porffor</item>
+        <item>Pinc</item>
+        <item>Coch</item>
+    </string-array>
     <!-- Automatic storage management settings. The amount of days for the automatic storage manager
          to retain. These are shown in a list dialog. [CHAR LIMIT=70] -->
     <string-array name="automatic_storage_management_days">
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index de402bb4eeea46221821a370a98aa0ae07bf1c52..62efc30ae4c24344d0f4ccbb167924a187dd3b25 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -22,20 +22,31 @@
     <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
     <!-- Hardware info -->
     <!-- Label for device's hardware platform value [CHAR LIMIT=40] -->
+    <string name="platform_revision">Platfform</string>
     <!-- Label for device's hardware ram size [CHAR LIMIT=40] -->
     <string name="total_ram">Cyfanswm RAM</string>
     <!-- Launch Dev Tools -->
     <!-- Advanced restart options -->
     <string name="advanced_reboot_title">Ailgychwyn arbennig</string>
     <!-- Setting checkbox title for root access -->
+    <string name="root_access">Mynediad craidd</string>
+    <string name="root_access_warning_title">Caniatáu mynediad craidd?</string>
+    <string name="root_access_warning_message">Mae caniatáu i apiau gael mynediad craidd yn hynod beryglus a gall peryglu diogelwch dy ddyfais!</string>
+    <string name="root_access_none">Dim</string>
+    <string name="root_access_apps">Apiau yn unig</string>
+    <string name="root_access_adb">ADB yn unig</string>
+    <string name="root_access_all">Apiau ac ADB</string>
     <!-- Preference link for root appops -->
     <!-- Double tap to sleep on status bar or lockscreen -->
     <string name="status_bar_double_tap_to_sleep_title">Tara i gysgu</string>
     <!-- Touchscreen gesture settings -->
     <!-- Proximity wake -->
     <!-- Whether the keyguard will directly show the password entry -->
+    <string name="lock_directly_show_password_summary">Neidio\'r sgrin llithro i ddatgloi a dechrau yn hytrach gyda\'r sgrin cyfrinair yn syth</string>
     <!-- Whether the keyguard will directly show the pattern view -->
+    <string name="lock_directly_show_pattern_summary">Neidio\'r sgrin llithro i ddatgloi a dechrau yn hytrach gyda\'r sgrin patrwm yn syth</string>
     <!-- Whether the keyguard will directly show the PIN entry -->
+    <string name="lock_directly_show_pin_summary">Neidio\'r sgrin llithro i ddatgloi a dechrau yn hytrach gyda\'r sgrin PIN yn syth</string>
     <!-- PIN scramble -->
     <!-- Lock screen visualizer -->
     <!-- Lock screen cover art -->
@@ -43,57 +54,147 @@
     <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
     <!-- Whether the dots will be drawn when using the lockscreen pattern -->
     <!-- Lock screen vibrate settings -->
+    <string name="lockscreen_vibrate_enabled_title">Dirgrynu</string>
     <!-- Android debugging -->
+    <string name="adb_enable">Dadfygio Android</string>
     <!-- Android debugging notification -->
     <!-- Android debugging over network -->
+    <string name="adb_over_network">ADB dros rwydwaith</string>
+    <string name="adb_over_network_summary">Galluogi dadfygio TCP/IP dros ryngwynebau rhwydwaith (Wi\u2011Fi, rhwydweithiau USB). Mae\'r gosodiad yn cael ei ail-osod wrth ail-gychwyn y ddyfais.</string>
+    <string name="adb_over_network_warning">RHYBUDD: Tra bod ADB dros rwydwaith wedi\'i alluogi, mae dy ffôn ar gael ac yn agor i ymyrraeth ar bob rhwydwaith mae wedi cysylltu â nhw!\n\nDefnyddia\'r nodwedd hon dim ond pan wyt wedi cysylltu â rhwydweithiau rwyt yn ymddiried ynddynt.\n\nWyt ti wir eisiau parhau i alluogi\'r nodwedd hon?</string>
     <!-- Kill app long-press back -->
     <!-- Format string for fingerprint location message -->
     <!-- Fingerprint sensor locations -->
     <string name="security_settings_fingerprint_sensor_location_back">nôl</string>
+    <string name="security_settings_fingerprint_sensor_location_front">blaen</string>
+    <string name="security_settings_fingerprint_sensor_location_left">ochr chwith</string>
+    <string name="security_settings_fingerprint_sensor_location_right">ochr dde</string>
     <!-- Hostname setting -->
     <!-- Increasing ring tone volume -->
+    <string name="increasing_ring_volume_option_title">Uchder sain yn cynyddu</string>
+    <string name="increasing_ring_min_volume_title">Sain dechreuol</string>
     <!-- Volume link notification -->
     <!-- Memory -->
     <!-- Manual provisioning support -->
+    <string name="sim_enabler_will_disable_sim_title">Sylw</string>
     <string name="sim_enabler_need_switch_data_service">Caiff y SIM hwn ei analluogi a defnyddir SIM <xliff:g id="slotid">%1$s</xliff:g> ar gyfer gwasanaethau data. Wyt ti am barhau?</string>
     <string name="sim_enabler_airplane_on">Nid yw\'n bosib cyflawni\'r dasg tra ym modd awyren.</string>
     <string name="sim_enabler_in_call">Nid yw\'n bosib cyflawni\'r dasg tra bod galwad ar y gweill.</string>
+    <string name="sim_enabler_enabling">Yn rhoi ar waith\u2026</string>
+    <string name="sub_activate_failed">Methwyd â\'i roi ar waith.</string>
     <!-- Names of categories of app ops tabs - extension of AOSP -->
+    <string name="app_ops_categories_location">Lleoliad</string>
+    <string name="app_ops_categories_personal">Personol</string>
+    <string name="app_ops_categories_messaging">Negesu</string>
+    <string name="app_ops_categories_media">Cyfryngau</string>
+    <string name="app_ops_categories_device">Dyfais</string>
     <string name="app_ops_categories_run_in_background">Rhedeg yn y cefndir</string>
+    <string name="app_ops_categories_su">Mynediad craidd</string>
+    <string name="app_ops_categories_other">Arall</string>
     <!-- User display names for app ops codes - extension of AOSP -->
+    <string name="app_ops_summaries_fine_location">lleoliad union</string>
+    <string name="app_ops_summaries_vibrate">dirgrynu</string>
+    <string name="app_ops_summaries_read_contacts">darllen cysylltiadau</string>
+    <string name="app_ops_summaries_read_call_log">darllen y cofnod galwadau</string>
+    <string name="app_ops_summaries_read_calendar">darllen y calendr</string>
     <string name="app_ops_summaries_wifi_scan">Sganio wi-fi</string>
     <string name="app_ops_summaries_call_phone">galw ffôn</string>
+    <string name="app_ops_summaries_read_sms">darllen SMS</string>
     <string name="app_ops_summaries_write_sms">ysgrifennu SMS</string>
+    <string name="app_ops_summaries_receive_sms">derbyn SMS</string>
+    <string name="app_ops_summaries_receive_mms">derbyn MMS</string>
+    <string name="app_ops_summaries_send_sms">anfon SMS</string>
+    <string name="app_ops_summaries_read_icc_sms">darllen SMS ICC</string>
     <string name="app_ops_summaries_camera">camera</string>
+    <string name="app_ops_summaries_record_audio">recordio sain</string>
+    <string name="app_ops_summaries_media_buttons">botymau cyfryngau</string>
+    <string name="app_ops_summaries_audio_focus">ffocws sain</string>
+    <string name="app_ops_summaries_master_volume">prif uchder sain</string>
     <string name="app_ops_summaries_voice_volume">uchder sain llais</string>
+    <string name="app_ops_summaries_ring_volume">uchder sain caniad ffôn</string>
+    <string name="app_ops_summaries_media_volume">uchder sain cyfryngau</string>
+    <string name="app_ops_summaries_alarm_volume">uchder sain larwm</string>
     <string name="app_ops_summaries_mute_unmute_microphone">distewi/dad-ddistewi\'r meicroffon</string>
+    <string name="app_ops_summaries_project_media">taflunio cyfryngau</string>
+    <string name="app_ops_summaries_activate_vpn">rhoi VPN ar waith</string>
     <string name="app_ops_summaries_write_wallpaper">ysgrifennu papur wal</string>
+    <string name="app_ops_summaries_add_voicemail">ychwanegu lleisbost</string>
+    <string name="app_ops_summaries_use_sip">defnyddio SIP</string>
+    <string name="app_ops_summaries_make_call">gwneud galwad</string>
     <string name="app_ops_summaries_use_fingerprint">defnyddio ôl bys</string>
     <string name="app_ops_summaries_use_body_sensors">defnyddio synwyryddion corff</string>
+    <string name="app_ops_summaries_mock_location">ffugio lleoliad</string>
+    <string name="app_ops_summaries_turn_screen_on">troi\'r sgrin ymlaen</string>
+    <string name="app_ops_summaries_get_accounts">cael cyfrifon</string>
     <string name="app_ops_summaries_run_in_background">rhedeg yn y cefndir</string>
+    <string name="app_ops_summaries_accessibility_volume">uchder sain hygyrchedd</string>
+    <string name="app_ops_summaries_read_phone_numbers">darllen rhifau ffôn</string>
+    <string name="app_ops_summaries_request_install_packages">gofyn i weld pecynnau gosod</string>
     <string name="app_ops_summaries_picture_in_picture">defnyddio llun o fewn llun</string>
+    <string name="app_ops_summaries_answer_phone_calls">ateb galwadau ffôn</string>
     <string name="app_ops_summaries_toggle_wifi">toglo Wi-Fi</string>
     <string name="app_ops_summaries_toggle_bluetooth">toglo Bluetooth</string>
     <string name="app_ops_summaries_toggle_mobile_data">toglo data symudol</string>
+    <string name="app_ops_summaries_superuser">mynediad craidd</string>
     <!-- User display names for app ops codes - extension of AOSP -->
+    <string name="app_ops_labels_fine_location">Lleoliad union</string>
+    <string name="app_ops_labels_vibrate">Dirgrynu</string>
+    <string name="app_ops_labels_read_contacts">Darllen cysylltiadau</string>
+    <string name="app_ops_labels_read_call_log">Darllen y log galwadau</string>
+    <string name="app_ops_labels_read_calendar">Darllen y calendr</string>
     <string name="app_ops_labels_wifi_scan">Sganio wi-fi</string>
     <string name="app_ops_labels_call_phone">Galw ffôn</string>
+    <string name="app_ops_labels_read_sms">Darllen SMS</string>
     <string name="app_ops_labels_write_sms">Ysgrifennu SMS</string>
+    <string name="app_ops_labels_receive_sms">Derbyn SMS</string>
+    <string name="app_ops_labels_receive_mms">Derbyn MMS</string>
+    <string name="app_ops_labels_send_sms">Anfon SMS</string>
+    <string name="app_ops_labels_read_icc_sms">Darllen SMS ICC</string>
     <string name="app_ops_labels_camera">Camera</string>
+    <string name="app_ops_labels_record_audio">Recordio sain</string>
+    <string name="app_ops_labels_read_clipboard">Darllen y clipfwrdd</string>
+    <string name="app_ops_labels_media_buttons">Botymau cyfryngau</string>
+    <string name="app_ops_labels_audio_focus">Ffocws sain</string>
+    <string name="app_ops_labels_master_volume">Prif uchder sain</string>
     <string name="app_ops_labels_voice_volume">Uchder sain llais</string>
+    <string name="app_ops_labels_ring_volume">Uchder sain caniad ffôn</string>
+    <string name="app_ops_labels_media_volume">Uchder sain cyfryngau</string>
+    <string name="app_ops_labels_alarm_volume">Uchder sain larwm</string>
+    <string name="app_ops_labels_project_media">Taflunio cyfryngau</string>
+    <string name="app_ops_labels_activate_vpn">Rhoi VPN ar waith</string>
     <string name="app_ops_labels_write_wallpaper">Ysgrifennu papur wal</string>
+    <string name="app_ops_labels_add_voicemail">Ychwanegu lleisbost</string>
+    <string name="app_ops_labels_use_sip">Defnyddio SIP</string>
+    <string name="app_ops_labels_make_call">Gwneud galwad</string>
     <string name="app_ops_labels_use_fingerprint">Defnyddio ôl bys</string>
     <string name="app_ops_labels_use_body_sensors">Defnyddio synwyryddion corff</string>
+    <string name="app_ops_labels_mock_location">Ffugio lleoliad</string>
+    <string name="app_ops_labels_turn_screen_on">Troi\'r sgrin ymlaen</string>
+    <string name="app_ops_labels_get_accounts">Cael cyfrifon</string>
     <string name="app_ops_labels_run_in_background">Rhedeg yn y cefndir</string>
+    <string name="app_ops_labels_read_phone_numbers">Darllen rhifau ffôn</string>
+    <string name="app_ops_labels_request_install_packages">Gofyn i weld pecynnau gosod</string>
     <string name="app_ops_labels_picture_in_picture">Defnyddio llun o fewn llun</string>
+    <string name="app_ops_labels_answer_phone_calls">Ateb galwadau ffôn</string>
     <string name="app_ops_labels_toggle_wifi">Toglo Wi-Fi</string>
     <string name="app_ops_labels_toggle_bluetooth">Toglo Bluetooth</string>
     <string name="app_ops_labels_toggle_mobile_data">Toglo data symudol</string>
+    <string name="app_ops_labels_superuser">Mynediad craidd</string>
     <!-- App ops permissions -->
+    <string name="app_ops_permissions_allowed">Caniateir</string>
+    <string name="app_ops_permissions_ignored">Anwybyddwyd</string>
+    <string name="app_ops_permissions_always_ask">Gofyn pob tro</string>
     <!-- App ops detail -->
+    <string name="app_ops_allowed_count">Caniateir <xliff:g id="count" example="2 times">%s</xliff:g></string>
+    <string name="app_ops_both_count">Caniateir <xliff:g id="count">%1$s</xliff:g>, gwrthodwyd <xliff:g id="count">%2$s</xliff:g></string>
     <!-- App ops menu options -->
+    <string name="app_ops_show_user_apps">Dangos apiau defnyddiwr</string>
+    <string name="app_ops_reset_counters">Ailosod rhifyddion caniatáu/gwrthod</string>
+    <string name="app_ops_reset_confirm_mesg">Wyt ti\'n bendant eisiau ailosod rhifyddion?</string>
     <string name="ok">Iawn</string>
+    <string name="security_privacy_settings_title">Diogelwch a phreifatrwydd</string>
     <!-- LineageOS legal -->
+    <string name="lineagelicense_title">Cyfreithiol LineageOS</string>
     <!-- Volume settings - Volume adjustment sound -->
     <!-- Wake on plug -->
     <string name="wake_when_plugged_or_unplugged_title">Deffro wrth gysylltu â phŵer</string>
@@ -101,5 +202,8 @@
     <!-- High touch sensitivity -->
     <!-- Touchscreen hovering -->
     <!-- Per-app data restrictions -->
+    <string name="data_usage_app_restrict_data">Data symudol</string>
+    <string name="data_usage_app_restrict_data_summary">Galluogi defnydd data symudol</string>
     <string name="data_usage_app_restrict_wifi">Data Wi\u2011Fi</string>
+    <string name="data_usage_app_restrict_wifi_summary">Galluogi defnydd data Wi\u2011Fi</string>
 </resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index c34d85c6ddfb164c4c6667ba4868705c0fb42145..4f4e2d0dc4e4d8e8ace6a418e3396723ac10abe8 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -17,23 +17,38 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Strings for Dialog yes button -->
     <!-- Strings for Dialog no button -->
+    <string name="no">"Na"</string>
     <!-- Strings for Dialog create button -->
+    <string name="create">Creu</string>
     <!-- Strings for Dialog allow button -->
     <string name="allow">Caniatáu</string>
     <!-- Strings for Dialog deny button -->
+    <string name="deny">Gwrthod</string>
     <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
     <string name="dlg_close">Cau</string>
     <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
     <!-- Device Info -->
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+    <string name="device_info_default">Anhysybys</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+    <plurals name="show_dev_countdown">
+        <item quantity="zero">Rwyt nawr <xliff:g id="step_count">%1$d</xliff:g> camau i ffwrdd o gael mynediad datblygwr.</item>
+        <item quantity="one">Rwyt nawr <xliff:g id="step_count">%1$d</xliff:g> cam i ffwrdd o gael mynediad datblygwr.</item>
+        <item quantity="two">Rwyt nawr <xliff:g id="step_count">%1$d</xliff:g> gam i ffwrdd o gael mynediad datblygwr.</item>
+        <item quantity="few">Rwyt nawr <xliff:g id="step_count">%1$d</xliff:g> cam i ffwrdd o gael mynediad datblygwr.</item>
+        <item quantity="many">Rwyt nawr <xliff:g id="step_count">%1$d</xliff:g> cham i ffwrdd o gael mynediad datblygwr.</item>
+        <item quantity="other">Rwyt nawr <xliff:g id="step_count">%1$d</xliff:g> cam i ffwrdd o gael mynediad datblygwr.</item>
+    </plurals>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+    <string name="show_dev_on">Rwyt bellach â mynediad fel datblygwr!</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+    <string name="show_dev_already">Dim angen; rwyt eisoes yn ddatblygwr.</string>
     <!-- [CHAR LIMIT=NONE] Toast message when user attemps to launch developer otions before enabling it. -->
     <!-- Category headings in left-pane header menu -->
     <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
     <string name="header_category_wireless_networks">Di-wifr a rhwydweithiau</string>
     <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+    <string name="header_category_connections">Cysylltiadau</string>
     <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
     <string name="header_category_device">Dyfais</string>
     <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
@@ -41,6 +56,7 @@
     <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
     <string name="header_category_access">Mynediad</string>
     <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+    <string name="header_category_system">System</string>
     <!-- Data Connection Enable. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="radio_info_data_connection_enable">Galluogi Cysylltiad Data</string>
     <!-- Data Connection Disable. Only shown in diagnostic screen, so precise translation is not needed. -->
@@ -66,7 +82,9 @@
     <!-- Phone Info screen. Ims Status - Unregistered.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_ims_reg_status_not_registered">Heb Gofrestru</string>
     <!-- Phone Info screen. Ims Feature Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_ims_feature_status_available">Ar gael</string>
     <!-- Phone Info screen. Ims Feature status label.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_ims_feature_status_unavailable">Dim ar gael</string>
     <!-- Phone Info screen. IMS Registration.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_ims_reg_status">Cofrestriad IMS: <xliff:g id="status" example="registered">%1$s</xliff:g>\u000ALlais dros LTE: <xliff:g id="availability" example="available">%2$s</xliff:g>\u000ALlais dros WiFi: <xliff:g id="availability" example="available">%3$s</xliff:g>\u000AGalwadau fideo: <xliff:g id="availability" example="available">%4$s</xliff:g>\u000ARhyngwyneb UT:<xliff:g id="availability" example="available">%5$s</xliff:g></string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -78,23 +96,35 @@
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_service_off">Radio wedi\'i Diffodd</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_roaming_in">Crwydro</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_roaming_not">Dim yn Crwydro</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_phone_idle">Segur</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_phone_offhook">Galwad ar y Gweill</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_data_disconnected">Wedi datgysylltu</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_data_connecting">Yn cysylltu</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_data_connected">Wedi cysyllltu</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <!-- Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_unknown">Anhysybys</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_display_packets">pkts</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_display_bytes">beitiau</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_display_dbm">dBm</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_display_asu">asu</string>
     <!-- Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_lac">LAC</string>
     <!-- Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_cid">CID</string>
     <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
     <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
     <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
@@ -113,30 +143,28 @@
     <string name="font_size_make_larger_desc">Gwneud yn fwy</string>
     <!-- Sample text for font size preview. -->
     <string name="font_size_preview_text_headline">Testun enghreifftiol</string>
-    <string name="font_size_preview_text_title" translation_description="Title text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">        Pedeir Keinc y Mabinogi
+    <string name="font_size_preview_text_title" translation_description="Title text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">        Llyfr Gwyn Rhydderch
     </string>
-    <string name="font_size_preview_text_subtitle" translation_description="Subtitle text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">Pwyll a Riannon</string>
-    <string name="font_size_preview_text_body" translation_description="Text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">        Sewyll ac arhos a oruc y uorwyn, a gwaret y rann a dylyei uot am y hwyneb o wisc y phenn, ac attal y golwc arnaw, a dechrau ymdidan ac ef.\n
-        ‘Arglwydes,’ heb ef, ‘pan doy di, a pha gerdet yssyd arnat ti?’\n
-        ‘Kerdet wrth uy negesseu,’ heb hi, ‘a da yw gennyf dy welet ti.’\n
-        ‘Crassaw wrthyt y gennyf i,’ heb ef.\n
-        Ac yna medylyaw a wnaeth bot yn diuwyn ganthaw pryt a welsei o uorwyn eiroet, a gwreic, y wrth y ffryt hi.\n
-        ‘Arglwydes,’ heb ef, ‘a dywedy di ymi dim o’th negesseu?’\n
-        ‘Dywedaf, y rof a Duw,’ heb hi, ‘Pennaf neges uu ymi, keissaw dy welet ti.’\n
-        ‘Llyna,’ heb y Pwyll, ‘y neges oreu gennyf i dy dyuot ti idi. Ac y dywedy di ymi pwy wyt?’\n
-        ‘Dywedaf, arglwyd,’ heb hi. ‘Riannon, uerch Heueyd Hen, wyf i, a’m rodi y wyr o’m hanwod yd ydys. Ac ny mynneis innheu un gwr, a hynny o’th garyat ti. Ac nys mynnaf etwa, onyt ti a’m gwrthyt. Ac e wybot dy attep di am hynny e deuthum i.’\n
-        ‘Rof i a Duw,’ heb ynteu Pwyll, ‘llyna uy attep i iti, pei caffwn dewis ar holl wraged a morynnyon y byt, y mae ti a dewisswn.’\n
-        ‘Ie,’ heb hitheu, ‘os hynny a uynny, kyn uy rodi y wr arall, gwna oed a mi.’\n
-        ‘Goreu yw gennyf i,’ heb y Pwyll, ‘bo kyntaf; ac yn y lle y mynnych ti, gwna yr oet.’\n
-        ‘Gwnaf, arglwyd,’ heb hi. ‘Blwydyn y heno, yn llys Heueyd, mi a baraf bot gwled darparedic yn barawt erbyn dy dyuot.’\n
-        ‘Yn llawen,’ heb ynteu, ‘a mi a uydaf yn yr oet hwnnw.’\n
-        ‘Arlwyd,’ heb hi, ‘tric yn iach, a choffa gywiraw dy edewit, ac e ymdeith yd af i.’\n
-        A guahanu a wnaethont, a chyrchu a wnaeth ef parth a’u teulu a’u niuer. Pa ymouyn bynnac a uei ganthunt wy y wrth y uorwyn, y chwedleu ereill y trossei ynteu.    </string>
+    <string name="font_size_preview_text_subtitle" translation_description="Subtitle text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">        Ail Gainc y Mabinogi</string>
+    <string name="font_size_preview_text_body" translation_description="Text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">        ...\n
+        Bendigeiduran a doeth ẏ r tir a llẏnghes ẏ gẏt ac ef parth a glann ẏr auon.\n
+        \"arglỽẏd\" heb ẏ ỽẏrda \"ti a ỽdost kẏnnedẏf ẏr auon. nẏ eill neb uẏnet drỽẏdi. nẏt oes bont arnei hitheu. Mae dẏ gẏnghor am bont\" heb ỽẏ.\n
+        \"Nit oes\" heb ẏnteu \"namẏn a uo penn bit pont. Mi a uẏdaf pont\" heb ef.\n
+ac ẏna gẏntaf ẏ dẏỽetpỽẏt ẏ geir hỽnnỽ ac ẏ diharebir etỽa ohonaỽ.\n
+        ac ẏna guedẏ gorỽed ohonaỽ ef ar traỽs ẏr auon ẏ bẏrỽẏt clỽẏdeu arnaỽ ef. ac ẏd aeth ẏ luoed ef ar ẏ draỽs ef drỽod. ar hẏnnẏ gẏt ac ẏ kẏuodes ef. llẏma gennadeu matholỽch ẏn dẏuot attaỽ ef ac ẏn kẏuarch guell idaỽ. ac ẏn ẏ annerch ẏ gan uatholỽch ẏ gẏua thrachỽr ac ẏn menegi o e uod ef na haedei arnaỽ ef namẏn da.\n
+        \"ac ẏ mae matholỽch ẏn rodi brenhinaeth iỽerdon ẏ ỽern uab matholỽch dẏ nei ditheu uab dẏ chỽaer ac ẏn ẏ ẏstẏnnu ẏ th ỽẏd di ẏn lle ẏ cam a r codẏant a ỽnaethpỽẏt ẏ uranỽen. ac ẏn ẏ lle ẏ mẏnnẏch ditheu aẏ ẏma aẏ ẏn ẏnẏs ẏ kedẏrn gossẏmdeitha uatholỽch.\"\n
+        \"Je\" heb ẏnteu uendigeiduran \"onẏ allaf i ue hun cael ẏ urenhinaeth. ac aduẏd ẏs kẏmeraf gẏnghor am ẏch kennadỽri chỽi. O hẏn hẏt ban del amgen nẏ cheffỽch ẏ genhẏf i attep.\"\n
+        \"Je\" heb ỽẏnteu \"ẏr atteb goreu a gaffom ninheu attat ti ẏ doỽn ac ef ac aro ditheu ẏn kennadỽri ninheu.\"\n
+        \"arhoaf\" heb ef \"o doỽch ẏn ehegẏr\"\n
+        ...</string>
     <!-- Button. Chosen when they want to save the chosen text size. -->
     <string name="font_size_save">Iawn</string>
     <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+    <string name="sdcard_setting" product="nosdcard">Storfa USB</string>
     <!-- Title for a notification shown. -->
+    <string name="sdcard_setting" product="default">Cerdyn SD</string>
     <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+    <string name="bluetooth">Bluetooth</string>
     <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
     <string name="bluetooth_is_discoverable">Yn weladwy i ddyfeisiau Bluetooth gerllaw (<xliff:g id="discoverable_time_period">%1$s</xliff:g>)</string>
     <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
@@ -144,6 +172,7 @@
     <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
     <string name="bluetooth_not_visible_to_other_devices">Dim i\'w gweld gan ddyfeisiau Bluetooth eraill</string>
     <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+    <string name="bluetooth_only_visible_to_paired_devices">Dim ond yn weladwy i ddyfeisiau wedi\'u paru</string>
     <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
     <!-- Bluetooth settings screen, check box label whether or not to allow
         bluetooth voice dialing when lock screen is up-->
@@ -165,12 +194,17 @@
     <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
     <string name="bluetooth_rename_button">Ailenwi</string>
     <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+    <string name="bluetooth_disconnect_title">Datgysylltu\'r ddyfais?</string>
     <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles" product="default">Bydd dy ffôn yn datgysylltu o \"<xliff:g id="device_name">%1$s</xliff:g>.\"</string>
     <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles" product="tablet">Bydd dy lechen yn datgysylltu o \"<xliff:g id="device_name">%1$s</xliff:g>.\"</string>
     <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles" product="device">Bydd dy ddyfais yn datgysylltu o \"<xliff:g id="device_name">%1$s</xliff:g>.\"</string>
     <!-- dialog ok button for disconnect dialog [CHAR LIMIT=20] -->
     <string name="bluetooth_disconnect_dialog_ok">Datgysylltu</string>
     <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+    <string name="bluetooth_empty_list_user_restricted">Nid oes gennyt ganiatâd i addasu gosodiadau Bluetooth.</string>
     <!-- Title for bluetooth pairing item [CHAR LIMIT=60] -->
     <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
     <string name="bluetooth_is_visible_message">Mae <xliff:g id="device_name">%1$s</xliff:g> yn weladwy i ddyfeisiau gerllaw tra bod gosodiadau Bluetooth ar agor.</string>
@@ -181,74 +215,127 @@
     <!-- Bluetooth mac address message.  This message shows the bluetooth mac address for this device.  [CHAR LIMIT=120] -->
     <string name="bluetooth_footer_mac_message" product="device">Cyfeiriad Bluetooth y ddyfais: <xliff:g id="bluetooth_mac_address">%1$s</xliff:g></string>
     <!-- Bluetooth Visibility disconnect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+    <string name="bluetooth_is_disconnect_question">Datgysylltu <xliff:g id="device_name">%1$s</xliff:g>?</string>
     <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+    <string name="bluetooth_broadcasting">Darlledu</string>
     <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+    <string name="bluetooth_disable_profile_title">Analluogi\'r proffil?</string>
     <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disable_profile_message">Bydd hyn yn analluogi:&lt;br&gt;&lt;b&gt;<xliff:g id="profile_name">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Oddi wrth:&lt;br&gt;&lt;b&gt;<xliff:g id="device_name">%2$s</xliff:g>&lt;/b&gt;</string>
     <!-- Bluetooth settings.  Message when the device state is unknown -->
     <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+    <string name="bluetooth_device">Dyfais Bluetooth dienw</string>
     <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+    <string name="progress_scanning">Yn chwilio</string>
     <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+    <string name="bluetooth_no_devices_found">Ni chanfuwyd unrhyw ddyfeisiau Bluetooth cyfagos.</string>
     <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+    <string name="bluetooth_notif_ticker">Cais paru Bluetooth</string>
     <!-- Notification title when a Bluetooth device wants to pair with us -->
+    <string name="bluetooth_notif_title">Cais paru</string>
     <!-- Notification message when a Bluetooth device wants to pair with us -->
     <string name="bluetooth_notif_message">Tara i baru gyda <xliff:g id="device_name">%1$s</xliff:g>.</string>
     <!-- Item in bluetooth settings screen, used to show the list of received files [CHAR LIMIT=30] -->
+    <string name="bluetooth_show_received_files">Ffeiliau a dderbyniwyd</string>
     <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+    <string name="device_picker">Dewisa ddyfais Bluetooth</string>
     <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+    <string name="bluetooth_ask_enablement">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau troi Bluetooth ymlaen</string>
     <!-- This string asks the user whether or not to allow an app to disable bluetooth. [CHAR LIMIT=100] -->
+    <string name="bluetooth_ask_disablement">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau troi Bluetooth i ffwrdd</string>
     <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+    <string name="bluetooth_ask_enablement_no_name">Mae ap eisiau troi Bluetooth ymlaen</string>
     <!-- This string asks the user whether or not to allow an app to disable bluetooth. [CHAR LIMIT=100] -->
+    <string name="bluetooth_ask_disablement_no_name">Mae ap eisiau troi Bluetooth i ffwrdd</string>
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_discovery" product="tablet">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%2$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_discovery" product="default">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%2$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_discovery_no_name" product="tablet">Mae ap eisiau gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%1$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_discovery_no_name" product="default">Mae ap eisiau gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%1$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_lasting_discovery" product="tablet">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yn y gosodiadau Bluetooth.</string>
     <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_lasting_discovery" product="default">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yn y gosodiadau Bluetooth.</string>
     <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet">Mae ap eisiau gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yng ngosodiadau Bluetooth.</string>
     <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default">Mae ap eisiau gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yng ngosodiadau Bluetooth.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau troi Bluetooth ymlaen a gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%2$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_discovery" product="default">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau troi Bluetooth ymlaen a gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%2$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet">Mae ap eisiau troi Bluetooth ymlaen a gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%1$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default">Mae ap eisiau troi Bluetooth ymlaen a gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%1$d</xliff:g> eiliad.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau troi Bluetooth ymlaen a gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yn y gosodiadau Bluetooth.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau troi Bluetooth ymlaen a gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yn y gosodiadau Bluetooth.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet">Mae ap eisiau troi Bluetooth ymlaen a gwneud dy lechen yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yn y gosodiadau Bluetooth.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default">Mae ap eisiau troi Bluetooth ymlaen a gwneud dy ffôn yn weladwy i ddyfeisiau Bluetooth eraill. Gellir newid hyn yn hwyrach yn y gosodiadau Bluetooth.</string>
     <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+    <string name="bluetooth_turning_on">"Yn troi Bluetooth ymlaen\u2026"</string>
     <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+    <string name="bluetooth_turning_off">"Yn troi Bluetooth i ffwrdd\u2026"</string>
     <!-- Strings for device profile auto connect setting -->
+    <string name="bluetooth_auto_connect">Awto-gysylltu</string>
     <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+    <string name="bluetooth_connection_permission_request">"Cais cysylltiad Bluetooth"</string>
     <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
     <string name="bluetooth_connection_notif_message">"Tara i gysylltu gyda \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022."</string>
     <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+    <string name="bluetooth_connection_dialog_text">"Wyt ti am gysylltu â \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
     <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
     <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+    <string name="bluetooth_pb_acceptance_dialog_text">        Mae <xliff:g id="device_name">%1$s</xliff:g> eisiau medru gweld dy holl gysylltiadau a hanes galwadau. Caniatáu mynediad i <xliff:g id="device_name">%2$s</xliff:g>?
+    </string>
     <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+    <string name="bluetooth_remember_choice">Peidio â gofyn eto</string>
     <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+    <string name="bluetooth_pb_remember_choice">Peidio â gofyn eto</string>
     <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
     <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+    <string name="bluetooth_map_acceptance_dialog_text">Hoffai %1$s gyrchu dy negeseuon. Caniatáu mynediad i %2$s?</string>
     <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
     <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+    <string name="bluetooth_sap_acceptance_dialog_text">Hoffai <xliff:g id="device_name">%1$s</xliff:g> gyrchu dy gerdyn SIM. Bydd caniatáu mynediad i\'r cerdyn SIM yn analluogi cysylltiad data ar dy ddyfais tra bod y cysylltiad yn parhau. Caniatáu mynediad <xliff:g id="device_name">%2$s</xliff:g> i\'r SIM?</string>
     <!-- Description for bluetooth device name summary [CHAR LIMIT=none] -->
     <!-- Title for paired device group [CHAR LIMIT=none] -->
+    <string name="bluetooth_paired_device_title">Dy ddyfeisiau</string>
     <!-- Title for pairing bluetooth device page [CHAR LIMIT=none] -->
     <!-- Date & time settings screen title -->
+    <string name="date_and_time">Dyddiad ac amser</string>
     <!-- The title of the activity to pick a time zone. -->
+    <string name="choose_timezone">Dewisa gylchfa amser</string>
     <!-- Used for diagnostic screens, precise translation is not necessary -->
+    <string name="intent_sender_data_label"><xliff:g id="data">Data:</xliff:g></string>
     <!-- Used for diagnostic screens, precise translation is not necessary -->
     <string name="intent_sender_sendbroadcast_text">Anfon <xliff:g id="broadcast">darllediad</xliff:g></string>
     <!-- Used for diagnostic screens, precise translation is not necessary -->
+    <string name="intent_sender_action_label"><xliff:g id="action">Gweithred</xliff:g>:</string>
     <!-- Used for diagnostic screens, precise translation is not necessary -->
     <!-- Used for diagnostic screens, precise translation is not necessary -->
+    <string name="intent_sender_resource_label"><xliff:g id="resource">Adnodd</xliff:g>: </string>
     <!-- Used for diagnostic screens, precise translation is not necessary -->
+    <string name="intent_sender_account_label">Cyfrif: </string>
     <!-- HTTP proxy settings title -->
+    <string name="proxy_settings_title">Procsi</string>
     <!-- HTTP proxy settings. Button to clear the proxy box. -->
+    <string name="proxy_clear_text">Clirio</string>
     <!-- HTTP proxy settings. The port number label. -->
     <!-- HTTP proxy settings. The exclusion list label. -->
     <!-- HTTP proxy settings. The button to restore the defaults. -->
     <!-- HTTP proxy settings. The button to save. -->
+    <string name="proxy_action_text">Iawn</string>
     <!-- HTTP proxy settings. The text field for the hostname -->
     <!-- HTTP proxy settings. Title if there is an error-->
+    <string name="proxy_error">Sylw</string>
     <!-- HTTP proxy settings. Button to get rid of error box-->
     <string name="proxy_error_dismiss">Iawn</string>
     <!-- HTTP proxy settings. The error if the hostname is not valid -->
@@ -258,6 +345,7 @@
     <!-- HTTP proxy settings. Error msg -->
     <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
     <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+    <string name="proxy_url_title">"PAC URL: "</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_signal_location_label">Cell Location Info (deprecated):</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -271,8 +359,11 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_gprs_service_label">Gwasanaeth Data:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_roaming_label">Crwydro:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_imei_label">IMEI:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, DO NOT TRANSLATE. -->
+    <string name="radio_info_imsi_label">IMSI:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_call_redirect_label">Ailgyfeirio Galwadau:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -310,6 +401,7 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="ping_test_label">Rhedeg Prawf Ping</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_smsc_label">SMSC:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_smsc_update_label">Diweddariad</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -323,23 +415,36 @@
     <!-- Band mode screen.  Loading message. -->
     <string name="band_mode_loading">Yn Llwytho Rhestr Bandiau\u2026</string>
     <!-- Band mode screen. Button caption to set the bandmode. -->
+    <string name="band_mode_set">Gosod</string>
     <!-- Band mode screen. Status message when unsuccessful. -->
+    <string name="band_mode_failed">Aflwyddiannus</string>
     <!-- Band mode screen. Statusm essage when successful. -->
+    <string name="band_mode_succeeded">Llwyddiannus</string>
     <!-- Instructions after the user changes the mass storage settings -->
     <!-- Enable USB mass storage mode checkbox title -->
     <!-- The label for total bytes on SD card -->
+    <string name="sdcard_settings_total_bytes_label">Cyfanswm beitiau:</string>
     <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
     <!-- Message when there is no SD card present -->
+    <string name="sdcard_settings_not_present_status" product="default">Dim cerdyn SD.</string>
     <!-- Th label for the available (free) sapce on the SD card -->
+    <string name="sdcard_settings_available_bytes_label">Beitiau ar gael:</string>
     <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
     <!-- Message when the SD card is being used by the computer as mass storage -->
     <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+    <string name="sdcard_settings_unmounted_status" product="nosdcard">Mae nawr yn ddiogel i ddatgysylltu\'r storfa USB.</string>
     <!-- Message when it is safe to remove the SD card -->
+    <string name="sdcard_settings_unmounted_status" product="default">Mae nawr yn ddiogel i dynnu\'r cerdyn SD allan.</string>
     <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard">Cafodd y storfa USB ei ddatgysylltu tra roedd yn cael ei ddefnyddio!</string>
     <!-- Error message when the SD card was removed without properly unmounting -->
+    <string name="sdcard_settings_bad_removal_status" product="default">Cafodd y cerdyn SD ei dynnu allan tra roedd yn cael ei ddefnyddio!</string>
     <!-- Label for used bytes on the SD card -->
+    <string name="sdcard_settings_used_bytes_label">Beitiau a defnyddiwyd:</string>
     <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+    <string name="sdcard_settings_scanning_status" product="nosdcard">Yn sganio\'r storfa USB am gyfryngau\u2026</string>
     <!-- Message when it is scanning the SD card for new files -->
+    <string name="sdcard_settings_scanning_status" product="default">Yn sganio\'r cerdyn SD am gyfryngau\u2026</string>
     <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
     <!-- Message when the SD card is mounted as read only -->
     <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
@@ -352,6 +457,7 @@
     <!-- Title for the language selection screen [CHAR LIMIT=25] -->
     <string name="pref_title_lang_selection">Dewisiadau ieithoedd</string>
     <!-- Menu item in the locale menu. Will remove the selected locales. [CHAR LIMIT=30] -->
+    <string name="locale_remove_menu">Tynnu</string>
     <!-- "Button" that opens a language picker. The selected language gets added to the language list. [CHAR LIMIT=30] -->
     <string name="add_a_language">Ychwanegu iaith</string>
     <!-- The title of the confirmation dialog shown when the user selects one / several languages and tries to remove them [CHAR LIMIT=60] -->
@@ -382,16 +488,22 @@
     <!-- Label for an accessibility action that removes the currently selected language from the the ordered language list [CHAR LIMIT=20] -->
     <string name="action_drag_label_remove">Tynnu\'r iaith</string>
     <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+    <string name="activity_picker_label">Dewis gweithred</string>
     <!-- Do not translate. -->
     <!-- The title of the activity to see random device info. -->
     <string name="device_info_label">Gwybodaeth am y ddyfais</string>
     <!-- The title of the activity to adjust display settings -->
     <string name="display_label">Sgrin</string>
     <!-- The title of the activity to see phone info -->
+    <string name="phone_info_label" product="tablet">Gwybodaeth y llechen</string>
     <!-- The title of the activity to see phone info -->
+    <string name="phone_info_label" product="default">Gwybodaeth y ffôn</string>
     <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+    <string name="sd_card_settings_label" product="nosdcard">Storfa USB</string>
     <!-- The title of the activity to adjust SD card settings-->
+    <string name="sd_card_settings_label" product="default">Cerdyn SD</string>
     <!-- The title of the activity to adjust proxy settings -->
+    <string name="proxy_settings_label">Gosodiadau procsi</string>
     <!-- ======================================================================================= -->
     <!-- NEW STUFF -->
     <!-- ======================================================================================= -->
@@ -400,9 +512,11 @@
     <!-- Button label for generic OK action [CHAR LIMIT=20] -->
     <string name="okay">Iawn</string>
     <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+    <string name="forget">Anghofio</string>
     <!-- Button label for generic save action [CHAR LIMIT=20] -->
     <string name="save">Cadw</string>
     <!-- Button label for generic done action [CHAR LIMIT=20] -->
+    <string name="done">Iawn</string>
     <!-- Title of the Settings activity shown within the application itself. -->
     <string name="settings_label">Gosodiadau</string>
     <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
@@ -416,14 +530,19 @@
     <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
     <string name="wireless_networks_settings_title">Di-wifr a rhwydweithiau</string>
     <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+    <string name="radio_controls_summary">Rheoli Wi\u2011Fi, Bluetooth, modd awyren, rhwydweithiau symudol, a rhwydweithiau preifat rhithwir (VPN)</string>
     <!-- check box cellular data title [CHAR LIMIT=30] -->
+    <string name="cellular_data_title">Data symudol</string>
     <!-- check box Calls title [CHAR LIMIT=30] -->
     <string name="calls_title">Galwadau</string>
     <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+    <string name="sms_messages_title">Negeseuon SMS</string>
     <!-- check box cellular data summary [CHAR LIMIT=85] -->
+    <string name="cellular_data_summary">Caniatáu defnydd data dros rwydwaith symudol</string>
     <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
     <string name="allow_data_usage_title">Caniatáu defnydd data wrth grwydro tramor</string>
     <!-- mobile network settings screen, setting check box title -->
+    <string name="roaming">Data wrth grwydro</string>
     <!-- mobile network settings screen, setting option summary text when check box is selected -->
     <!-- mobile network settings screen, setting option summary text when check box is clear -->
     <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
@@ -431,16 +550,20 @@
     <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
     <string name="roaming_warning">Mae\'n bosib y bydd costau sylweddol.</string>
     <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+    <string name="roaming_warning_multiuser" product="tablet">Pan wyt ti\'n defnyddio crwydro data mae\'n bosib y bydd costau sylweddol!\n\nMae hyn yn effeithio ar holl ddefnyddwyr y llechen hon.</string>
     <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+    <string name="roaming_warning_multiuser" product="default">Pan wyt ti\'n defnyddio crwydro data mae\'n bosib y bydd costau sylweddol!\n\nMae hyn yn effeithio ar holl ddefnyddwyr y ffôn hwn.</string>
     <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
     <string name="roaming_reenable_title">Caniatáu data crwydro?</string>
     <!-- mobile network settings screen, setting option name -->
     <!-- mobile network settings screen, setting option summary text -->
     <!-- Date and time settings -->
     <!-- Main Settings screen setting option name to go into the date and time settings-->
+    <string name="date_and_time_settings_title">Dyddiad ac amser</string>
     <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
     <string name="date_and_time_settings_title_setup_wizard">Gosod dyddiad ac amser</string>
     <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+    <string name="date_and_time_settings_summary">Gosod dyddiad, amser, cylchfa amser a fformatau</string>
     <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
     <string name="date_time_auto">Dyddiad ac amser awtomatig</string>
     <!-- Date & time setting screen setting option summary text when Automatic check box is selected
@@ -458,49 +581,69 @@
         [CHAR LIMIT=100] -->
     <string name="zone_auto_summaryOff">Defnyddio\'r cylchfa amser gan y rhwydwaith</string>
     <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+    <string name="date_time_24hour_title">Fformat 24\u2011awr</string>
     <!-- Date & time setting screen setting check box title -->
     <string name="date_time_24hour">Defnyddio fformat 24 awr</string>
     <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+    <string name="date_time_set_time_title">Amser</string>
     <!-- Date & time setting screen setting option title -->
+    <string name="date_time_set_time">Gosod yr amser</string>
     <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+    <string name="date_time_set_timezone_title">Cylchfa amser</string>
     <!-- Date & time setting screen setting option title -->
+    <string name="date_time_set_timezone">Dewis cylchfa amser</string>
     <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+    <string name="date_time_set_date_title">Dyddiad</string>
     <!-- Date & time setting screen setting option title -->
+    <string name="date_time_set_date">Gosod y dyddiad</string>
     <!-- Menu item on Select time zone screen -->
     <string name="zone_list_menu_sort_alphabetically">Trefnu yn nhrefn yr wyddor</string>
     <!-- Menu item on Select time zone screen -->
     <!-- Title string shown above DatePicker, letting a user select system date
          [CHAR LIMIT=20] -->
+    <string name="date_picker_title">Dyddiad</string>
     <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
+    <string name="time_picker_title">Amser</string>
     <!-- Security Settings -->
     <!-- Security settings screen, setting option name to change screen timeout -->
     <string name="lock_after_timeout">Cloi yn awtomatig</string>
     <!-- Security settings screen, setting option summary to change screen timeout -->
     <string name="lock_after_timeout_summary"><xliff:g id="timeout_string">%1$s</xliff:g> ar ôl cysgu</string>
     <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+    <string name="lock_immediately_summary_with_exception">Yn syth ar ôl cysgu, oni bai fod <xliff:g id="trust_agent_name">%1$s</xliff:g> yn ei gadw heb ei gloi.</string>
     <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+    <string name="lock_after_timeout_summary_with_exception"><xliff:g id="timeout_string">%1$s</xliff:g> ar ôl cysgu, oni bai fod <xliff:g id="trust_agent_name">%1$s</xliff:g> yn ei gadw heb ei gloi.</string>
     <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
     <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
     <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+    <string name="security_enable_widgets_title">Galluogi teclynnau</string>
     <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
     <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
     <string name="owner_info_settings_summary">Dim</string>
     <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+    <string name="owner_info_settings_status"><xliff:g id="count" example="90">%1$d</xliff:g> / <xliff:g id="count" example="100">%2$d</xliff:g></string>
     <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+    <string name="owner_info_settings_edit_text_hint">E.e. Android Aled.</string>
     <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+    <string name="user_info_settings_title">Gwybodaeth defnyddiwr</string>
     <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+    <string name="show_profile_info_on_lockscreen_label">Dangos gwybodaeth proffil ar y sgrin cloi</string>
     <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+    <string name="profile_info_settings_title">Gwybodaeth proffil</string>
     <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+    <string name="Accounts_settings_title">Cyfrifon</string>
     <!-- Main Settings screen setting option title for the item to take you to the location screen -->
     <string name="location_settings_title">Lleoliad</string>
     <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+    <string name="account_settings_title">Cyfrifon</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
     <string name="security_settings_title">Diogelwch a lleoliad</string>
     <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
     <!-- Security Settings screen Encryption and crendential summary -->
     <!-- Security Settings screen Encryption and crendential summary -->
     <!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] -->
+    <string name="lockscreen_settings_title">Dewisiadau\'r sgrin cloi</string>
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
     <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
     <!-- In the security screen, the header title for settings related to  Passwords-->
@@ -511,30 +654,49 @@
     <!-- Summary for Security settings when fingerprint is not supported [CHAR LIMIT=NONE]-->
     <!-- Fingerprint enrollment and settings -->
     <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_preference_title">Ôl bys</string>
     <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
     <string name="fingerprint_manage_category_title">Rheoli olion bysedd</string>
     <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+    <string name="fingerprint_usage_category_title">Defnyddio ôl bys ar gyfer</string>
     <!-- Preference to add another fingerprint -->
+    <string name="fingerprint_add_title">Ychwanegu ôl bys</string>
     <!-- switch for allowing fingerprint to be used for keyguard -->
+    <string name="fingerprint_enable_keyguard_toggle_title">clo sgrin</string>
     <!-- Message showing the current number of fingerprints set up. Shown for a menu item that launches fingerprint settings or enrollment. -->
+    <plurals name="security_settings_fingerprint_preference_summary">
+        <item quantity="zero">Gosod <xliff:g id="count">%1$d</xliff:g> olion bysedd</item>
+        <item quantity="one">Gosod <xliff:g id="count">%1$d</xliff:g> ôl bys</item>
+        <item quantity="two">Gosod <xliff:g id="count">%1$d</xliff:g> ôl bys</item>
+        <item quantity="few">Gosod <xliff:g id="count">%1$d</xliff:g> ôl bys</item>
+        <item quantity="many">Gosod <xliff:g id="count">%1$d</xliff:g> ôl bys</item>
+        <item quantity="other">Gosod <xliff:g id="count">%1$d</xliff:g> ôl bys</item>
+    </plurals>
     <!-- message shown in summary field when no fingerprints are registered -->
     <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+    <string name="security_settings_fingerprint_enroll_introduction_title">Datgloi gydag ôl dy fys</string>
     <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabed by device admin [CHAR LIMIT=40] -->
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled">Defnyddio ôl dy fys</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_message">Cyffyrdda\'r synhwyrydd olion bysedd i ddatgloi dy ffôn, awdurdodi prynu pethau, neu fewngofnodi i apiau. Bydda\'n ofalus ôl bys pwy wyt ti\'n eu hychwanegu. Gall un ôl bys yn unig wneud yr holl bethau hyn.\n\nNodyn: Mae dy ôl bys yn llai diogel na phatrwm neu PIN cryf.</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog, when fingerprint unlock is disabled by device admin [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled">Defnyddia ôl dy fys i ddatgloi dy ffôn neu i awdurdodi prynu pethau.\n\nNodyn: Ni ellir defnyddio ôl dy fys i ddatgloi\'r ddyfais hon. Am ragor o wybodaeth, cysyllta â gweinyddwr dy sefydliad.</string>
     <!-- Introduction detail message shown in fingerprint enrollment screen in setup wizard. [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup">Defnyddia ôl dy fys i ddatgloi dy ffôn neu i awdurdodi prynu pethau.\n\nNodyn: Gall defnyddio ôl dy fys fod yn llai diogel na PIN neu batrwm cryf.</string>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel">Diddymu</string>
     <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_introduction_continue">Parhau</string>
     <!-- Button text to cancel enrollment from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup">Neidio</string>
     <!-- Button text to continue to the next screen from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup">Nesaf</string>
     <!-- Title of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup. [CHAR LIMIT=30] -->
+    <string name="setup_fingerprint_enroll_skip_title">Neidio ôl bys?</string>
     <!-- Body text of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup [CHAR LIMIT=NONE] -->
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text">Dyw gosod ôl bys ond yn cymryd munud neu ddau. Os wyt yn neidio hyn, mi fydd yn bosib gosod dy ôl fys yn y gosodiadau yn hwyrach.</string>
     <!-- Title of dialog shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so [CHAR LIMIT=30]-->
+    <string name="lock_screen_intro_skip_title">Neidio sgrin cloi?</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (tablet) [CHAR LIMIT=NONE] -->
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r llechen hon os yw\'n cael ei cholli, dwyn neu ailosod.</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (device) [CHAR LIMIT=NONE] -->
@@ -548,6 +710,7 @@
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so. (phone) [CHAR LIMIT=NONE] -->
     <string name="lock_screen_intro_skip_dialog_text" product="default">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r ffôn hwn os yw\'n cael ei golli neu ddwyn.</string>
     <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+    <string name="skip_anyway_button_label">Neidio beth bynnag</string>
     <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
     <string name="go_back_button_label">Mynd nôl</string>
     <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
@@ -558,6 +721,7 @@
     <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_dialog_ok">Iawn</string>
     <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_dialog_delete">Dileu</string>
     <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
     <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
     <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=40] -->
@@ -566,7 +730,9 @@
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
     <!-- Button text to skip enrollment of fingerprint [CHAR LIMIT=40] -->
     <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+    <string name="setup_fingerprint_enroll_enrolling_skip_title">Neidio gosod ôl bys?</string>
     <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+    <string name="setup_fingerprint_enroll_enrolling_skip_message">Rwyt wedi dewis defnyddio ôl dy fys fel dull i ddatgloi dy ffôn. Os wyt ti\'n neidio\'r cam nawr, mi fydd yn rhai gosod hyn yn hwyrach. Dyw ond yn cymryd funud neu ddwy i\'w osod.</string>
     <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
     <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
     <string name="security_settings_fingerprint_enroll_done">Gorffen</string>
@@ -576,56 +742,94 @@
     <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
     <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
     <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+    <string name="fingerprint_enroll_button_add">Ychwanegu un arall</string>
     <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
     <string name="fingerprint_enroll_button_next">Nesaf</string>
     <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
     <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled">        Dyw\'r sgrin cloi heb ei alluogi. I ddysgu mwy, cysyllta â gweinyddwr dy sefydliad.
+        <annotation id="admin_details">Mwy o wybodaeth</annotation>\n\nMae dal yn bosib defnyddio ôl dy fys i awdurdodi mynediad apiau a phrynu pethau.
+        <annotation id="url">Dysgu mwy</annotation></string>
     <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+    <string name="security_settings_fingerprint_enroll_lift_touch_again">Coda dy fys, yna cyffyrdda\'r synhwyrydd eto</string>
     <!-- Text shown when "Add fingerprint" button is disabled -->
+    <string name="fingerprint_add_max">Gellir ychwanegu hyd at <xliff:g id="count" example="5">%d</xliff:g> ôl bys</string>
     <!-- Text shown when users has enrolled a maximum number of fingerprints [CHAR LIMIT=NONE] -->
+    <string name="fingerprint_intro_error_max">Rwyt wedi ychwanegu\'r nifer mwyaf o olion bysau a ganiateir.</string>
     <!-- Text shown when an unknown error caused the device to be unable to add fingerprints [CHAR LIMIT=NONE] -->
+    <string name="fingerprint_intro_error_unknown">Methu ag ychwanegu rhagor o ôl fysedd</string>
     <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=50]-->
+    <string name="fingerprint_last_delete_title">Tynnu pob un o\'r olion bysedd?</string>
     <!-- Title shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=50]-->
+    <string name="fingerprint_delete_title">Tynnu \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
     <!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_delete_message">Wyt ti am ddileu\'r ôl bys hwn?</string>
     <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_last_delete_message">Ni fyddi’n medru defnyddio dy olion bysedd i ddatgloi dy ffôn, awdurdodi prynu pethau, na mewngofnodi i apiau.</string>
     <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+    <string name="fingerprint_last_delete_confirm">Ie, dw i am ei dynnu</string>
     <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+    <string name="confirm_fingerprint_icon_content_description">Defnyddia ôl dy fys i barhau.</string>
     <!-- Title of the preferences category for preference items to control encryption -->
+    <string name="crypt_keeper_settings_title">Amgryptiad</string>
     <!-- Title of the preferences item to control encryption -->
+    <string name="crypt_keeper_encrypt_title" product="tablet">Amgryptio\'r llechen</string>
     <!-- Title of the preferences item to control encryption -->
+    <string name="crypt_keeper_encrypt_title" product="default">Amgryptio\'r ffôn</string>
     <!-- Summary of the preferences item to control encryption, when encryption is active -->
+    <string name="crypt_keeper_encrypted_summary">Wedi’i amgryptio</string>
     <!-- Informational text in the first confirmation screen before starting device encryption -->
     <string name="crypt_keeper_desc" product="tablet">Mae\'n bosib amgryptio dy gyfrifon, gosodiadau, apiau wedi\'u lawrlwytho a\'u data, cyfryngau, a ffeiliau eraill. Ar ôl amgryptio dy lechen, gan gymryd dy fod wedi gosod sgrin cloi (boed yn batrwm, PIN neu gyfrinair), bydd yn rhaid datgloi\'r sgrin i ddadgryptio\'r llechen pob tro mae\'n cael ei throi ymlaen. Yr unig ffordd arall i ddadgryptio yw ail-osod y ddyfais i fel yr oedd yn gadael y ffatri, gan golli dy holl ddata.\n\nMae amgryptio yn cymryd tuag awr neu\'n fwy o amser. Rhaid bod y batri yn llawn cyn dechrau a\'r llechen wedi ei gysylltu i brif ffynhonnell pŵer trwy gydol y broses. Os oes rhywbeth yn tarfu ar y broses, mae\'n bosib colli peth neu\'r cyfan o dy ddata.</string>
     <!-- Informational text in the first confirmation screen before starting device encryption -->
     <string name="crypt_keeper_desc" product="default">Mae\'n bosib amgryptio dy gyfrifon, gosodiadau, apiau wedi\'u lawrlwytho a\'u data, cyfryngau, a ffeiliau eraill. Ar ôl amgryptio dy ffôn, gan gymryd dy fod wedi gosod sgrin cloi (boed yn batrwm, PIN neu gyfrinair), bydd yn rhaid datgloi\'r sgrin i ddadgryptio\'r ffôn pob tro mae\'n cael ei droi ymlaen. Yr unig ffordd arall i ddadgryptio yw ail-osod y ddyfais i fel yr oedd yn gadael y ffatri, gan golli dy holl ddata.\n\nMae amgryptio yn cymryd tuag awr neu\'n fwy o amser. Rhaid bod y batri yn llawn cyn dechrau a\'r ffôn wedi ei gysylltu i brif ffynhonnell pŵer trwy gydol y broses. Os oes rhywbeth yn tarfu ar y broses, mae\'n bosib colli peth neu\'r cyfan o dy ddata.</string>
     <!-- Button text to start encryption process -->
+    <string name="crypt_keeper_button_text" product="tablet">Amgryptio\'r llechen</string>
     <!-- Button text to start encryption process -->
+    <string name="crypt_keeper_button_text" product="default">Amgryptio\'r ffôn</string>
     <!-- Warning string that will be displayed when encryption cannot be started -->
+    <string name="crypt_keeper_low_charge_text">Rhaid gwefru\'r batri a rhoi cynnig arall arni.</string>
     <!-- Warning string that will be displayed when encryption cannot be started -->
+    <string name="crypt_keeper_unplugged_text">Cysyllta gwefrydd a rhoi cynnig arall arni.</string>
     <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+    <string name="crypt_keeper_dialog_need_password_title">Nid oes PIN na chyfrinair i\'r sgrin cloi</string>
     <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+    <string name="crypt_keeper_dialog_need_password_message">Rhaid gosod PIN neu gyfrinair i\'r sgrin cloi cyn medru dechrau amgryptiad.</string>
     <!-- Title of the final confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_confirm_title">Amgryptio?</string>
     <!-- Warning text in the final confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_final_desc" product="tablet">Nid yw\'n bosib dadwneud y weithred amgryptio a bydd data yn cael ei golli os yw\'r amgryptiad yn cael ei stopio cyn cwblhau.
+Mae amgryptio yn cymryd awr neu\'n hirach a bydd y llechen yn ailgychwyn sawl tro yn ystod yr amser yna.    </string>
     <!-- Warning text in the final confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_final_desc" product="default">Nid yw\'n bosib dadwneud y weithred amgryptio a bydd data yn cael ei golli os yw\'r amgryptiad yn cael ei stopio cyn cwblhau.
+Mae amgryptio yn cymryd awr neu\'n hirach a bydd y ffôn yn ailgychwyn sawl tro yn ystod yr amser yna.    </string>
     <!-- Title of the progress screen while encrypting the device -->
+    <string name="crypt_keeper_setup_title">Yn amgryptio</string>
     <!-- Informational text on the progress screen while encrypting the device -->
+    <string name="crypt_keeper_setup_description" product="tablet">Arhosa tra bod dy lechen yn cael ei hamgryptio. Wedi cwblhau <xliff:g id="percent" example="50">^1</xliff:g>%.</string>
     <!-- Informational text on the progress screen while encrypting the device -->
+    <string name="crypt_keeper_setup_description" product="default">Arhosa tra bod dy ffôn yn cael ei amgryptio. Wedi cwblhau <xliff:g id="percent" example="50">^1</xliff:g>%.</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet">Arhosa tra bod dy lechen yn cael ei hamgryptio. Amser yn weddill: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
+    <string name="crypt_keeper_setup_time_remaining" product="default">Arhosa tra bod dy ffôn yn cael ei amgryptio. Amser yn weddill: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
     <string name="crypt_keeper_force_power_cycle" product="tablet">I ddatgloi\'r llechen, tro\'r ddyfais i ffwrdd ac yna ymlaen eto.</string>
     <string name="crypt_keeper_force_power_cycle" product="default">I ddatgloi\'r ffôn, tro\'r ddyfais i ffwrdd ac yna ymlaen eto.</string>
     <!-- Warn user their device will be wiped if they make x more failed attempts -->
+    <string name="crypt_keeper_warn_wipe">Rhybudd: Caiff dy ddyfais ei chlirio o\'i holl ddata ar ôl <xliff:g id="count" example="7">^1</xliff:g> ymdrech aflwyddiannus arall i\'w datgloi!    </string>
     <!-- Informational text on the password entry screen prompting the user for their password -->
     <string name="crypt_keeper_enter_password">Rho dy gyfrinair</string>
     <!-- Title of the encryption screen when encrypting the device failed -->
+    <string name="crypt_keeper_failed_title">Amgryptiad aflwyddiannus</string>
     <!-- Informational text when encryption fails -->
     <string name="crypt_keeper_failed_summary" product="tablet">Cafodd y broses amgryptio ei dorri ar ei draws ac nid yw\'n bosib ei gwblhau. O ganlyniad, dyw data dy lechen ddim yn hygyrch bellach.\n\nI barhau defnyddio dy lechen, rhaid ei ailosod nôl i fel yr oedd wrth adael y ffatri. Pan wyt ti\'n gosod dy lechen ar ôl ei ailosod, mi fydd yn cynnig cyfle iti adfer unrhyw ddata cafodd ei gadw wrth gefn i dy gyfrif Google.    </string>
     <!-- Informational text when encryption fails -->
     <string name="crypt_keeper_failed_summary" product="default">Cafodd y broses amgryptio ei dorri ar ei draws ac nid yw\'n bosib ei gwblhau. O ganlyniad, dyw data dy ffôn ddim yn hygyrch bellach.\n\nI barhau defnyddio dy ffôn, rhaid ei ailosod nôl i fel yr oedd wrth adael y ffatri. Pan wyt ti\'n gosod dy ffôn ar ôl ei ailosod, mi fydd yn cynnig cyfle iti adfer unrhyw ddata cafodd ei gadw wrth gefn i dy gyfrif Google.    </string>
     <!-- Title of the encryption screen when decrypting the device failed -->
+    <string name="crypt_keeper_data_corrupt_title">Dadamgryptiad aflwyddiannus</string>
     <!-- Informational text when encryption fails -->
     <string name="crypt_keeper_data_corrupt_summary" product="tablet">Mae\'r cyfrinair a rhoddaist yn gywir, ond yn anffodus mae dy ddata yn llwgr.\n\nI barhau i ddefnyddio dy lechen, rhaid ei ailosod nôl i fel yr oedd yn gadael y ffatri.\n\nWrth osod dy lechen ar ôl ei ailosod, bydd cyfle i adfer unrhyw ddata a gafodd ei gadw fel copi wrth gefn ar dy gyfrif Google.</string>
     <!-- Informational text when encryption fails -->
     <string name="crypt_keeper_data_corrupt_summary" product="default">Mae\'r cyfrinair a rhoddaist yn gywir, ond yn anffodus mae dy ddata yn llwgr.\n\nI barhau i ddefnyddio dy ffôn, rhaid ei ailosod nôl i fel yr oedd yn gadael y ffatri.\n\nWrth osod dy ffôn ar ôl ei ailosod, bydd cyfle i adfer unrhyw ddata a gafodd ei gadw fel copi wrth gefn ar dy gyfrif Google.</string>
     <!-- Image button description to switch input method -->
+    <string name="crypt_keeper_switch_input_method">Newid dull mewnbwn</string>
     <!-- Unlock Picker Settings -->
     <!-- Security Picker -->
     <!-- Title for suggested actions for screen lock -->
@@ -637,6 +841,7 @@
     <!-- Summary for suggested actions for settings up a fingerprint lock -->
     <string name="suggested_fingerprint_lock_settings_summary">Datgloi gydag ôl dy fys</string>
     <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+    <string name="lock_settings_picker_title">Dewis clo sgrin</string>
     <!--  Title for security picker to choose the profile unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
     <string name="lock_settings_picker_title_profile">Dewis clo gwaith</string>
     <!--  Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password (tablet) [CHAR LIMIT=22] -->
@@ -673,9 +878,11 @@
     <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
     <string name="unlock_set_unlock_none_summary">Dim diogelwch</string>
     <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+    <string name="unlock_set_unlock_pattern_title">Patrwm</string>
     <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_pattern_summary">Diogelwch cymedrol</string>
     <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+    <string name="unlock_set_unlock_pin_title">PIN</string>
     <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_pin_summary">Diogelwch cymedrol i uchel</string>
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
@@ -700,7 +907,9 @@
     <string name="unlock_set_unlock_mode_off">Dim</string>
     <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
     <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_mode_pattern">Patrwm</string>
     <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_mode_pin">PIN</string>
     <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_password">Cyfrinair</string>
     <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
@@ -709,6 +918,7 @@
     <string name="unlock_setup_wizard_fingerprint_details">Unwaith bydd sgrin cloi wedi ei osod mi fydd hefyd yn bosib gosod olion dy fysedd yn Gosodiadau &gt; Diogelwch.</string>
     <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
     <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+    <string name="unlock_disable_frp_warning_title">Tynnu amddiffyniad y ddyfais?</string>
     <!-- Title of the dialog shown when the user removes the profile lock [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_title_profile">Tynnu amddiffyniad proffil?</string>
     <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
@@ -744,29 +954,47 @@
     <!-- Content of the dialog shown when the user removes the profile lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile">"Ni fydd nodweddion diogelu proffil yn gweithio heb dy sgrin cloi.<xliff:g id="empty_line">\n\n</xliff:g>Bydd olion dy fysedd sydd wedi eu cadw hefyd yn cael eu tynnu o'r proffil ac ni fydd yn bosib datgloi dy broffil, awdurdodi prynu pethau, na mewngofnodi i apiau hebddyn nhw."</string>
     <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+    <string name="unlock_disable_frp_warning_ok">Ie, dw i am ei dynnu.</string>
     <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+    <string name="unlock_change_lock_pattern_title">Newid y patrwm datgloi</string>
     <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+    <string name="unlock_change_lock_pin_title">Newid y PIN datgloi</string>
     <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+    <string name="unlock_change_lock_password_title">Newid y cyfrinair datgloi</string>
     <!-- Message shown on the lock screen when the user incorrectly enters their lock and it counts towards the max attempts before their data on the device is wiped. [CHAR LIMIT=NONE] -->
     <string name="lock_failed_attempts_before_wipe">Rho gynnig arall arni. Cais <xliff:g id="current_attempts">%1$d</xliff:g> o <xliff:g id="total_attempts">%2$d</xliff:g>.</string>
     <!-- Title of a dialog shown when the user only has one attempt left to provide the lock before the device, one of its users, or a work profile is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_attempt_before_wipe_warning_title">Caiff dy ddata ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the device lock pattern before the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pattern_attempt_before_wipe_device">Os rwyt yn rhoi patrwm anghywir ar dy ymdrech nesaf caiff holl ddata\'r ddyfais ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the device lock PIN before the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pin_attempt_before_wipe_device">Os rwyt yn rhoi PIN anghywir ar dy ymdrech nesaf caiff holl ddata\'r ddyfais ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the device lock password before the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_password_attempt_before_wipe_device">Os rwyt yn rhoi cyfrinair anghywir ar dy ymdrech nesaf caiff holl ddata\'r ddyfais ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the user lock pattern before the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pattern_attempt_before_wipe_user">Os rwyt yn rhoi patrwm anghywir ar dy ymdrech nesaf caiff y defnyddiwr hwn ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the user lock PIN before the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pin_attempt_before_wipe_user">Os rwyt yn rhoi PIN anghywir ar dy ymdrech nesaf caiff y defnyddiwr hwn ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the user lock password before the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_password_attempt_before_wipe_user">Os rwyt yn rhoi cyfrinair anghywir ar dy ymdrech nesaf caiff y defnyddiwr hwn ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the work lock pattern before the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pattern_attempt_before_wipe_profile">Os rwyt yn rhoi patrwm anghywir ar dy ymdrech nesaf caiff dy broffil gwaith a\'i ddata eu dileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the work lock PIN before the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pin_attempt_before_wipe_profile">Os rwyt yn rhoi PIN anghywir ar dy ymdrech nesaf caiff holl ddata\'r ddyfais ei ddileu</string>
     <!-- Content of the dialog shown when the user only has one attempt left to provide the work lock password before the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_password_attempt_before_wipe_profile">Os rwyt yn rhoi cyfrinair anghywir ar dy ymdrech nesaf caiff dy broffil gwaith a\'i ddata eu dileu</string>
     <!-- Content of the dialog shown when the user has failed to provide the device lock too many times and the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_failed_attempts_now_wiping_device">Bu gormod o ymdrechion aflwyddiannus. Caiff data\'r ddyfais ei ddileu.</string>
     <!-- Content of the dialog shown when the user has failed to provide the user lock too many times and the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_failed_attempts_now_wiping_user">Bu gormod o ymdrechion aflwyddiannus. Caiff y defnyddiwr hwn ei ddileu.</string>
     <!-- Content of the dialog shown when the user has failed to provide the work lock too many times and the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_failed_attempts_now_wiping_profile">Bu gormod o ymdrechion aflwyddiannus. Caiff y proffil gwaith a\'i ddata eu dileu.</string>
     <!-- Button label to dismiss the dialog telling the user the work profile has been wiped. [CHAR LIMIT=40] -->
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss">Wfftio</string>
     <!-- Hint shown in dialog screen when password is too short -->
     <!-- Hint shown in dialog screen when PIN is too short -->
     <!-- Hint shown after minimum password criteria is met -->
+    <string name="lockpassword_continue_label">Parhau</string>
     <!-- Error shown in popup when password is too long -->
     <!-- Error shown in popup when PIN is too long -->
     <!-- Error shown when in PIN mode and user enters a non-digit -->
@@ -792,6 +1020,7 @@
     <!-- Label for ChoosePassword/PIN OK button -->
     <string name="lockpassword_cancel_label">Diddymu</string>
     <!-- Label for ChoosePassword/PIN Clear button that clears all text entered by the user so far. -->
+    <string name="lockpassword_clear_label">Clirio</string>
     <!-- Label for LockPatternTutorial Cancel button -->
     <string name="lockpattern_tutorial_cancel_label">Diddymu</string>
     <!-- Label for LockPatternTutorial Continue button -->
@@ -800,6 +1029,14 @@
     <!-- Title of preference to manage device admin apps, which are used by IT admins to manage devices -->
     <!-- Summary of preference to manage device admin apps, informing the user that currently no device admin apps are installed and active -->
     <!-- Summary of preference to manage device admin apps, informing the user how many device admin apps are installed and active -->
+    <plurals name="number_of_device_admins">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> apiau yn weithredol</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> ap yn weithredol</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> ap yn weithredol</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> ap yn weithredol</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> ap yn weithredol</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> ap yn weithredol</item>
+    </plurals>
     <!-- Title of preference to manage trust agents -->
     <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
     <!-- Summary of preference to manage device policies when there is no trust agents-->
@@ -807,9 +1044,13 @@
     <!-- Summary of preference to manage device policies when there is trust agent-->
     <!-- Bluetooth settings -->
     <!-- Bluetooth settings check box title on Main Settings screen -->
+    <string name="bluetooth_quick_toggle_title">Bluetooth</string>
     <!-- Bluetooth settings check box summary for turning on bluetooth -->
+    <string name="bluetooth_quick_toggle_summary">Troi Bluetooth ymlaen</string>
     <!--Used as title on second screen after selecting Bluetooth settings -->
+    <string name="bluetooth_settings">Bluetooth</string>
     <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+    <string name="bluetooth_settings_title">Bluetooth</string>
     <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
     <string name="bluetooth_settings_summary">Rheoli cysylltiadau, gosod enw\'r ddyfais, a\'r dulliau canfod</string>
     <!-- ======================================================================================= -->
@@ -818,9 +1059,11 @@
     <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
     <!-- ======================================================================================= -->
     <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+    <string name="bluetooth_pairing_request">Paru gyda <xliff:g id="device_name">%1$s</xliff:g>?</string>
     <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
     <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
     <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+    <string name="bluetooth_enable_alphanumeric_pin">PIN yn cynnwys llythrennau neu symbolau</string>
     <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
     <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
     <string name="bluetooth_pin_values_hint_16_digits">Rhaid bod yn 16 digid</string>
@@ -831,6 +1074,7 @@
     <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
     <string name="bluetooth_display_passkey_pin_msg">I baru gyda:<xliff:g id="bold1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Teipia hyn arno:<xliff:g id="bold2">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">&lt;/b&gt;</xliff:g>, ac yna pwyso \'Return\' neu \'Enter\'.</string>
     <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_pairing_shares_phonebook">Caniatáu mynediad i dy gysylltiadau a hanes galwadau</string>
     <!-- Title for BT error dialogs. -->
     <!-- Message for the error dialog when BT connecting operation fails generically. -->
     <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
@@ -841,20 +1085,24 @@
     <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
     <string name="bluetooth_preference_device_settings">Gosodiadau\'r ddyfais</string>
     <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+    <string name="bluetooth_preference_paired_dialog_title">Dyfais wedi\'i pharu</string>
     <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
     <string name="bluetooth_preference_paired_dialog_name_label">Enw</string>
     <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
     <string name="bluetooth_preference_paired_dialog_internet_option">Cysylltiad rhyngrwyd</string>
     <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+    <string name="bluetooth_preference_paired_dialog_keyboard_option">Bysellfwrdd</string>
     <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
     <string name="bluetooth_preference_paired_dialog_contacts_option">Cysylltiadau a hanes galwadau</string>
     <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+    <string name="bluetooth_pairing_dialog_title">Paru gyda\'r ddyfais hon?</string>
     <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
     <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
     <string name="bluetooth_pairing_dialog_contants_request">Mae <xliff:g id="device_name">%1$s</xliff:g> eisiau mynediad at dy gysylltiadau a hanes galwadau.</string>
     <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
     <string name="bluetooth_pairing_dialog_paring_request">Mae <xliff:g id="device_name">%1$s</xliff:g> eisiau paru gyda Bluetooth. Tra wedi cysylltu, mi fydd gyda mynediad at dy gysylltiadau a hanes galwadau.</string>
     <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+    <string name="bluetooth_preference_paired_devices">Dyfeisiau wedi\'u paru</string>
     <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
     <string name="bluetooth_preference_found_devices">Dyfeisiau ar gael</string>
     <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
@@ -869,6 +1117,7 @@
     <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
     <string name="bluetooth_device_context_disconnect_unpair">Datgysylltu a datbaru</string>
     <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+    <string name="bluetooth_device_context_connect_advanced">Dewisiadau\u2026</string>
     <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
     <string name="bluetooth_menu_advanced">Uwch</string>
     <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
@@ -877,31 +1126,42 @@
     <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
       place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
       the user to "scanning settings" screen. -->
+    <string name="ble_scan_notify_text">I wella cywirdeb lleoliad, gall apiau a gwasanaethau system dal i synhwyro dyfeisiau Bluetooth. Gellir newid hyn yn <xliff:g id="link_begin">LINK_BEGIN</xliff:g>gosodiadau sganio<xliff:g id="link_end">LINK_END</xliff:g>.</string>
     <!-- Bluetooth connecting error message [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_connect_failed">Methwyd â chysylltu. Rho gynnig arall arni.</string>
     <!-- Title of device details screen [CHAR LIMIT=40]-->
     <!-- Title of the item to show device MAC address -->
     <string name="bluetooth_device_mac_address">Cyfeiriad Bluetooth y ddyfais: <xliff:g id="address">%1$s</xliff:g></string>
     <!-- Bluetooth device details. The title of a confirmation dialog for unpairing a paired device. [CHAR LIMIT=60] -->
     <!--  Bluetooth device details. The body of a confirmation dialog for unpairing a paired device. -->
+    <string name="bluetooth_unpair_dialog_body" product="default">Ni fydd dy ffôn mwyach wedi ei baru â \"<xliff:g id="device_name">%1$s</xliff:g></string>
     <!--  Bluetooth device details. The body of a confirmation dialog for unpairing a paired device. -->
+    <string name="bluetooth_unpair_dialog_body" product="tablet">Ni fydd dy lechen mwyach wedi ei pharu â \"<xliff:g id="device_name">%1$s</xliff:g>.\"</string>
     <!--  Bluetooth device details. The body of a confirmation dialog for unpairing a paired device. -->
     <!--  Bluetooth device details. In the confirmation dialog for unpairing a paired device, this is the label on the button that will complete the unpairing action. -->
     <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+    <string name="bluetooth_connect_specific_profiles_title">Cysylltu â\u2026</string>
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_a2dp_profile">Caiff <xliff:g id="device_name">%1$s</xliff:g> ei ddatgysylltu o sain cyfryngau.</string>
     <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_headset_profile">Caiff <xliff:g id="device_name">%1$s</xliff:g> ei ddatgysylltu o sain heb ddwylo.</string>
     <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_hid_profile">Caiff <xliff:g id="device_name">%1$s</xliff:g> ei ddatgysylltu o ddyfais mewnbwn.</string>
     <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
     <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
     <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
     <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+    <string name="bluetooth_device_advanced_title">Dyfais Bluetooth wedi\'i pharu</string>
     <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
     <string name="bluetooth_device_advanced_online_mode_title">Cysylltu</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
     <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
          When a user decides what Bluetooth capabilities to use with the device.  -->
+    <string name="bluetooth_device_advanced_profile_header_title">Defnnyddio ar gyfer</string>
     <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
     <string name="bluetooth_device_advanced_rename_device">Ailenwi</string>
     <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+    <string name="bluetooth_device_advanced_enable_opp_title">Caniatáu trosglwyddo ffeiliau i mewn</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
     <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
     <!-- Bluetooth settings.  Dock Setting Title -->
@@ -911,6 +1171,7 @@
     <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
     <string name="bluetooth_dock_settings_remember">Cofio\'r gosodiadau</string>
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+    <string name="wifi_display_settings_title">Bwrw</string>
     <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
     <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
     <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
@@ -919,10 +1180,13 @@
     <string name="wifi_display_status_connected">Wedi cysyllltu</string>
     <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
     <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_not_available">Dim ar gael</string>
     <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
     <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
     <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+    <string name="wifi_display_options_forget">Anghofio</string>
     <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+    <string name="wifi_display_options_done">Iawn</string>
     <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
     <string name="wifi_display_options_name">Enw</string>
     <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
@@ -935,14 +1199,22 @@
     <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
     <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
     <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+    <string name="wifi_band_24ghz">2.4 GHz</string>
     <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+    <string name="wifi_band_5ghz">5 GHz</string>
     <!-- Link speed on Wifi Status screen -->
+    <string name="link_speed">%1$d Mbps</string>
     <!-- This string asks the user whether or not to allow an app to enable WiFi. [CHAR LIMIT=NONE] -->
+    <string name="wifi_ask_enable">Mae <xliff:g id="requester" example="FancyApp">%s</xliff:g> eisiau troi Wi-Fi ymlaen</string>
     <!-- This string asks the user whether or not to allow an app to disable WiFi. [CHAR LIMIT=NONE] -->
+    <string name="wifi_ask_disable">Mae <xliff:g id="requester" example="FancyApp">%s</xliff:g> eisiau troi Wi-Fi i ffwrdd</string>
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
+    <string name="nfc_quick_toggle_title">NFC</string>
     <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+    <string name="nfc_quick_toggle_summary" product="tablet">Caniatáu cyfnewid data pan mae\'r llechen yn cyffwrdd â dyfais arall</string>
     <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+    <string name="nfc_quick_toggle_summary" product="default">Caniatáu cyfnewid data pan mae\'r ffôn yn cyffwrdd â dyfais arall</string>
     <!-- Dialog title for NFC disclaimer [CHAR_LIMIT=40]-->
     <string name="nfc_disclaimer_title">Rhoi NFC ar waith</string>
     <!-- Dialog content for NFC disclaimer: telling user NFC can exchange data when device is nearby other devices (for example: payment terminals, badge reader etc). [CHAR_LIMIT=NONE]-->
@@ -953,9 +1225,11 @@
     <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
     <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
     <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+    <string name="android_beam_explained">Pan mae\'r nodwedd hon ar waith, mae\'n bosib pelydru cynnwys ap i ddyfais arall gyda NFC gan ddal y dyfeisiau yn agos at ei gilydd. Er enghraifft, gellir pelydru tudalennau gwe, fideos YouTube, cysylltiadau, a mwy.\n\nRho\'r dyfeisiau wrth ei gilydd (cefn wrth gefn fel arfer) yna cyffyrdda dy sgrin. Mae\'r ap yn pennu beth sy\'n cael ei belydru.</string>
     <!-- Wi-Fi Settings -->
     <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
     <!-- Used in the 1st-level settings screen as the turn-on summary -->
+    <string name="wifi_quick_toggle_summary">Troi Wi-Fi ymlaen</string>
     <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
     <!-- Title of the Wi-fi settings screen -->
     <string name="wifi_settings_category">Gosodiadau Wi\u2011Fi</string>
@@ -968,12 +1242,15 @@
     <!-- Summary text when turning Wi-Fi or bluetooth off -->
     <string name="wifi_stopping">Yn troi Wi-Fi i ffwrdd\u2026</string>
     <!-- Summary text when Wi-Fi or bluetooth has error -->
+    <string name="wifi_error">Gwall</string>
     <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+    <string name="wifi_sap_no_channel_error">Dyw band 5 GHz ddim ar gael yn y wlad hon</string>
     <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
     <!-- Checkbox title for option to notify user when open networks are nearby -->
     <!-- Checkbox summary for option to notify user when open networks are nearby-->
     <!-- Checkbox title for option to enable Wi-Fi when saved networks are nearby -->
     <!-- Checkbox summary for option to enable Wi-Fi when high quality saved networks are nearby-->
+    <string name="wifi_wakeup_summary">Bydd Wi\u2011Fi yn troi ymlaen eto o fewn cyrraedd rhwydweithiau safon uchel wedi\'u cadw, fel dy rwydwaith cartref.</string>
     <!-- Checkbox summary for Wi-Fi wakeup option to explain that Wi-Fi wakeup is disabled because Wi-Fi scanning is turned off -->
     <!-- Checkbox summary for Wi-Fi wakeup option to explain that a network rating provider needs to be selected to use the feature. -->
     <!-- Checkbox title for option to toggle poor network detection -->
@@ -983,7 +1260,9 @@
     <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
     <string name="wifi_avoid_poor_network_detection_summary">Defnyddio dim ond rhwydweithiau gyda chysylltiad da i\'r rhyngrwyd</string>
     <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+    <string name="use_open_wifi_automatically_title">Cysylltu â rhwydweithiau agored</string>
     <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+    <string name="use_open_wifi_automatically_summary">Cysylltu yn awtomatig â rhwydweithiau cyhoeddus ansawdd uchel</string>
     <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a network rating provider needs to be selected to use the feature. -->
     <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a compatible network rating provider needs to be selected to use the feature. -->
     <!-- Preference title for option to install certificates -->
@@ -991,6 +1270,7 @@
     <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi
       scanning is on. The place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They
       mark a link to bring the user to "scanning settings" screen. -->
+    <string name="wifi_scan_notify_text">I wella cywirdeb lleoliad, gall apiau a gwasanaethau system dal i sganio am rwydweithiau Wi\u2011Fi. Gellir newid hyn yn <xliff:g id="link_begin">LINK_BEGIN</xliff:g>gosodiadau sganio<xliff:g id="link_end">LINK_END</xliff:g>.</string>
     <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi
       scanning is also off. The place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated.
       They mark a link to bring the user to "scanning settings" screen. -->
@@ -1000,30 +1280,44 @@
     <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
     <!-- Generic error message when the sleep policy could not be set. -->
     <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+    <string name="wifi_suspend_efficiency_title">Gwella effeithlonrwydd</string>
     <!-- Checkbox title for option to toggle suspend power optimizations -->
     <!-- Checkbox summary for option to toggle suspend power optimizations -->
+    <string name="wifi_suspend_optimizations_summary">Lleihau defnydd batri tra bod Wi\u2011Fi ymlaen</string>
     <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+    <string name="wifi_limit_optimizations_summary">Cyfyngu ar ddefnydd batri Wi-Fi</string>
     <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
     <!-- Preference title for option to automatically switch away from bad wifi networks [CHAR LIMIT=60]-->
     <!-- Preference summary to automatically switch away from bad wifi networks [CHAR LIMIT=None]-->
+    <string name="wifi_cellular_data_fallback_summary">Defnyddio data symudol pan nad oes gan y Wi\u2011Fi mynediad i\'r rhyngrwyd. Mae\'n bosib bydd costau am ddefnydd data.</string>
     <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
     <string name="wifi_add_network">Ychwanegu rhwydwaith</string>
     <!-- Action bar title to open additional Wi-Fi settings-->
+    <string name="wifi_configure_settings_preference_title">Dewisiadau Wi\u2011Fi</string>
     <!-- Summary for Wi-Fi Preferences that explains that Wi-Fi will be enabled when high quality saved networks are nearby-->
+    <string name="wifi_configure_settings_preference_summary_wakeup_on">Mae Wi\u2011Fi yn troi ymlaen eto\'n awtomatig</string>
     <!-- Summary for Wi-Fi Preferences that explains that Wi-Fi will not automatically be enabled when high quality saved networks are nearby-->
+    <string name="wifi_configure_settings_preference_summary_wakeup_off">Dyw Wi\u2011Fi ddim yn troi ymlaen eto yn awtomatig</string>
     <!-- Header for the list of wifi networks-->
+    <string name="wifi_access_points">Rhwydweithiau Wi\u2011Fi</string>
     <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+    <string name="wifi_menu_wps_pbc">Botwm Gwthio WPS</string>
     <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+    <string name="wifi_menu_more_options">Rhagor o ddewisiadau</string>
     <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+    <string name="wifi_menu_wps_pin">Rhoi Pin WPS</string>
     <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
     <!-- Menu option to scan Wi-Fi networks -->
     <!-- Menu option to Wi-Fi advanced settings -->
     <string name="wifi_menu_advanced">Uwch</string>
     <!-- Menu option to Wi-Fi configure settings -->
+    <string name="wifi_menu_configure">Ffurfweddu</string>
     <!-- Menu option to connect to a Wi-Fi network -->
     <!-- Menu option to remember a temporary Wi-Fi network -->
     <!-- Menu option to delete a Wi-Fi network -->
+    <string name="wifi_menu_forget">Anghofio\'r rhwydwaith</string>
     <!-- Menu option to modify a Wi-Fi network configuration -->
+    <string name="wifi_menu_modify">Addasu\'r rhwydwaith</string>
     <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
     <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
     <string name="wifi_empty_list_wifi_off">I weld pa rwydweithiau sydd ar gael, rhaid troi Wi-Fi ymlaen.</string>
@@ -1031,6 +1325,7 @@
     <string name="wifi_empty_list_wifi_on">Yn chwilio am rwydweithiau Wi-Fi\u2026</string>
     <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
     <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+    <string name="wifi_more">Mwy</string>
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
     <string name="wifi_setup_wps">Gosod awtomatig (WPS)</string>
     <!-- Dialog for Access Points -->
@@ -1042,13 +1337,17 @@
     <string name="wifi_advanced_toggle_description_collapsed">Dewislen disgyn Dewisiadau Uwch. Tariad dwbl i\'w ehangu.</string>
     <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
     <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+    <string name="wifi_wps_setup_msg">Yn dechrau WPS\u2026</string>
     <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
     <string name="wifi_wps_onstart_pbc">Pwysa\'r botwm \"Wi\u2011Fi Protected Setup\" ar dy lwybrydd neu \"router\". Mae\'n debyg ei bod gyda \u201cWPS\u201d neu\'r symbol yma:</string>
     <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
     <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+    <string name="wifi_wps_complete">WPS wedi llwyddo. Yn cysylltu i\'r rhwydwaith\u2026</string>
     <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
     <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+    <string name="wifi_wps_in_progress">Mae WPS eisoes ar y gweill a gall gymryd hyd at ddau funud i\'w gwblhau.</string>
     <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+    <string name="wifi_wps_failed_generic">Methodd WPS. Ceisia eto mewn ychydig funudau.</string>
     <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
     <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
     <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
@@ -1076,17 +1375,23 @@
     <string name="wifi_eap_domain">Parth</string>
     <!-- Label for the EAP user certificate of the network -->
     <!-- Label for the EAP identity of the network -->
+    <string name="wifi_eap_identity">Adnabod</string>
     <!-- Label for the EAP anonymous identity of the network -->
     <!-- Label for the password of the secured network -->
     <string name="wifi_password">Cyfrinair</string>
     <!-- Label for the check box to show password -->
+    <string name="wifi_show_password">Dangos cyfrinair</string>
     <!-- Label for the RadioGroup to choose wifi ap band -->
     <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+    <string name="wifi_ap_choose_2G">Band 2.4 GHz</string>
     <!-- Label for the radio button to choose wifi ap 5GHz band -->
+    <string name="wifi_ap_choose_5G">Band 5 GHz</string>
     <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+    <string name="wifi_ip_settings">Gosodiadau IP</string>
     <!-- Label for the check box to share a network with other users on the same device -->
     <string name="wifi_shared">Rhannu gyda defnyddwyr eraill y ddyfais</string>
     <!-- Hint for unchanged fields -->
+    <string name="wifi_unchanged">(heb newid)</string>
     <!-- Hint for unspecified fields -->
     <string name="wifi_unspecified">Dewisa</string>
     <!-- Hint for multiple certificates being added to the configuration -->
@@ -1105,39 +1410,49 @@
     <string name="wifi_no_domain_warning">Rhaid rhoi parth.</string>
     <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
          string is listed first [CHAR LIMIT=20]-->
+    <string name="wifi_wps_available_first_item">WPS ar gael</string>
     <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
          string is listed after a wifi_secured_* string-->
     <string name="wifi_wps_available_second_item">\u0020(WPS ar gael)</string>
     <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+    <string name="wifi_wps_nfc_enter_password">Rho gyfrinair dy rwydwaith</string>
     <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=40] -->
     <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=60] -->
     <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
     <string name="wifi_scan_always_confirm_allow">Caniatáu</string>
+    <string name="wifi_scan_always_confirm_deny">Gwrthod</string>
     <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
     <string name="wifi_hotspot_title">Mewngofnodi er mwyn cysylltu?</string>
     <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+    <string name="wifi_hotspot_message">Mae ar <xliff:g id="app_name">%1$s</xliff:g> angen dy fod wedi mewngofnodi ar-lein cyn medru cysylltu â\'r rhwydwaith.</string>
     <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
     <string name="wifi_hotspot_connect">CYSYLLTU</string>
     <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
     <string name="no_internet_access_text">Does gan y rhwydwaith hwn dim mynediad i\'r rhyngrwyd. Parhau wedi cysylltu?</string>
     <!-- Dialog text to tell the user that the selected network has lost Internet access, and asking the user whether they want to avoid this network. -->
     <string name="lost_internet_access_title">Dyw\'r Wi\u2011Fi heb gysylltu â\'r rhyngrwyd.</string>
+    <string name="lost_internet_access_text">Mae\'n bosib newid i\'r rhwydwaith symudol pan mae\'r cysylltiad Wi\u2011Fi yn wael. Mae\'n bosib bydd costau am ddefnydd data.</string>
     <!-- Button text to let user switch to mobile data -->
     <string name="lost_internet_access_cancel">Aros ar Wi\u2011Fi</string>
     <string name="lost_internet_access_persist">Byth dangos eto</string>
     <!-- Button label to connect to a Wi-Fi network -->
     <string name="wifi_connect">Cysylltu</string>
     <!-- Failured notification for connect -->
+    <string name="wifi_failed_connect_message">Methwyd â chysylltu â\'r rhwydwaith</string>
     <!-- Button label to delete a Wi-Fi network -->
     <!-- Button label to modify a Wi-Fi network -->
+    <string name="wifi_modify">Addasu</string>
     <!-- Failured notification for forget -->
+    <string name="wifi_failed_forget_message">Methwyd ag anghofio\'r rhwydwaith</string>
     <!-- Button label to save a Wi-Fi network configuration -->
     <string name="wifi_save">Cadw</string>
     <!-- Failured notification for save -->
+    <string name="wifi_failed_save_message">Methwyd a chadw\'r rhwydwaith</string>
     <!-- Button label to dismiss the dialog -->
     <string name="wifi_cancel">Diddymu</string>
     <!-- Wi-Fi Advanced Settings -->
     <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+    <string name="wifi_saved_access_points_titlebar">Rhwydweithiau wedi\'u cadw</string>
     <!-- Wi-Fi settings screen, Saved networks summary.  This shows below the "Saved networks" item and indicates the number of networks a user has saved. -->
     <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
     <string name="wifi_advanced_titlebar">Gosodiadau Wi-Fi uwch</string>
@@ -1150,10 +1465,13 @@
     <!-- Wifi details title-->
     <!-- Wifi details preference title to display router IP subnet mask -->
     <!-- Wifi details preference title to display router DNS info -->
+    <string name="wifi_details_dns">DNS</string>
     <!-- Wifi details preference category title for IPv6 information -->
     <string name="wifi_details_ipv6_address_header">Cyfeiriadau IPv6</string>
     <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+    <string name="wifi_saved_access_points_label">Rhwydweithiau wedi\'u cadw</string>
     <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+    <string name="wifi_advanced_settings_label">Gosodiadau IP</string>
     <!-- Error message for users that aren't allowed to see or modify WiFi advanced settings [CHAR LIMIT=NONE] -->
     <string name="wifi_advanced_not_available">Dyw gosodiadau uwch Wi\u2011Fi ddim ar gael ar gyfer y defnyddiwr hwn.</string>
     <!-- Menu item to save the IP settings -->
@@ -1166,7 +1484,9 @@
     <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
     <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
     <!-- Label for the DNS (first one) -->
+    <string name="wifi_dns1">DNS 1</string>
     <!-- Label for the DNS (second one)-->
+    <string name="wifi_dns2">DNS 2</string>
     <!-- Label for the gateway of the network -->
     <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
     <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
@@ -1185,32 +1505,48 @@
     <!-- Title for disconnect dialog -->
     <string name="wifi_p2p_disconnect_title">Datgysylltu?</string>
     <!-- Message text for disconnection from one device-->
+    <string name="wifi_p2p_disconnect_message">Os wyt yn datgysylltu, bydd dy gysylltiad gyda <xliff:g id="peer_name">%1$s</xliff:g> yn dod i ben.</string>
     <!-- Message text for disconnection from multiple devices-->
+    <string name="wifi_p2p_disconnect_multiple_message">Os wyt yn datgysylltu, bydd dy gysylltiad gyda <xliff:g id="peer_name">%1$s</xliff:g> a <xliff:g id="peer_count">%2$s</xliff:g> dyfais arall yn dod i ben.</string>
     <!-- Title for cancel connect dialog -->
     <!-- Message text for disconnection from one device-->
+    <string name="wifi_p2p_cancel_connect_message">Wyt ti am ddiddymu\'r gwahoddiad i gysylltu gyda <xliff:g id="peer_name">%1$s</xliff:g>?</string>
     <!-- Message text for remembered group deletion-->
+    <string name="wifi_p2p_delete_group_message">Anghofio\'r grŵp hwn?</string>
     <!-- Wifi AP settings-->
     <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+    <string name="wifi_hotspot_checkbox_text">Llecynnau Cysylltiad Wi\u2011Fi</string>
     <!-- Summary text when turning hotspot off -->
     <!-- Summary text when tethering is on -->
     <!-- Summary text when tethering is on -->
     <!-- Summary text when hotspot is on for local-only -->
+    <string name="wifi_hotspot_on_local_only_subtext">Mae\'r ap yn rhannu cynnwys. I rannu cysylltiad rhyngrwyd, tro\'r llecyn Wi-Fi i ffwrdd ac yna ymlaen eto</string>
     <!-- Wifi hotspot settings -->
     <!-- Label for Wifi hotspot name. -->
     <!-- Summary for Wifi hotspot name when connection is in progress. -->
     <!-- Summary for Wifi hotspot name when connected. -->
     <!-- Label for Wifi hotspot password. -->
     <!-- Label for Wifi hotspot AP Band. -->
+    <string name="wifi_hotspot_ap_band_title">Band AP</string>
     <!-- Wifi hotspot footer info for regular hotspot [CHAR LIMIT=NONE]-->
     <!-- Wifi hotspot footer info [CHAR LIMIT=NONE]-->
+    <string name="wifi_hotspot_footer_info_local_only">Gall apiau creu llecyn Wi-Fi er mwyn rhannu cynnwys gyda dyfeisiau cyfagos.</string>
     <!-- Summary text when turning hotspot on -->
+    <string name="wifi_tether_starting">Yn troi\'r llecyn Wi-Fi ymlaen\u2026</string>
     <!-- Summary text when turning hotspot off -->
+    <string name="wifi_tether_stopping">Yn troi\'r llecyn Wi-Fi i ffwrdd\u2026</string>
     <!-- Subtext for wifi tether checkbox on success -->
+    <string name="wifi_tether_enabled_subtext">Mae <xliff:g id="network_ssid">%1$s</xliff:g> yn weithredol</string>
     <!-- Subtext for wifi tether checkbox on failure -->
+    <string name="wifi_tether_failed_subtext">Gwall llecyn Wi\u2011Fi cludadwy</string>
     <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+    <string name="wifi_tether_configure_ap_text">Creu llecyn cysylltiad Wi\u2011Fi</string>
     <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+    <string name="wifi_hotspot_configure_ap_text">Creu llecyn cysylltiad Wi\u2011Fi</string>
     <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+    <string name="wifi_hotspot_configure_ap_text_summary">Llecyn AndroidAP WPA2 PSK</string>
     <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+    <string name="wifi_tether_configure_subtext">Llecyn Wi-Fi <xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> hotspot</string>
     <!-- Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default">LlecynAndroid</string>
     <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
@@ -1266,6 +1602,7 @@
     <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
          Label on Wifi Configuration screen-->
     <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+    <string name="wifi_calling_settings_title">Galwadau Wi-Fi</string>
     <!-- Title of suggestion to turn on wifi calling [CHAR LIMIT=30] -->
     <string name="wifi_calling_suggestion_title">Troi Galwadau Wi-Fi ymlaen</string>
     <!-- Summary of suggestion to turn on wifi calling [CHAR LIMIT=60] -->
@@ -1273,6 +1610,7 @@
     <!-- Title of WFC preference item [CHAR LIMIT=30] -->
     <string name="wifi_calling_mode_title">Dewisiadau galw</string>
     <!-- Title of WFC preference selection dialog [CHAR LIMIT=30] -->
+    <string name="wifi_calling_mode_dialog_title">Modd galwadau Wi-Fi</string>
     <!-- Title of WFC roaming preference item [CHAR LIMIT=45] -->
     <string name="wifi_calling_roaming_mode_title">Dewis crwydro (tramor)</string>
     <!-- Summary of WFC roaming preference item [CHAR LIMIT=NONE]-->
@@ -1280,13 +1618,13 @@
     <!-- WFC mode dialog [CHAR LIMIT=45] -->
     <string name="wifi_calling_roaming_mode_dialog_title">Dewis crwydro (tramor)</string>
     <string-array name="wifi_calling_mode_choices">
-        <item>Wi-Fi preferred</item>
+        <item>Ffafrio Wi-Fi</item>
         <item>Mobile preferred</item>
         <item>Wi-Fi yn unig</item>
     </string-array>
     <string-array name="wifi_calling_mode_choices_v2">
         <item>Wi-Fi</item>
-        <item>Mobile</item>
+        <item>Symudol</item>
         <item>Wi-Fi yn unig</item>
     </string-array>
     <string-array name="wifi_calling_mode_values">
@@ -1294,15 +1632,25 @@
         <item>"1"</item>
         <item>"0"</item>
     </string-array>
+    <string-array name="wifi_calling_mode_choices_without_wifi_only">
+        <item>Ffafrio Wi-Fi</item>
+        <item>Mobile preferred</item>
+    </string-array>
     <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
         <item>Wi-Fi</item>
-        <item>Mobile</item>
+        <item>Symudol</item>
+    </string-array>
+    <string-array name="wifi_calling_mode_values_without_wifi_only">
+        <item>"2"</item>
+        <item>"1"</item>
     </string-array>
     <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+    <string name="wifi_calling_off_explanation">Tra bod galwadau Wi-Fi ymlaen, gall dy ffôn dargyfeirio galwadau trwy rwydweithiau Wi-Fi neu rwydwaith dy ddarparwr gwasanaeth symudol, yn dibynnu ar dy osodiadau a pha signal sy\'n gryfach ar y pryd. Cyn troi\'r nodwedd hon ymlaen, mae\'n syniad da gwirio gyda dy ddarparwr symudol am ffioedd a manylion eraill.</string>
     <!-- Wi-Fi Calling settings. Additional text displayed when Wi-Fi Calling is off. Default empty. [CHAR LIMIT=NONE] -->
     <!-- Title of a preference for updating emergency address [CHAR LIMIT=40] -->
     <string name="emergency_address_title">Diweddaru\'r Cyfeiriad Argyfwng</string>
     <!-- Summary of Update Emergency Address preference, explaining usage of emergency address [CHAR LIMIT=NONE] -->
+    <string name="emergency_address_summary">Y cyfeiriad i\'w ddefnyddio gan wasanaethau brys fel dy leoliad yn yr achos dy fod yn gwneud galwad brys dros Wi-Fi</string>
     <!-- Sound and alerts settings -->
     <string name="display_settings_title">Dangosydd</string>
     <!-- Sound settings screen heading -->
@@ -1312,7 +1660,9 @@
     <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
     <!-- Sound settings screen, volume title -->
     <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+    <string name="musicfx_title">Effeithiau sain</string>
     <!-- Sound settings screen, setting option name -->
+    <string name="ring_volume_title">Uchder sain caniad ffôn</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="vibrate_in_silent_title">Dirgrynu pan yn ddistaw</string>
     <!-- Sound settings screen, setting option name -->
@@ -1324,11 +1674,14 @@
     <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
          the same as the incoming call volume. -->
     <!-- Home settings screen, text indicating that a launcher does not support work profiles [CHAR LIMIT=100] -->
+    <string name="home_work_profile_not_supported">Nid yw\'n cefnogi proffiliau gwaith</string>
     <!-- Sound settings screen, setting option title-->
     <string name="notification_sound_dialog_title">Sain hysbysiad rhagosodedig</string>
     <!-- Sound settings screen, setting option name -->
+    <string name="media_volume_title">Cyfryngau</string>
     <!-- Sound settings screen, setting option summary text -->
     <!-- Sound settings screen, alarm volume slider title -->
+    <string name="alarm_volume_title">Larwm</string>
     <!-- Sound settings screen, dock settings summary-->
     <!-- Sound settings screen, setting check box label -->
     <string name="dtmf_tone_enable_title">Tonau cyffwrdd pad deialu</string>
@@ -1339,20 +1692,25 @@
     <string name="haptic_feedback_enable_title">Dirgrynu wrth daro</string>
     <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
     <!-- Volume description for media volume -->
+    <string name="volume_media_description">Cerddoriaeth, fideo, gemau a chyfryngau eraill</string>
     <!-- Volume description for ringtone and notification volume -->
     <string name="volume_ring_description">Tôn caniad a hysbysiadau</string>
     <!-- Volume description for notification volume -->
     <string name="volume_notification_description">Hysbysiadau</string>
     <!-- Volume description for alarm volume -->
+    <string name="volume_alarm_description">Larymau</string>
     <!-- Image description for ring volume mute button. -->
     <string name="volume_ring_mute">Distewi\'r tôn caniad a hysbysiadau</string>
     <!-- Image description for media volume mute button. -->
+    <string name="volume_media_mute">Distewi cerddoriaeth a chyfryngau eraill</string>
     <!-- Image description for notification volume mute button. -->
     <string name="volume_notification_mute">Distewi hysbysiadau</string>
     <!-- Image description for alarm volume mute button. -->
+    <string name="volume_alarm_mute">Distewi larymau</string>
     <!-- Dock settings title, top level -->
     <!-- Dock settings title -->
     <!-- Dock audio settings -->
+    <string name="dock_audio_settings_title">Sain</string>
     <!-- Dock audio summary for docked to desk dock -->
     <!-- Dock audio summary for docked to car dock -->
     <!-- Dock audio summary for undocked -->
@@ -1372,7 +1730,9 @@
     <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
     <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
     <!-- Main Settings screen, setting option name to go into search settings -->
+    <string name="search_settings">Chwilio</string>
     <!-- Main Settings screen, setting option summary to go into search settings -->
+    <string name="search_settings_summary">Rheoli gosodiadau a hanes chwilio</string>
     <!-- There are no search results for the user's search [CHAR LIMIT=NONE]-->
     <!-- Button to clear all search history in Settings [CHAR LIMIT=40]-->
     <!-- Display settings -->
@@ -1381,7 +1741,9 @@
     <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
     <string name="accelerometer_title">Troi\'r sgrin yn awtomatig</string>
     <!-- Display settings screen, Color mode settings title [CHAR LIMIT=30] -->
+    <string name="color_mode_title">Lliwiau</string>
     <!-- Display settings screen, Color mode option for "natural(sRGB) color"  [CHAR LIMIT=45] -->
+    <string name="color_mode_option_natural">Naturiol</string>
     <!-- Display settings screen, Color mode option for "Boosted(sRGB + 10%) color"  [CHAR LIMIT=45] -->
     <!-- Display settings screen, Color mode option for "Saturated color"  [CHAR LIMIT=45] -->
     <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1397,25 +1759,36 @@
     <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
     <string name="auto_brightness_title">Disgleirdeb addasedig</string>
     <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+    <string name="auto_brightness_summary">Addasu disgleirdeb y sgrin yn ôl goleuni</string>
     <!-- Sound & display settings screen, setting option summary when adaptive brightness is off [CHAR LIMIT=100] -->
     <string name="auto_brightness_summary_off">I ffwrdd</string>
     <!-- Sound & display settings screen, setting option summary when preferred adaptive brightness is very low [CHAR LIMIT=100] -->
+    <string name="auto_brightness_summary_very_low">Ffafrio disgleirdeb isel iawn</string>
     <!-- Sound & display settings screen, setting option summary when preferred adaptive brightness is low [CHAR LIMIT=100] -->
+    <string name="auto_brightness_summary_low">Ffafrio disgleirdeb isel</string>
     <!-- Sound & display settings screen, setting option summary when preferred adaptive brightness is the default [CHAR LIMIT=100] -->
+    <string name="auto_brightness_summary_default">Ffafrio disgleirdeb arferol</string>
     <!-- Sound & display settings screen, setting option summary when preferred adaptive brightness is high [CHAR LIMIT=100] -->
+    <string name="auto_brightness_summary_high">Ffafrio disgleirdeb uchel</string>
     <!-- Sound & display settings screen, setting option summary when preferred adaptive brightness is very high [CHAR LIMIT=100] -->
+    <string name="auto_brightness_summary_very_high">Ffafrio disgleirdeb uchel iawn</string>
     <!-- Adaptive brightness settings screen, setting option to disable adaptive brightness [CHAR LIMIT=100] -->
     <string name="auto_brightness_off_title">I ffwrdd</string>
     <!-- Adaptive brightness settings screen, setting option to enable adaptive brightness when user prefers very low brightness [CHAR LIMIT=100] -->
+    <string name="auto_brightness_very_low_title">Isel iawn</string>
     <!-- Adaptive brightness settings screen, setting option to enable adaptive brightness when user prefers low brightness [CHAR LIMIT=100] -->
+    <string name="auto_brightness_low_title">Isel</string>
     <!-- Adaptive brightness settings screen, setting option to enable adaptive brightness when user prefers default brightness [CHAR LIMIT=100] -->
     <!-- Adaptive brightness settings screen, setting option to enable adaptive brightness when user prefers high brightness [CHAR LIMIT=100] -->
+    <string name="auto_brightness_high_title">Uchel</string>
     <!-- Adaptive brightness settings screen, setting option to enable adaptive brightness when user prefers very high brightness [CHAR LIMIT=100] -->
     <!-- Adaptive brightness settings screen, subtitle [CHAR LIMIT=100] -->
+    <string name="auto_brightness_subtitle">Y lefel o ddisgleirdeb sydd well gennyt ti</string>
     <!-- Adaptive brightness settings screen, setting option summary to disable adaptive brightness [CHAR LIMIT=100] -->
     <!-- Adaptive brightness settings screen, setting option summary to enable adaptive brightness when user prefers very high brightness.
          Meant to make it clear that preferring very high brightness uses more battery. [CHAR LIMIT=100] -->
     <!-- Adaptive brightness settings screen, disclaimer that explains in more detail about how adaptive brightness works [CHAR LIMIT=150] -->
+    <string name="auto_brightness_disclaimer">Addasu disgleirdeb y sgrin yn ôl goleuni. Pan fydd y nodwedd hon ar waith, mi fydd dal yn bosib i ti addasu\'r disgleirdeb dy hun dros dro.</string>
     <!-- Night display screen, setting option name to enable night display (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
     <string name="night_display_title">Golau Nos</string>
     <!-- Night display screen, description of night display feature (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
@@ -1425,9 +1798,12 @@
     <!-- Night display screen, setting option value for night display to *never* turn on/off automatically. [CHAR LIMIT=30] -->
     <string name="night_display_auto_mode_never">Dim</string>
     <!-- Night display screen, setting option value for night display to turn on/off automatically according to a user defined schedule. [CHAR LIMIT=32] -->
+    <string name="night_display_auto_mode_custom">Mae\'n troi ymlaen am amser penodol</string>
     <!-- Night display screen, setting option value for night display to turn on/off automatically at sunset/sunrise. [CHAR LIMIT=32] -->
     <!-- Night display screen, setting option name to configure time to automatically turn on night display. [CHAR LIMIT=30] -->
+    <string name="night_display_start_time_title">Amser dechrau</string>
     <!-- Night display screen, setting option name to configure time to automatically turn off night display. [CHAR LIMIT=30] -->
+    <string name="night_display_end_time_title">Amser gorffen</string>
     <!-- Night display screen, setting option name controlling the current activation status. [CHAR LIMIT=30] -->
     <string name="night_display_status_title">Statws</string>
     <!-- Night display screen, setting the color temperature of the display. [CHAR LIMIT=30] -->
@@ -1463,6 +1839,7 @@
     <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
     <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
     <!-- Display settings screen, summary fragment for screen saver options, activated never  -->
+    <string name="screensaver_settings_summary_never">Byth</string>
     <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
     <string name="screensaver_settings_summary_off">I ffwrdd</string>
     <!-- Dream settings screen, caption for when dreams are disabled -->
@@ -1470,12 +1847,15 @@
     <!-- Dream settings screen, action label, when to dream -->
     <!-- Dream settings screen, action label, current selected screen saver -->
     <!-- Dream settings screen, button label to start dreaming -->
+    <string name="screensaver_settings_dream_start">Dechrau nawr</string>
     <!-- Dream settings screen, button label for settings for a specific screensaver -->
+    <string name="screensaver_settings_button">Gosodiadau</string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Disgleirdeb awtomatig</string>
     <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
     <!-- [CHAR LIMIT=30] Title of the preference that opens the Ambient display settings screen. -->
     <!-- [CHAR LIMIT=50] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to be always on -->
+    <string name="ambient_display_screen_summary_always_on">Ymlaen o hyd / Defnydd uwch o\'r batri</string>
     <!-- [CHAR LIMIT=30] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to show when new notifications come in. -->
     <string name="ambient_display_screen_summary_notifications">Hysbysiadau newydd</string>
     <!-- [CHAR LIMIT=30] Category title for the settings that control when Ambient display shows. -->
@@ -1484,6 +1864,7 @@
     <!-- [CHAR LIMIT=NONE] Ambient display screen, summary for setting to change whether the ambient display feature is triggered for new incoming notifications. -->
     <string name="doze_summary">Deffro\'r sgrin pan mae hysbysiadau\'n cael eu derbyn</string>
     <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the always-on ambient display feature is enabled. -->
+    <string name="doze_always_on_title">Ymlaen o hyd</string>
     <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the always-on ambient display feature. -->
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Maint ffont</string>
@@ -1495,21 +1876,29 @@
     <!-- Security & screen lock settings screen, SIM card lock setting summary when off [CHAR LIMIT=NONE] -->
     <string name="sim_lock_settings_summary_off">I ffwrdd</string>
     <!-- Security & screen lock settings screen, SIM card lock setting summary when on [CHAR LIMIT=NONE] -->
+    <string name="sim_lock_settings_summary_on">Wedi cloi</string>
     <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+    <string name="sim_pin_toggle">Cloi cerdyn SIM</string>
     <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+    <string name="sim_pin_change">Newid PIN SIM</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+    <string name="sim_enter_pin">PIN SIM</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+    <string name="sim_enable_sim_lock">Cloi cerdyn SIM</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+    <string name="sim_enter_old">Hen PIN SIM</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+    <string name="sim_change_pin">PIN SIM</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+    <string name="sim_bad_pin">PIN Anghywir</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
     <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
@@ -1519,11 +1908,13 @@
     <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
     <string name="sim_enter_cancel">Diddymu</string>
     <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+    <string name="sim_multi_sims_title">Canfuwyd mwy nag un SIM</string>
     <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
     <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
     <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
     <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
     <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+    <string name="sim_preferred_message"><xliff:g id="new_sim">%1$s</xliff:g> yw\'r unig SIM yn dy ddyfais. Wyt ti eisiau defnyddio\'r cerdyn SIM hwn ar gyfer negeseuon SMS, data a galwadau symudol?</string>
     <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
          Displayed in a dialog box.  [CHAR LIMIT=100] -->
     <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
@@ -1531,21 +1922,27 @@
     <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
     <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
     <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+    <string name="system_update_settings_list_item_title">Diweddariadau system</string>
     <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
     <string name="firmware_version">Fersiwn Android</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+    <string name="security_patch">Lefel patsh diogelwch Android</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
     <string name="model_info">Model</string>
     <!-- About phone screen, dialog title for showing hardware information such as model, serial number, etc.[CHAR LIMIT=60] -->
+    <string name="hardware_info">Model a chaledwedd</string>
     <!-- Label for device's hardware revision value [CHAR LIMIT=40] -->
+    <string name="hardware_revision">Fersiwn caledwedd</string>
     <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+    <string name="baseband_version">Fersiwn Baseband</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="kernel_version">Fersiwn cnewyllyn</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="build_number">Rhif adeiledd</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+    <string name="selinux_status">Statws SELinux</string>
     <!-- About phone screen, show when a value of some status item is unavailable. -->
     <string name="device_info_not_available">Dim ar gael</string>
     <!-- About phone screen, phone status screen title -->
@@ -1559,25 +1956,35 @@
     <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
     <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
     <!-- Storage settings screen title -->
+    <string name="storage_settings_title">Gosodiadau storfa</string>
     <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
     <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
     <!-- Do not translate. About phone, status item title -->
     <!-- Do not translate. About phone, status item title -->
     <!-- Do not translate. About phone, status item title -->
+    <string name="status_iccid">ICCID</string>
     <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+    <string name="status_number" product="tablet">MDN</string>
     <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+    <string name="status_number" product="default">Fy rif ffôn</string>
     <!-- About phone, status item title.  The phone MIN number of the current device.-->
+    <string name="status_min_number">MIN</string>
     <!-- About phone, status item title.  The phone MSID number of the current device.-->
+    <string name="status_msid_number">MSID</string>
     <!-- About phone, status item title.  The phone PRL Version of the current device.-->
     <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+    <string name="status_meid_number">MEID</string>
     <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+    <string name="status_icc_id">ICCID</string>
     <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
     <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
     <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
     <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
     <!-- About phone, status item title. The  current cell tower signal strength -->
     <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+    <string name="status_roaming">Crwydro</string>
     <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+    <string name="status_operator">Rhwydwaith</string>
     <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
     <string name="status_wifi_mac_address">Cyfeiriad MAC Wi-Fi</string>
     <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
@@ -1585,24 +1992,32 @@
     <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
     <string name="status_serial_number">Rhif cyfres</string>
     <!-- About phone, status item value if the actual value is not available. -->
+    <string name="status_unavailable">Dim ar gael</string>
     <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
     <string name="status_up_time">Amser yn rhedeg</string>
     <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
     <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+    <string name="internal_memory">Storfa mewnol</string>
     <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+    <string name="sd_memory" product="nosdcard">Storfa USB</string>
     <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+    <string name="sd_memory" product="default">Cerdyn SD</string>
     <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+    <string name="memory_available">Ar gael</string>
     <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
     <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
     <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_media_usage">Cyfryngau</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_downloads_usage">Llwythi</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_dcim_usage">Lluniau, fideos</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_music_usage">Sain (cerddoriaeth, tonau caniad, podlediadau, ayyb)</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_media_misc_usage">Ffeiliau eraill</string>
     <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
@@ -1620,7 +2035,9 @@
     <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
     <string name="sd_format" product="default">Dileu popeth ar y cerdyn SD</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+    <string name="sd_format_summary" product="nosdcard">Mae\'n dileu\'r holl ddata ar y storfa USB mewnol, megis lluniau a cherddoriaeth</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+    <string name="sd_format_summary" product="default">Mae\'n dileu\'r holl ddata ar y cerdyn SD, megis lluniau a cherddoriaeth</string>
     <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
     <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
     <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
@@ -1644,26 +2061,36 @@
     <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
     <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
     <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_format">Fformatio</string>
     <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
     <string name="storage_menu_format_public">Fformatio fel datgysylltadwy</string>
     <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_format_private">Fformatio fel mewnol</string>
     <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_migrate">Mudo data</string>
     <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
     <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
     <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_explore">Archwilio</string>
     <!-- Storage setting. Menu option for using the deletion helper. [CHAR LIMIT=30] -->
     <string name="storage_menu_free">Rhyddhau lle</string>
     <!-- Storage setting. Menu option for accessing the storage manager settings. [CHAR LIMIT=30] -->
     <string name="storage_menu_manage">Rheoli storfa</string>
     <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+    <string name="storage_title_usb">Cysylltiad USB cyfrifiadur</string>
     <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+    <string name="usb_connection_category">Cysylltu fel</string>
     <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
     <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+    <string name="usb_mtp_summary">Mae\'n caniatáu i ti drosglwyddo ffeiliau ar Windows neu gan ddefnyddio Android File Transfer ar Mac (gweler www.android.com/filetransfer)</string>
     <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
     <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+    <string name="usb_ptp_summary">Mae\'n caniatáu i ti drosglwyddo lluniau gan ddefnyddio meddalwedd camera, a throsglwyddo unrhyw ffeiliau ar gyfrifiaduron na sy\'n cefnogi MTP.</string>
     <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+    <string name="usb_midi_title">MIDI</string>
     <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
     <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+    <string name="storage_other_users">Defnyddwyr eraill</string>
     <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
     <string name="storage_internal_title">Storfa\'r ddyfais</string>
     <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
@@ -1680,6 +2107,7 @@
     <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
     <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
     <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+    <string name="storage_format_success">Mae <xliff:g id="name" example="SD card">%1$s</xliff:g> wedi\'i fformatio</string>
     <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
     <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
     <string name="storage_rename_title">Ailenwi\'r storfa</string>
@@ -1693,22 +2121,30 @@
     <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
     <string name="storage_internal_forget_details">I ddefnyddio apiau, lluniau neu ddata <xliff:g id="name" example="SD card">^1</xliff:g>, rho gynnig ar ei ailosod yn y ddyfais.\n\nFel arall, mae\'n bosib dewis anghofio\'r storfa hon os nad yw\'r ddyfais ar gael.\n\nOs wyt yn dewis ei anghofio, bydd yr holl ddata mae\'r ddyfais yn ei gynnwys yn cael ei golli am byth.\n\nMae\'n bosib ailosod yr apiau yn hwyrach, ond bydd y data maen nhw wedi cadw ar y ddyfais hon wedi ei golli.</string>
     <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+    <string name="storage_internal_forget_confirm_title">Anghofio <xliff:g id="name" example="SD card">^1</xliff:g>?</string>
     <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
     <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+    <string name="storage_detail_apps">Apiau</string>
     <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+    <string name="storage_detail_images">Delweddau</string>
     <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
     <string name="storage_detail_videos">Fideos</string>
     <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+    <string name="storage_detail_audio">Sain</string>
     <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
     <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
     <string name="storage_detail_other">Arall</string>
     <!-- Item title describing internal storage used by the Android System [CHAR LIMIT=48]-->
+    <string name="storage_detail_system">System</string>
     <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+    <string name="storage_detail_explore">Archwilio <xliff:g id="name" example="SD card">^1</xliff:g></string>
     <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
-    <string name="storage_detail_dialog_other">Mae Arall yn cynnwys ffeiliau wedi\'i rhannu a gadwyd gan apiau, ffeiliau wedi\'u lawrlwytho o\'r rhyngrwyd neu Bluetooth, ffeiliau Android, ac yn y blaen.
-\n\nI weld cynnwys gweledol y cerdyn SD <xliff:g id="name" example="SD card">^1</xliff:g>, tapia Archwilio.</string>
+    <string name="storage_detail_dialog_other">Mae Arall yn cynnwys ffeiliau wedi\'u rhannu a gadwyd gan apiau, ffeiliau wedi\'u lawrlwytho o\'r rhyngrwyd neu Bluetooth, ffeiliau Android, ac yn y blaen.
+\n\nI weld cynnwys gweledol y cerdyn SD <xliff:g id="name" example="SD card">^1</xliff:g>, tara Archwilio.</string>
     <!-- Body of dialog informing user about the storage used by the Android System [CHAR LIMIT=NONE]-->
     <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+    <string name="storage_detail_dialog_user">Gall <xliff:g id="user" example="Guest user">^1</xliff:g> fod wedi cadw lluniau, cerddoriaeth, apiau, neu ddata arall gan ddefnyddio <xliff:g id="size" example="1.2 GB">^2</xliff:g> o\'r storfa.
+\n\nI weld manylion, newidia defnyddiwr i <xliff:g id="user" example="Guest user">^1</xliff:g>.</string>
     <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
     <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
     <string name="storage_wizard_init_external_title">Defnyddio fel storfa datgysylltadwy</string>
@@ -1717,11 +2153,13 @@
     <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_init_internal_summary">Er mwyn cadw unrhyw beth beth ar y ddyfais hon yn unig, gan gynnwys apiau a lluniau. Bydd rhaid ei fformatio a ni fydd yn gweithio gyda dyfeisiau eraill.</string>
     <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+    <string name="storage_wizard_format_confirm_title">Fformatio fel storfa fewnol</string>
     <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_format_confirm_body">Mae hyn angen fod <xliff:g id="name" example="SD card">^1</xliff:g> yn cael ei fformatio i\'w wneud yn ddiogel.\n\nAr ôl ei fformatio, bydd <xliff:g id="name" example="SD card">^1</xliff:g> ond yn gweithio yn y ddyfais hon.\n\n<b>Mae fformatio yn dileu\'r holl ddata sydd eisoes ar <xliff:g id="name" example="SD card">^1</xliff:g>.</b> Er mwyn osgoi colli\'r data, mae\'n dda ystyried creu copi wrth gefn.</string>
     <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
     <string name="storage_wizard_format_confirm_public_title">Fformatio fel storfa datgysylltadwy</string>
     <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_format_confirm_public_body">Mae hyn angen i\'r <xliff:g id="name" example="SD card">^1</xliff:g> cael ei fformatio.\n\n<b>Mae fformatio yn dileu\'r holl ddata eisoes ar y <xliff:g id="name" example="SD card">^1</xliff:g>.</b> Os am osgoi colli\'r data, rhaid cadw copi wrth gefn rhywle arall.    </string>
     <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
     <string name="storage_wizard_format_confirm_next">Dileu popeth a fformatio</string>
     <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
@@ -1729,54 +2167,85 @@
     <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_format_progress_body">Paid â thynnu\'r <xliff:g id="name" example="SD card">^</xliff:g> hyd nes bod y fformatio wedi cwblhau.</string>
     <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_title">Symud data i storfa newydd</string>
     <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_migrate_body">Gellir symud dy luniau, ffeiliau a rhai apiau i\'r <xliff:g id="name" example="SD card">^1</xliff:g>.\n\nBydd eu symud yn cymryd tua <xliff:g id="time" example="1 hour">^2</xliff:g> ac yn rhyddhau <xliff:g id="size" example="1.2 GB">^3</xliff:g> o le yn y storfa fewnol. Bydd rhai apiau ddim yn gweithio tra bod y trosglwyddo ar waith.</string>
     <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+    <string name="storage_wizard_migrate_now">Symud nawr</string>
     <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_later">Symud yn hwyrach</string>
     <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_confirm_title">Symud data nawr</string>
     <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_confirm_body"><b>Mae\'r symud yn cymryd tua <xliff:g id="time" example="1 hour">^1</xliff:g>. Mi fydd yn rhyddhau <xliff:g id="size" example="1.2 GB">^2</xliff:g> ar <xliff:g id="name" example="Internal storage">^3</xliff:g>.</b></string>
     <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_confirm_next">Symud</string>
     <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_progress_title">Yn symud data\u2026</string>
     <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
     <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+    <string name="storage_wizard_ready_title">Mae <xliff:g id="name" example="SD card">^1</xliff:g> yn barod</string>
     <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_ready_external_body">Mae dy <xliff:g id="name" example="SD card">^1</xliff:g> wedi ei osod ac yn barod i\'w ddefnyddio gyda lluniau a chyfryngau eraill.    </string>
     <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_ready_internal_body">Mae dy <xliff:g id="name" example="SD card">^1</xliff:g> newydd yn gweithio.\n\nI symud lluniau, ffeiliau, a data apiau i\'r ddyfais hon, gweler Dewisiadau &gt; Storfa.    </string>
     <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_confirm_title">Symud <xliff:g id="app" example="Calculator">^1</xliff:g></string>
     <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
     <string name="storage_wizard_move_confirm_body">Bydd symud <xliff:g id="app" example="Calculator">^1</xliff:g> a\'i ddata i <xliff:g id="name" example="SD card">^2</xliff:g> ond yn cymryd ychydig funudau. Ni fyddi\'n medru defnyddio\'r ap nes bod y trosglwyddo wedi ei gwblhau.\n\nPaid â thynnu <xliff:g id="name" example="SD card">^2</xliff:g> nes bod y trosglwyddo wedi ei gwblhau.</string>
     <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_progress_title">Yn symud <xliff:g id="app" example="Calculator">^1</xliff:g>\u2026</string>
     <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
     <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
     <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_slow_body">Mae\'r <xliff:g id="name" example="SD card">^1</xliff:g> hwn yn ymddangos i fod yn araf.
+\n\nMae\'n bosib parhau, ond mae\'n bosib y bydd apiau sy\'n cael eu symud i\'r lleoliad hwn yn araf wrth stopio a dechrau a gall trosglwyddo data gymryd amser hir.
+\n\nYstyria defnyddio <xliff:g id="name" example="SD card">^1</xliff:g> mwy cyflym ar gyfer perfformiad gwell.</string>
     <!-- Phone info screen, section titles: -->
     <string name="battery_status_title">Statws batri</string>
     <!-- Phone info screen, section titles: -->
+    <string name="battery_level_title">Lefel batri</string>
     <!-- APN Settings -->
     <!-- APN settings screen title -->
+    <string name="apn_settings">APNau</string>
     <!-- Screen title after user selects APNs setting option -->
+    <string name="apn_edit">Golygu pwynt mynediad</string>
     <!-- Edit access point label summary text when no value has been set -->
     <string name="apn_not_set">Heb ei osod</string>
     <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
     <string name="apn_name">Enw</string>
     <!-- Edit access point labels: The actual access point name-->
+    <string name="apn_apn">APN</string>
     <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+    <string name="apn_http_proxy">Procsi</string>
     <!-- Edit access point labels: The port number of the proxy to use for this APN -->
     <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+    <string name="apn_user">Enw defnyddiwr</string>
     <!-- Edit access point labels: The password that will be used when connecting to this APN -->
     <string name="apn_password">Cyfrinair</string>
     <!-- Edit access point labels: The server address to conenct to for this APN -->
+    <string name="apn_server">Gweinydd</string>
     <!-- Edit access point labels: -->
+    <string name="apn_mmsc">MMSC</string>
     <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+    <string name="apn_mms_proxy">Procsi MMS</string>
     <!-- Edit access point labels: The port on the proxy used for MMS-->
+    <string name="apn_mms_port">Porth MMS</string>
     <!-- Edit access point labels: -->
+    <string name="apn_mcc">MCC</string>
     <!-- Edit access point labels: -->
+    <string name="apn_mnc">MNC</string>
     <!-- Edit acces  point labels: Authenticaton type-->
     <!-- Authentication Typs: None -->
     <string name="apn_auth_type_none">Dim</string>
     <!-- Authentication Typs: PAP -->
+    <string name="apn_auth_type_pap">PAP</string>
     <!-- Authentication Typs: CHAP -->
+    <string name="apn_auth_type_chap">CHAP</string>
     <!-- Authentication Typs: PAP or CHAP -->
+    <string name="apn_auth_type_pap_chap">PAP neu CHAP</string>
     <!-- Edit access point labels: The type of APN -->
+    <string name="apn_type">Math APN</string>
     <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
     <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
     <!-- Edit enable/disable of APN -->
@@ -1784,6 +2253,7 @@
     <!-- Edit Mvno Type Info of APN -->
     <!-- Edit Mvno Match Data Info of APN -->
     <!-- Edit access point screen menu option to delete this APN -->
+    <string name="menu_delete">Dileu APN</string>
     <!-- APNs screen menu option to create a brand spanking new APN -->
     <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
     <string name="menu_save">Cadw</string>
@@ -1798,10 +2268,12 @@
     <!-- APNs screen menu option to reset default APN settings -->
     <!-- APNs screen toast message to inform reset default APN settings is completed -->
     <!-- Title for a screen containing all device reset options [CHAR LIMIT=50] -->
+    <string name="reset_dashboard_title">Ailosod dewisiadau</string>
     <!-- Summary text for a screen containing all device reset options [CHAR LIMIT=None] -->
     <string name="reset_dashboard_summary">Gellir ailosod rhwydwaith, apiau neu\'r ddyfais</string>
     <!-- Reset Network -->
     <!-- Button title to reset Wi-Fi settings, Mobile data setting, bluetooth settings -->
+    <string name="reset_network_title">Ailosod Wi-Fi, symudol a Bluetooth</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
     <string name="reset_network_desc">Bydd hyn yn ailosod pob gosodiad rhwydwaith, gan gynnwys:\n\n<li>Wi\u2011Fi</li>\n<li>Data symudol</li>\n<li>Bluetooth</li>\"</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
@@ -1818,13 +2290,17 @@
     <string name="reset_network_complete_toast">Ailosodwyd gosodiadau rhwydweithiau</string>
     <!-- Master Clear -->
     <!-- Button title to factory data reset the entire device -->
+    <string name="master_clear_title">Dileu\'r holl ddata (ailosod i fel yr oedd yn gadael y ffatri)</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc" product="tablet">Bydd hyn yn dileu\'r holl data o <b>storfa mewnol</b> dy lechen, gan gynnwys:\n\n<li>Dy gyfrif Google</li>\n<li>Data a gosodiadau system ac apiau</li>\n<li>Apiau wedi\'u lawrlwytho</li></string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc" product="default">Bydd hyn yn dileu\'r holl data o <b>storfa mewnol</b> dy ffôn, gan gynnwys:\n\n<li>Dy gyfrif Google</li>\n<li>Data a gosodiadau system ac apiau</li>\n<li>Apiau wedi\'u lawrlwytho</li></string>
     <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
     <string name="master_clear_accounts" product="default">\n\nRwyt ar hyn o bryd wedi mewngofnodi i\'r cyfrifon a ganlyn:\n</string>
     <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
     <string name="master_clear_other_users_present" product="default">\n\nMae defnyddwyr eraill ar y ddyfais hon.\n</string>
     <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc_also_erases_external"><li>Cerddoriaeth</li>\n<li>Lluniau</li>\n<li>Data arall y defnyddiwr</li></string>
     <!-- SD card & phone storage settings screen, list of items on an eSIM (embedded SIM) that will be erased during this operation [CHAR LIMIT=NONE] -->
     <!-- SD card & phone storage settings screen, notification if there are eSIM (embedded SIM) profiles present that the user's mobile service plan will not be canceled [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc_no_cancel_mobile_plan">\n\nNi fydd hyn yn canslo dy gynllun gwasanaeth ffôn symudol.</string>
@@ -1837,19 +2313,25 @@
     <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
     <string name="erase_external_storage" product="default">Dileu popeth ar y cerdyn SD</string>
     <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+    <string name="erase_external_storage_description" product="nosdcard">Dileu\'r holl ddata ar y storfa USB mewnol, megis lluniau a cherddoriaeth</string>
     <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+    <string name="erase_external_storage_description" product="default">Dileu\'r holl ddata ar y cerdyn SD, megis lluniau neu gerddoriaeth</string>
     <!-- SD card & phone storage settings screen, label for check box to erase all the carriers information on the embedded SIM card [CHAR LIMIT=30] -->
     <string name="erase_esim_storage">Dileu popeth ar gardiau eSIM</string>
     <!-- SD card & phone storage settings screen, description for check box to erase eSIMs for default devices [CHAR LIMIT=NONE] -->
     <!-- SD card & phone storage settings screen, description for check box to erase eSIMs for tablets [CHAR LIMIT=NONE] -->
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+    <string name="master_clear_button_text" product="tablet">Ailosod y llechen</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+    <string name="master_clear_button_text" product="default">Ailosod y ffôn</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
     <string name="master_clear_final_button_text">Dileu popeth</string>
     <!-- Master clear failed message -->
     <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+    <string name="master_clear_confirm_title">Ailosod?</string>
     <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+    <string name="master_clear_not_available">Dyw ailosod i fel yr oedd yn gadael y ffatri ddim ar gael i\'r defnyddiwr hwn</string>
     <!-- Master clear progress screen title [CHAR LIMIT=30] -->
     <!-- Master clear progress screen text [CHAR LIMIT=75] -->
     <string name="master_clear_progress_text">Arhosa...</string>
@@ -1859,50 +2341,74 @@
     <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
     <!-- Tethering controls, item title to go into the tethering settings -->
     <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+    <string name="tether_settings_title_usb">Tenynnu USB</string>
     <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+    <string name="tether_settings_title_wifi">Llecyn cludadwy</string>
     <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
     <string name="tether_settings_title_bluetooth">Tenynnu Bluetooth</string>
     <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+    <string name="tether_settings_title_usb_bluetooth">Tenynnu</string>
     <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=60]-->
     <!-- Tethering setting summary when both Wi-Fi hotspot and tether are turned on [CHAR LIMIT=NONE]-->
     <!-- Tethering setting summary when Wi-Fi hotspot is on and tether is off [CHAR LIMIT=NONE]-->
     <!-- Tethering setting summary when Wi-Fi hotspot is off and tether is on [CHAR LIMIT=NONE]-->
+    <string name="tether_settings_summary_hotspot_off_tether_on">Tenynnu</string>
     <!-- Tethering controls, footer note displayed when tethering is disabled because Data Saver mode is on [CHAR LIMIT=none]-->
     <!-- USB Tethering options -->
+    <string name="usb_title">USB</string>
+    <string name="usb_tethering_button_text">Tenynnu USB</string>
+    <string name="usb_tethering_subtext" product="default">Rhannu cysylltiad rhwydwaith y ffôn trwy USB</string>
+    <string name="usb_tethering_subtext" product="tablet">Rhannu cysylltiad rhwydwaith y llechen trwy USB</string>
     <!-- Bluetooth Tethering settings-->
     <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
     <string name="bluetooth_tether_checkbox_text">Tenynnu Bluetooth</string>
     <!-- Bluetooth Tethering subtext [CHAR LIMIT=70]-->
+    <string name="bluetooth_tethering_subtext" product="tablet">Rhannu cysylltiad rhwydwaith y llechen trwy Bluetooth</string>
     <!-- Bluetooth Tethering subtext [CHAR LIMIT=70]-->
+    <string name="bluetooth_tethering_subtext" product="default">Rhannu cysylltiad rhwydwaith y ffôn trwy Bluetooth</string>
     <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=80]-->
+    <string name="bluetooth_tethering_off_subtext_config">Rhannu cysylltiad rhyngrwyd y <xliff:g id="device_name">%1$d</xliff:g> yma trwy Bluetooth</string>
     <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
     <string name="bluetooth_tethering_overflow_error">Dyw ond yn bosib tenynnu gyda hyd at <xliff:g id="maxConnection">%1$d</xliff:g> dyfais.</string>
     <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
     <string name="bluetooth_untether_blank">Caiff <xliff:g id="device_name">%1$s</xliff:g> ei dad-denynnu.</string>
     <!-- Tethering footer info [CHAR LIMIT=NONE]-->
     <!-- Tethering help button - calls up a web view with general tethering info -->
+    <string name="tethering_help_button_text">Cymorth</string>
     <!-- Wireless controls, item title to go into the network settings -->
     <!-- Mobile plan [CHAR LIMIT=35]-->
     <string name="manage_mobile_plan_title" translatable="true">Cynllun ffôn symudol</string>
     <!-- SMS Application [CHAR LIMIT=35]-->
+    <string name="sms_application_title" translatable="true">Ap SMS</string>
+    <string name="sms_change_default_dialog_title" translatable="true">Newid apiau SMS?</string>
+    <string name="sms_change_default_no_previous_dialog_text" translatable="true">Defnyddio <xliff:g id="new_app">%s</xliff:g> fel dy ap SMS?</string>
     <!-- Network Scorer Picker title [CHAR LIMIT=40]-->
     <string name="network_scorer_picker_none_preference">Dim</string>
     <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+    <string name="network_scorer_change_active_dialog_title">Newid cynorthwyyd Wi\u2011Fi?</string>
     <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+    <string name="network_scorer_change_active_dialog_text">Defnyddio <xliff:g id="new_app">%1$s</xliff:g> yn lle <xliff:g id="current_app">%2$s</xliff:g> i reoli dy gysylltiadau rhwydwaith?</string>
     <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+    <string name="network_scorer_change_active_no_previous_dialog_text">Defnyddio <xliff:g id="new_app">%s</xliff:g> i reoli dy gysylltiadau rhwydwaith?</string>
     <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
     <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
     <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+    <string name="mobile_insert_sim_card" translatable="true">Gosoda cerdyn SIM ac yna ailddechrau</string>
     <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
     <!-- Security & location settings screen, section header for settings relating to location -->
+    <string name="location_title">Fy Leoliad</string>
     <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
     <string name="managed_profile_location_switch_title">Lleoliad ar gyfer proffil gwaith</string>
     <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+    <string name="location_mode_title">Modd</string>
     <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+    <string name="location_mode_high_accuracy_title">Cywirdeb manwl</string>
     <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+    <string name="location_mode_battery_saving_title">Arbed batri</string>
     <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
     <string name="location_mode_sensors_only_title">Dyfais yn unig</string>
     <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+    <string name="location_mode_location_off_title">Dim adnabod lleoliad</string>
     <!-- [CHAR LIMIT=30] Location settings screen. It's a link that directs the user to a page that
       shows the location permission setting for each installed app -->
     <!-- [CHAR LIMIT=42] Location settings screen, sub category for recent location requests -->
@@ -1910,20 +2416,28 @@
     <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
     <string name="location_category_location_services">Gwasanaethau lleoliad</string>
     <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+    <string name="location_high_battery_use">Defnydd batri uchel</string>
     <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+    <string name="location_low_battery_use">Defnydd batri isel</string>
     <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+    <string name="location_mode_screen_title">Modd lleoliad</string>
     <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+    <string name="location_mode_high_accuracy_description">Defnyddio GPS, Wi\u2011Fi, Bluetooth, neu rwydweithiau symudol i adnabod lleoliad </string>
     <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+    <string name="location_mode_battery_saving_description">Defnyddio Wi\u2011Fi, Bluetooth, neu rwydweithiau symudol i adnabod lleoliad</string>
     <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
     <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
     <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
     <!-- Preference description text for Wi-Fi always scanning -->
+    <string name="location_scanning_wifi_always_scanning_description">Gwella\'r lleoliad gan ganiatáu i apiau a gwasanaethau system canfod rhwydweithiau Wi\u2011Fi unrhyw bryd.</string>
     <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
     <!-- Description text for Bluetooth always scanning -->
+    <string name="location_scanning_bluetooth_always_scanning_description">Gwella lleoliad gan ganiatáu i apiau a gwasanaethau system ganfod dyfeisiau Bluetooth unrhyw bryd.</string>
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+    <string name="location_gps">Lloerennau GPS</string>
     <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
     <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
     <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
@@ -1933,13 +2447,16 @@
     <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
     <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
     <!-- [CHAR LIMIT=none] Description text for location access switch -->
+    <string name="location_access_summary">Caniatáu i apiau sydd wedi gofyn am dy ganiatâd i ddefnyddio gwybodaeth dy leoliad</string>
     <!-- [CHAR LIMIT=45] Section heading for location sources -->
     <!-- About -->
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
     <string name="about_settings" product="default">Ynghylch y ffôn</string>
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+    <string name="about_settings" product="emulator">Ynghylch y ddyfais a efelychir</string>
     <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+    <string name="about_settings_summary">Gweld gwybodaeth gyfreithiol, statws, fersiwn meddalwedd</string>
     <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
     <string name="legal_information">Gwybodaeth gyfreithiol</string>
     <!-- About phone settings screen, setting option name to see a list of contributors -->
@@ -1951,8 +2468,10 @@
     <string name="safety_and_regulatory_info">Llawlyfr diogelwch a rheoleiddiol</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
     <!-- About phone settings screen, setting option name to see copyright-related info -->
+    <string name="copyright_title">Hawlfraint</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
     <!-- About phone settings screen, setting option name to see licensing info -->
+    <string name="license_title">Trwydded</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
     <!-- About phone settings screen, setting option name to see terms and conditions -->
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
@@ -1963,13 +2482,18 @@
     <string name="wallpaper_attributions_values">Darparwyr delweddau lleoren:\©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
     <!-- Phone Manual -->
     <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+    <string name="settings_manual_activity_unavailable">Mae yna broblem wrth lwytho\'r llawlyfr.</string>
     <!-- Title for actual Settings license activity. -->
     <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+    <string name="settings_license_activity_title">Trwyddedau trydydd parti</string>
     <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+    <string name="settings_license_activity_unavailable">Mae yna broblem wrth lwytho\'r trwyddedau.</string>
     <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
     <string name="settings_license_activity_loading">Yn llwytho\u2026</string>
     <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+    <string name="settings_safetylegal_title">Gwybodaeth diogelwch</string>
     <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+    <string name="settings_safetylegal_activity_title">Gwybodaeth diogelwch</string>
     <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
     <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
     <string name="settings_safetylegal_activity_loading">Yn llwytho\u2026</string>
@@ -1983,6 +2507,7 @@
     <!-- Header on first screen of choose password/PIN as backup for fingerprint flow [CHAR LIMIT=30] -->
     <!-- Header on password confirm screen [CHAR LIMIT=40] -->
     <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+    <string name="lockpassword_confirm_your_pattern_header">Cadarnha dy batrwm</string>
     <!-- Header on password confirm screen [CHAR LIMIT=40] -->
     <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_passwords_dont_match">Dyw\'r cyfrineiriau ddim yr un fath</string>
@@ -1991,7 +2516,9 @@
     <!-- Toast shown if setting password was successful -->
     <string name="lockpassword_password_set_toast">Mae\'r cyfrinair wedi ei osod.</string>
     <!-- Toast shown if setting PIN was successful -->
+    <string name="lockpassword_pin_set_toast">Mae\'r PIN wedi ei osod</string>
     <!-- Toast shown if setting pattern was successful -->
+    <string name="lockpassword_pattern_set_toast">Mae\'r patrwm wedi ei osod</string>
     <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pattern_generic">Defnyddia batrwm dy ddyfais i barhau.</string>
@@ -2045,32 +2572,45 @@
     <string name="lockpassword_confirm_your_password_details_frp">Cafodd dy ffôn ei ailosod i fel yr oedd yn gadael y ffatri. I ddefnyddio\'r ffôn, rho dy gyfrinair blaenorol.</string>
     <!-- Header shown when pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
     <!-- Header shown when the pin needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pin_header_frp">Dilysu PIN</string>
     <!-- Header shown when the password needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
     <!-- Security & location settings screen, change security method screen instruction if user
          enters incorrect PIN [CHAR LIMIT=30] -->
+    <string name="lockpassword_invalid_pin">PIN Anghywir</string>
     <!-- Security & location settings screen, change security method screen instruction if user
          enters incorrect password [CHAR LIMIT=30] -->
+    <string name="lockpassword_invalid_password">Cyfrinair Anghywir</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction if user
          draws incorrect pattern [CHAR LIMIT=30] -->
+    <string name="lockpattern_need_to_unlock_wrong">Patrwm Anghywir</string>
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
     <string name="lock_settings_title">Diogelwch y ddyfais</string>
     <!-- Security & location settings screen, setting option name -->
+    <string name="lockpattern_change_lock_pattern_label">Newid y patrwm datgloi</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+    <string name="lockpattern_change_lock_pin_label">Newid y PIN datgloi</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
     <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+    <string name="lockpattern_recording_incorrect_too_short">Rhaid cysylltu o leiaf <xliff:g id="number">%d</xliff:g> dot. Rho gynnig arall arni.</string>
     <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+    <string name="lockpattern_pattern_entered_header">Mae\'r patrwm wedi\'i gofnodi</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+    <string name="lockpattern_need_to_confirm">Llunia\'r patrwm eto i\'w gadarnhau</string>
+    <string name="lockpattern_pattern_confirmed_header">Dy batrwm datgloi newydd</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+    <string name="lockpattern_confirm_button_text">Cadarnhau</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
     <!-- Security & location settings screen, unlock screen activity title -->
     <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
     <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+    <string name="lockpattern_settings_enable_summary">Rhaid llunio\'r patrwm i ddatgloi\'r sgrin</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+    <string name="lockpattern_settings_enable_visible_pattern_title">Dangos y patrwm</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the profile unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the profile.-->
     <string name="lockpattern_settings_enable_visible_pattern_title_profile">Gwneud patrwm proffil yn weladwy</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
@@ -2080,10 +2620,13 @@
     <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
     <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
     <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+    <string name="lockpattern_settings_change_lock_pattern">Newid y patrwm datgloi</string>
     <!-- Security & location settings screen, the help instructions (an animation) caption -->
+    <string name="lockpattern_settings_help_how_to_record">Sut i lunio patrwm datgloi</string>
     <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
          too many incorrect attempts [CHAR LIMIT=120]-->
     <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+    <string name="activity_not_found">Dyw\'r ap heb ei osod ar dy ffôn.</string>
     <!-- Profile Lock settings -->
     <!-- Security & location settings screen, header for profile specific section -->
     <string name="lock_settings_profile_title">Diogelwch proffil gwaith</string>
@@ -2096,6 +2639,7 @@
     <!-- Security & location settings screen, title of the dialog asking if the user wants to unify work and personal locks -->
     <string name="lock_settings_profile_unification_dialog_title">Defnyddio un clo?</string>
     <!-- Security & location settings screen, explanation in the dialog asking if the user wants to unify work and personal locks -->
+    <string name="lock_settings_profile_unification_dialog_body">Bydd dy ddyfais yn defnyddio sgrin cloi dy broffil gwaith. Bydd y ddau glo yn dilyn polisïau gwaith.</string>
     <!-- Security & location settings screen, explanation in the dialog asking if the user wants to create a new lock for personal and work as the current work lock is not enough for the device. -->
     <string name="lock_settings_profile_unification_dialog_uncompliant_body">Dyw clo dy broffil gwaith ddim yn cwrdd ag anghenion diogelwch dy sefydliad. Mae\'n bosib defnyddio\'r un clo ar gyfer sgrin dy ddyfais a dy broffil gwaith, ond bydd yn rhaid iddo gydymffurfio â pholisïau dy weithle.</string>
     <!-- Security & location settings screen, confirmation button of the dialog for user with compliant lock, asking to create a new lock for both personal and work profiles. -->
@@ -2110,6 +2654,7 @@
     <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
     <string name="manageapplications_settings_summary">Rheoli a thynnu apiau wedi\'u gosod</string>
     <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+    <string name="applications_settings">Gwybodaeth ap</string>
     <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
     <!-- Applications settings screen heading. The header for the Application settings screen. -->
     <string name="applications_settings_header">Gosodiadau apiau</string>
@@ -2118,17 +2663,20 @@
     <!-- Category title listing recently used apps [CHAR_LIMIT=50]-->
     <!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->
     <!-- Preference summary for each recently used app, which is the time since last used, i.e. "7 h 20 min ago". Note: ^1 should be used in all translations [CHAR_LIMIT=60] -->
+    <string name="recent_app_summary"><xliff:g id="time">^1</xliff:g> yn ôl</string>
     <!-- Warning that appears below the unknown sources switch in settings -->
-    <string name="install_all_warning" product="tablet">Mae dy lechen a dy ddata personol yn llai diogel rhag ymosodiad gan apiau anhysbys. Wrth osod apiau o\'r ffynhonell hon, rwyt yn cytuno dy fod yn gyfrifol am unrhyw niwed i dy ddyfais neu golled data y gall ddigwydd o ganlyniad i\'w defnyddio.    </string>
+    <string name="install_all_warning" product="tablet">Mae dy lechen a dy ddata personol yn llai diogel rhag ymosodiad gan apiau anhysbys. Wrth osod apiau o\'r ffynhonell hon, rwyt yn cytuno dy fod yn gyfrifol am unrhyw niwed i dy ddyfais neu golled data gall ddigwydd o ganlyniad i\'w defnyddio.    </string>
     <!-- Warning that appears below the unknown sources switch in settings -->
-    <string name="install_all_warning" product="default">Mae dy ffôn a dy ddata personol yn llai diogel rhag ymosodiad gan apiau anhysbys. Wrth osod apiau o\'r ffynhonell hon, rwyt yn cytuno dy fod yn gyfrifol am unrhyw niwed i dy ddyfais neu golled data y gall ddigwydd o ganlyniad i\'w defnyddio.    </string>
+    <string name="install_all_warning" product="default">Mae dy ffôn a dy ddata personol yn llai diogel rhag ymosodiad gan apiau anhysbys. Wrth osod apiau o\'r ffynhonell hon, rwyt yn cytuno dy fod yn gyfrifol am unrhyw niwed i dy ddyfais neu golled data gall ddigwydd o ganlyniad i\'w defnyddio.    </string>
     <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
     <string name="advanced_settings">Gosodiadau uwch</string>
     <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
     <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+    <string name="application_info_label">Gwybodaeth ap</string>
     <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
     <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
     <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+    <string name="auto_launch_label_generic">Rhagosodiadau</string>
     <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
     <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
     <!-- Manage applications, Header name used for cache information -->
@@ -2146,36 +2694,55 @@
     <!-- Manage applications, individual application info storage screen. Button below list of URIs. -->
     <string name="clear_uri_btn_text">Clirio mynediad</string>
     <!-- Manage applications, Header name used for other controls -->
+    <string name="controls_label">Rheolaeth</string>
     <!-- Manage applications, text label for button to kill / force stop an application -->
+    <string name="force_stop">Gorfodi stopio</string>
     <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+    <string name="total_size_label">Cyfanswm</string>
     <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+    <string name="application_size_label">Maint ap</string>
     <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
     <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
     <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
     <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+    <string name="external_data_size_label" product="default">Cerdyn SD</string>
     <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+    <string name="uninstall_text">Dadosod</string>
     <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+    <string name="uninstall_all_users_text">Dadosod ar gyfer pob defnyddiwr</string>
     <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+    <string name="install_text">Gosod</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+    <string name="disable_text">Analluogi</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+    <string name="enable_text">Galluogi</string>
     <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+    <string name="clear_user_data_text">Clirio data</string>
     <!-- Manage applications, restore updated system application to factory version -->
+    <string name="app_factory_reset">Dadosod diweddariadau</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+    <string name="auto_launch_enable_text">Rwyt wedi dewis defnyddio\'r ap hwn ar gyfer rhai gweithredoedd.</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+    <string name="always_allow_bind_appwidgets_text">Rwyt wedi dewis caniatáu’r ap hwn i greu teclynnau a chael mynediad i\'w data.</string>
     <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+    <string name="auto_launch_disable_text">Dim rhagosodiadau wedi\'u gosod.</string>
     <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+    <string name="clear_activities">Clirio rhagosodiadau</string>
     <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
     <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
     <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
     <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
     <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+    <string name="unknown">Anhysybys</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
     <string name="sort_order_alpha">Trefnu yn ôl enw</string>
     <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+    <string name="sort_order_size">Trefnu yn ôl maint</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
     <string name="show_running_services">Dangos gwasanaethau sy\'n rhedeg</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
     <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+    <string name="default_emergency_app">Ap mewn Argyfwng</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
     <string name="reset_app_preferences">Ailosod dewisiadau apiau</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
@@ -2192,40 +2759,52 @@ Ni fyddi di\'n colli data unrhyw ap.</string>
     <string name="reset_app_preferences_button">Ailosod apiau</string>
     <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
     <!-- Text for menu option in ManageApps screen to present various menu options -->
+    <string name="filter">Hidlydd</string>
     <!-- Title of dialog for presenting filter options -->
+    <string name="filter_dlg_title">Dewis opsiynau hidlydd</string>
     <!-- Text for filter option in ManageApps screen to display all installed
     applications -->
+    <string name="filter_apps_all">Pob ap</string>
     <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
     <!-- Text for filter option in ManageApps screen to display third party
     applications only -->
+    <string name="filter_apps_third_party">Wedi eu lawrlwytho</string>
     <!-- Text for filter option in ManageApps screen to display list of running
     packages only. -->
     <!-- Text for filter option in ManageApps screen to display list of
     packages installed on sdcard. [CHAR LIMIT=30] -->
     <!-- Text for filter option in ManageApps screen to display list of
     packages installed on sdcard. -->
+    <string name="filter_apps_onsdcard" product="default">Ar gerdyn SD</string>
     <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
     <string name="not_installed">Heb ei osod ar gyfer y defnyddiwr hwn</string>
     <!-- [CHAR LIMIT=30] App details, text telling an application is installed. -->
+    <string name="installed">Wedi\'i osod</string>
     <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+    <string name="no_applications">Dim apiau.</string>
     <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
     <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
     <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
     <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
     <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
     <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+    <string name="clear_data_dlg_title">Dileu data\'r ap?</string>
     <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+    <string name="clear_data_dlg_text">Caiff holl ddata\'r ap hwn ei ddileu yn barhaol. Mae hyn yn cynnwys holl ffeiliau, gosodiadau, cyfrifon, cronfeydd data, ayyb.</string>
     <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
     <string name="dlg_ok">Iawn</string>
     <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
     <string name="dlg_cancel">Diddymu</string>
     <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
     <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+    <string name="app_not_found_dlg_text"> Ni chanfuwyd yr ap yn y rhestr o apiau wedi\u2019u gosod.</string>
     <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
     <!-- Manage applications, title for dialog if clear data fails-->
+    <string name="clear_failed_dlg_title">Clirio data</string>
     <!-- Manage applications, text for dialog if clear data fails-->
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+    <string name="security_settings_desc" product="default">Mae gan yr ap hwn mynediad i\'r canlynol ar dy ffôn:</string>
     <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
          This describes the permissions that the application has.  It is used when multiple packages are contributing
          to the permissions and need to be listed here. -->
@@ -2237,42 +2816,63 @@ Er mwyn gwella perfformiad a lleihau defnydd cof, mae peth o\'r caniatâd hwn ar
     <string name="security_settings_desc_multi" product="default">Gall yr ap hwn gael mynediad i\'r canlynol ar dy ffôn.
 Er mwyn gwella perfformiad a lleihau defnydd cof, mae peth o\'r caniatâd hwn ar gael i <xliff:g id="base_app_name">%1$s</xliff:g> gan ei fod yn rhedeg yr un broses a <xliff:g id="additional_apps_list">%2$s</xliff:g>:</string>
     <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+    <string name="join_two_items"><xliff:g id="first_item">%1$s</xliff:g> a <xliff:g id="second_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put together two unrelated items in a list when "and" is not an appropriate conjunction for these 2 items -->
     <string name="join_two_unrelated_items"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="second_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+    <string name="join_many_items_last"><xliff:g id="all_but_last_item">%1$s</xliff:g> a <xliff:g id="last_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+    <string name="join_many_items_first"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="all_but_first_and_last_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+    <string name="join_many_items_middle"><xliff:g id="added_item">%1$s</xliff:g>, <xliff:g id="rest_of_items">%2$s</xliff:g></string>
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
     <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
     <string name="security_settings_premium_sms_desc">Anfon SMS premiwm</string>
+    <string name="computing_size">Yn cyfrifo\u2026</string>
     <!-- String displayed when list is empty -->
     <!-- Manage applications, version string displayed in app snippet -->
+    <string name="version_text">fersiwn <xliff:g id="version_num">%1$s</xliff:g></string>
     <!-- Manage applications, text for Move button -->
+    <string name="move_app">Symud</string>
     <!-- Manage applications, text for Move button to move app to internal storage -->
+    <string name="move_app_to_internal" product="tablet">Symud i lechen</string>
     <!-- Manage applications, text for Move button to move app to internal storage -->
+    <string name="move_app_to_internal" product="default">Symud i ffôn</string>
     <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+    <string name="move_app_to_sdcard" product="nosdcard">Symud i storfa USB</string>
     <!-- Manage applications, text for Move button  to move app to sdcard -->
+    <string name="move_app_to_sdcard" product="default">Symud i gerdyn SD</string>
     <!-- Manage applications, title for dialog when killing persistent apps-->
     <!-- Manage applications, text for Move button when move is in progress -->
+    <string name="moving">Yn symud</string>
     <!-- Text of pop up message if the request for a "migrate primary storage" operation
          (see storage_menu_migrate) is denied as another is already in progress. [CHAR LIMIT=75] -->
     <string name="another_migration_already_in_progress">Mae ymfudiad arall eisoes ar y gweill.</string>
     <!-- Manage applications, text for move error messages -->
     <string name="insufficient_storage">Dim digon o gof yn weddill.</string>
+    <string name="does_not_exist">Dyw\u2019r ap ddim yn bodoli.</string>
+    <string name="invalid_location">Nid yw\u2019r lleoliad gosod yn ddilys.</string>
     <!-- Error message shown when trying to move device administrators to external disks, such as SD card [CHAR_LIMIT=none] -->
+    <string name="force_stop_dlg_title">Gorfodi stopio?</string>
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+    <string name="force_stop_dlg_text">Os wyt yn gorfodi ap i stopio, mae\'n bosib iddo ymddwyn yn anarferol.</string>
     <!-- Manage applications, text for dialog when moving an app -->
     <!-- Manage applications, text for dialog moving an app -->
+    <string name="move_app_failed_dlg_text">Methwyd â symud yr ap. <xliff:g id="reason">%1$s</xliff:g></string>
     <!-- Manage applications, application installation location title -->
     <!-- Manage applications. application installation location summary -->
     <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
     <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+    <string name="app_disable_dlg_positive">Anallugoi ap</string>
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
     <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+    <string name="app_special_disable_dlg_title">Dileu data ac analluogi\'r ap?</string>
     <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+    <string name="app_special_disable_dlg_text">Os rwyt yn analluogi\'r ap hwn, mae\'n bosib na fydd Android a rhai apiau eraill yn gweithio yn gywir. Caiff dy ddata ei ddileu hefyd.</string>
     <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
     <string name="app_disable_notifications_dlg_title">Troi hysbysiadau i ffwrdd?</string>
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+    <string name="app_disable_notifications_dlg_text">Os wyt yn troi hysbysiadau\'r ap hwn i ffwrdd mae\'n bosib y byddi\'n methu rhybuddion a diweddariadau pwysig.    </string>
     <!-- Manage applications, individual application info screen, section heading for information about the app installer [CHAR_LIMIT=25] -->
     <string name="app_install_details_group_title">Siop</string>
     <!-- Manage applications, individual application info screen, title for the option which will trigger application info in it's installer [CHAR_LIMIT=25] -->
@@ -2283,7 +2883,9 @@ Er mwyn gwella perfformiad a lleihau defnydd cof, mae peth o\'r caniatâd hwn ar
     <!-- App Ops Settings -->
     <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
     <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+    <string name="app_ops_running">Yn rhedeg</string>
     <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+    <string name="app_ops_never_used">(Erioed wedi\'i ddefnyddio)</string>
     <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
     <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
     <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
@@ -2293,13 +2895,20 @@ Er mwyn gwella perfformiad a lleihau defnydd cof, mae peth o\'r caniatâd hwn ar
     <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
     <!-- Running services, description for a service in the started state -->
     <!-- Running services, description for a service in the started state -->
+    <string name="service_client_name"><xliff:g id="client_name">%1$s</xliff:g></string>
     <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+    <string name="service_background_processes"><xliff:g id="memory">%1$s</xliff:g> ar gael</string>
     <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+    <string name="service_foreground_processes">defnyddiwyd <xliff:g id="memory">%1$s</xliff:g></string>
     <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+    <string name="memory">RAM</string>
     <!-- Text to label a process entry with the process name. -->
+    <string name="service_process_name"><xliff:g id="process">%1$s</xliff:g></string>
     <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
     <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+    <string name="running_process_item_user_label">Defnyddiwr: <xliff:g id="user_name">%1$s</xliff:g></string>
     <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+    <string name="running_process_item_removed_user_label">Tynnwyd y defnyddiwr</string>
     <!-- Descriptive text of a running process: singular process, singular service. -->
     <string name="running_processes_item_description_s_s"><xliff:g id="numprocess">%1$d</xliff:g>
         proses ac <xliff:g id="numservices">%2$d</xliff:g> gwasanaeth</string>
@@ -2316,17 +2925,23 @@ Er mwyn gwella perfformiad a lleihau defnydd cof, mae peth o\'r caniatâd hwn ar
     <string name="running_processes_header_title">Storfa\'r ddyfais</string>
     <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
          processes/services list. -->
+    <string name="running_processes_header_footer">Defnydd RAM ap</string>
     <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
          used by system. -->
+    <string name="running_processes_header_system_prefix">System</string>
     <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
          used by apps. -->
+    <string name="running_processes_header_apps_prefix">Apiau</string>
     <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
          that is free. -->
+    <string name="running_processes_header_free_prefix">Rhydd</string>
     <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
          used by everything. -->
+    <string name="running_processes_header_used_prefix">Defnyddiwyd</string>
     <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
          of free RAM that is used by cached apps. -->
     <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+    <string name="running_processes_header_ram"><xliff:g id="ram">%1$s</xliff:g> o RAM</string>
     <!-- Details about an application's running services. -->
     <!-- Message displayed when there are no active services in a process. -->
     <string name="no_services">Dim yn weithredol</string>
@@ -2335,6 +2950,7 @@ Er mwyn gwella perfformiad a lleihau defnydd cof, mae peth o\'r caniatâd hwn ar
     <!-- Title for list of services. -->
     <!-- Running service details, stop a service that has started itself. -->
     <!-- Running service details, manage a service that is running for some other reason. -->
+    <string name="service_manage">Gosodiadau</string>
     <!-- Running service details, default description for services that are started. -->
     <!-- Running service details, description for running heavy-weight process. -->
     <!-- Running service details, description for background process. -->
@@ -2346,7 +2962,9 @@ yn cael ei ddefnyddio ar hyn o bryd. Tara Gosodiadau i\'w reoli.</string>
     <!-- Message that a process's provider is in use. -->
     <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
     <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+    <string name="runningservicedetails_stop_dlg_text" product="tablet">Os wyt yn stopio\'r gwasanaeth hwn gall rhai nodweddion dy lechen stopio gweithio\'n gywir nes dy fod yn ei droi i ffwrdd ac ymlaen eto.</string>
     <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+    <string name="runningservicedetails_stop_dlg_text" product="default">Os wyt yn stopio\'r gwasanaeth hwn gall rhai nodweddion dy ffôn stopio gweithio\'n gywir nes dy fod yn ei throi i ffwrdd ac ymlaen eto.</string>
     <!-- Languages Settings -->
     <!-- Title of Language, input & gestures setting on main settings screen. -->
     <!-- Summary of Language, input & gestures setting on main settings screen when both gesture setting and assistant feature is on. -->
@@ -2427,21 +3045,33 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="user_dict_settings_title">Geiriadur personol</string>
     <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+    <string name="user_dict_settings_add_menu_title">Ychwanegu</string>
     <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+    <string name="user_dict_settings_add_dialog_title">Ychwanegu i\'r geiriadur</string>
     <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+    <string name="user_dict_settings_add_screen_title">Ymadrodd</string>
     <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+    <string name="user_dict_settings_add_dialog_more_options">Rhagor o ddewisiadau</string>
     <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+    <string name="user_dict_settings_add_dialog_less_options">Llai o ddewisiadau</string>
     <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
     <string name="user_dict_settings_add_dialog_confirm">Iawn</string>
     <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+    <string name="user_dict_settings_add_word_option_name">Gair:</string>
     <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+    <string name="user_dict_settings_add_shortcut_option_name">Llwybr byr:</string>
     <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
     <string name="user_dict_settings_add_locale_option_name">Iaith:</string>
     <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_add_word_hint">Teipia air</string>
     <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_add_shortcut_hint">Llwybr byr dewisol</string>
     <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+    <string name="user_dict_settings_edit_dialog_title">Golygu gair</string>
     <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+    <string name="user_dict_settings_context_menu_edit_title">Golygu</string>
     <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+    <string name="user_dict_settings_context_menu_delete_title">Dileu</string>
     <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
     <string name="user_dict_settings_empty_text">Does dim geiriau yn y geiriadur defnyddiwr. I ychwanegu gair, tara\'r botwm Ychwanegu (+).</string>
     <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
@@ -2450,19 +3080,28 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="user_dict_settings_more_languages">Rhagor o ieithoedd…</string>
     <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
     <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+    <string name="testing_phone_info" product="tablet">Gwybodaeth y llechen</string>
     <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+    <string name="testing_phone_info" product="default">Gwybodaeth y ffôn</string>
     <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
     <!-- Input methods Settings -->
     <!-- Setting name for Input Method chooser -->
+    <string name="input_method">Dull mewnbwn</string>
     <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
     <string name="current_input_method">Bysellfwrdd ar hyn o bryd</string>
     <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+    <string name="input_method_selector">Dewisydd dull mewnbwn</string>
     <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+    <string name="input_method_selector_show_automatically_title">Awtomatig</string>
     <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+    <string name="input_method_selector_always_show_title">Dangos bob tro</string>
     <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+    <string name="input_method_selector_always_hide_title">Cuddio bob tro</string>
     <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
     <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+    <string name="input_method_settings">Gosodiadau</string>
     <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+    <string name="input_method_settings_button">Gosodiadau</string>
     <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
     <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
     <!-- Summary for on-screen keyboard settings -->
@@ -2478,11 +3117,17 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
     <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
     <!-- XXX remove? Strings used for displaying usage statistics -->
+    <string name="usage_stats_label">Ystadegau defnydd</string>
     <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+    <string name="testing_usage_stats">Ystadegau defnydd</string>
     <!-- label for text to indicate sort options -->
+    <string name="display_order_text">Trefnu yn ôl:</string>
     <!-- label for application name -->
+    <string name="app_name_label">Ap</string>
     <!-- label for last time used -->
+    <string name="last_time_used_label">Defnyddiwyd ddiwethaf</string>
     <!-- label for usage time -->
+    <string name="usage_time_label">Amser defnydd</string>
     <!-- Accessibility settings -->
     <!-- Settings title in main settings screen for accessibility settings -->
     <string name="accessibility_settings">Hygyrchedd</string>
@@ -2503,6 +3148,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
     <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->
     <!-- Title for the accessibility preference category of settings considered to be experimental, meaning they might be changed or removed in the future. [CHAR LIMIT=50] -->
+    <string name="experimental_category_title">Arbrofol</string>
     <!-- Title for the Talkback Accessibility Service. Displayed on the Accessibility Settings screen in Setup Wizard. [CHAR_LIMIT=25] -->
     <!-- Summary for the Talkback Accessibility Service. Lets the user know that Talkback is a screenreader and that it is usually most helpful to blind and low vision users and whether the service is on. [CHAR_LIMIT=none] -->
     <string name="talkback_summary">Darllenydd sgrin yn bennaf ar gyfer pobol gyda nam ar eu golwg</string>
@@ -2510,22 +3156,33 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
     <string name="accessibility_captioning_title">Capsiynau</string>
     <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+    <string name="accessibility_screen_magnification_title">Chwyddo</string>
     <!-- Title for the accessibility preference screen to enable triple-tap gesture screen magnification. [CHAR LIMIT=35] -->
+    <string name="accessibility_screen_magnification_gestures_title">Chwyddo wrth daro teirgwaith</string>
     <!-- Title for the accessibility preference screen to enable navigation bar screen magnification. [CHAR LIMIT=35] -->
+    <string name="accessibility_screen_magnification_navbar_title">Chwyddo gyda botwm</string>
     <!-- Summary for the accessibility magnification setting indicating both "Magnify with button" and "Magnify with triple-tap" are enabled [CHAR LIMIT=50] -->
+    <string name="accessibility_screen_magnification_state_navbar_gesture">Chwyddo gyda botwm a tharo teirgwaith</string>
     <!-- Summary for the accessibility preference to enable screen magnification. [CHAR LIMIT=25] -->
     <!-- Short summary for Magnification gesture. Tells the user that this feature allows the user to magnify the screen by tapping 3 times. Appears in accessibility portion of setup wizard -->
     <string name="accessibility_screen_magnification_short_summary">Taro 3 gwaith i chwyddo</string>
     <!-- Short summary for nav bar Magnification. Tells the user that this feature allows the user to magnify the screen using a button in the nav bar -->
+    <string name="accessibility_screen_magnification_navbar_short_summary">Tara botwm i chwyddo</string>
     <!-- Summary for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->
+    <string name="accessibility_screen_magnification_summary"><b>I chwyddo</b>, tara\'r sgrin yn gyflym tair gwaith.\n<ul><li>Llusga dau fys i sgrolio</li>\n<li>Pinsia dau fys i addasu\'r chwyddo</li></ul>\n\n<b>I chwyddo dros dro</b>, tara\'r sgrin yn gyflym tair gwaith gan gadw dy drydydd cyffyrddiad.\n<ul><li>Llusga i symud o amgylch y sgrin</li>\n<li>Coda dy fys i ddadchwyddo</li></ul>\n\nNid yw\'n bosib chwyddo ar y bysellfwrdd na\'r bar llywio.</string>
     <!-- Summary for the accessibility preference screen to enable screen magnification via the nav bar. [CHAR LIMIT=none] -->
+    <string name="accessibility_screen_magnification_navbar_summary">Man fo chwyddo wedi\'i droi ymlaen, defnyddia\'r botwm Hygyrchedd ar waelod y sgrin i chwyddo\'n gyflym.\n\n<b>I chwyddo</b>, tara\'r botwm Hygyrchedd, yna tara rhywle ar y sgrin.\n<ul><li>Llusga dau fys i sgrolio</li>\n<li>Pinsia dau fys i addasu\'r chwyddo</li></ul>\n\n<b>I chwyddo dros dro</b>, tara\'r botwm Hygyrchedd, yna cyffyrdda a dal dy gyffyrddiad rhywle ar y sgrin.\n<ul><li>Llusga i symud o amgylch y sgrin</li>\n<li>Coda dy fys i ddadchwyddo</li></ul>\n\nNid yw\'n bosib chwyddo ar y bysellfwrdd na\'r bar llywio.</string>
     <!-- Summary text appearing on the accessibility preference screen to enable screen magnification from the nav bar when the feature is enabled, but the accessibility button is not configured correctly for the feature to be used [CHAR LIMIT=none] -->
+    <string name="accessibility_screen_magnification_navbar_configuration_warning">Mae\'r botwm Hygyrchedd wedi\'i osod i <xliff:g id="service" example="Select to Speak">%1$s</xliff:g>. I ddefnyddio chwyddo, cyffyrdda a dal y botwm Hygyrchedd, yna dewisa chwyddo.</string>
     <!-- Title for the preference to configure the accessibility shortcut, which uses the volume keys. [CHAR LIMIT=35] -->
     <!-- Title for the preference to choose the service that is turned on and off by the accessibility shortcut. [CHAR LIMIT=35] -->
     <!-- Title for the switch preference that controls whether or not the accessibility shortcut works on the lock screen. [CHAR LIMIT=35] -->
+    <string name="accessibility_shortcut_service_on_lock_screen_title">Caniatáu o\'r sgrin gloi</string>
     <!-- Description of accessibility shortcut. [CHAR LIMIT=NONE] -->
     <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_high_text_contrast_preference_title">Testun cyferbyniad uchel</string>
     <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title">Awto diweddaru chwyddo\'r sgrin</string>
     <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
     <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
     <string name="accessibility_power_button_ends_call_prerefence_title">Botwm pŵer yn gorffen galwad</string>
@@ -2536,9 +3193,13 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Summary for the accessibility preference for master mono. [CHAR LIMIT=50] -->
     <string name="accessibility_toggle_master_mono_summary">Cyfuno sianeli wrth chwarae sain</string>
     <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+    <string name="accessibility_long_press_timeout_preference_title">Oediad cyffwrdd a dal</string>
     <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_display_inversion_preference_title">Gwrthdroad lliwiau</string>
     <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_display_inversion_preference_subtitle">Gall gael effaith ar berfformiad</string>
     <!-- Title for accessibility preference for configuring feature that performs click action soon after mouse/trackpad pointer stops moving. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_autoclick_preference_title">Clicio pan mae\'r pwyntydd yn stopio symud</string>
     <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
     <string name="accessibility_autoclick_delay_preference_title">Oedi cyn clicio</string>
     <!-- Preference's state when enabled. Note: UPPERCASE -->
@@ -2546,7 +3207,9 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Preference's state when disabled. Note: UPPERCASE -->
     <string name="accessibility_summary_state_disabled">I FFWRDD</string>
     <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+    <string name="enable_quick_setting">Dangos yng Ngosodiadau Cyflym</string>
     <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+    <string name="daltonizer_type">Modd cywiro</string>
     <!-- Subtitle for the accessibility preference to configure feature that performs click action soon after mouse/trackpad pointer stops moving, in case delay before click is extremely short. Placeholder will be set to the number of milliseconds to which the delay amounts. [CHAR LIMIT=NONE] -->
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay">
         <item quantity="zero">Oediad hynod o fyr (<xliff:g id="click_delay_label" example="200">%1$d</xliff:g> me)</item>
@@ -2593,6 +3256,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
         <item quantity="other">Oediad hynod o hir (<xliff:g id="click_delay_label" example="200">%1$d</xliff:g> me)</item>
     </plurals>
     <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+    <string name="accessibility_menu_item_settings">Gosodiadau</string>
     <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
     <string name="accessibility_feature_state_on">Ymlaen</string>
     <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
@@ -2616,47 +3280,69 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
     <string name="captioning_window_opacity">Anhryloywder ffenestr capsiwn</string>
     <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+    <string name="captioning_foreground_color">Lliw testun</string>
     <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
     <string name="captioning_foreground_opacity">Anhryloywder testun</string>
     <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+    <string name="captioning_edge_color">Lliw ymyl</string>
     <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+    <string name="captioning_edge_type">Math o ymyl</string>
     <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
     <string name="captioning_typeface">Teulu ffont</string>
     <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
     <string name="captioning_preview_text">Bydd capsiynau yn edrych fel hyn</string>
     <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+    <string name="captioning_preview_characters">Aa</string>
     <!-- Label for the default device locale. [CHAR LIMIT=35] -->
     <string name="locale_default">Rhagosodiad</string>
     <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+    <string name="color_title">Lliw</string>
     <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+    <string name="color_unspecified">Rhagosodiad</string>
     <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
     <string name="color_none">Dim</string>
     <!-- Label for the color white. [CHAR LIMIT=35] -->
+    <string name="color_white">Gwyn</string>
     <!-- Label for the color gray. [CHAR LIMIT=35] -->
+    <string name="color_gray">Llwyd</string>
     <!-- Label for the color black. [CHAR LIMIT=35] -->
+    <string name="color_black">Du</string>
     <!-- Label for the color red. [CHAR LIMIT=35] -->
+    <string name="color_red">Coch</string>
     <!-- Label for the color green. [CHAR LIMIT=35] -->
+    <string name="color_green">Gwyrdd</string>
     <!-- Label for the color blue. [CHAR LIMIT=35] -->
+    <string name="color_blue">Glas</string>
     <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+    <string name="color_cyan">Gwyrddlas</string>
     <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+    <string name="color_yellow">Melyn</string>
     <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+    <string name="color_magenta">Magenta</string>
     <!-- Label for custom colors, formats as a HTML color. -->
     <!-- Title for a warning about security implications of enabling an accessibility
          service. [CHAR LIMIT=NONE] -->
+    <string name="enable_service_title">Defnyddio <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
     <!-- Title for the list of capabilities of an accessibility service. -->
+    <string name="capabilities_list_title">Mae ar <xliff:g id="service" example="TalkBack">%1$s</xliff:g> angen:</string>
     <!-- Warning shown when user input has been blocked due to another app overlaying screen
          content. Since we don't know what the app is showing on top of the input target, we
          can't verify user consent. [CHAR LIMIT=NONE] -->
     <!-- Warning that the device data will not be encrypted with password or PIN if
         enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+    <string name="enable_service_encryption_warning">Os wyt yn troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> ymlaen, ni fydd dy ddyfais yn defnyddio\'r sgrin cloi i wella amgryptiad data.</string>
     <!-- Warning that the device data will not be encrypted with password or PIN if
          choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
     <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <string name="enable_service_pattern_reason">Gan fod troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i ffwrdd yn effeithio ar dy amgryptiad data, rhaid cadarnhau dy batrwm.    </string>
     <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <string name="enable_service_pin_reason">Gan fod troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i ffwrdd yn effeithio ar dy amgryptiad data, rhaid cadarnhau dy PIN.    </string>
     <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <string name="enable_service_password_reason">Gan fod troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i ffwrdd yn effeithio ar dy amgryptiad data, rhaid cadarnhau dy gyfrinair.    </string>
     <!-- Title for the capability of an accessibility service to receive events and keys. -->
     <!-- Description for the capability of an accessibility service to receive events and keys. -->
     <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <string name="disable_service_title">Stopio <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
     <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
     <string name="disable_service_message">Bydd taro Iawn yn stopio <xliff:g id="service" example="TalkBack">%1$s</xliff:g>.</string>
     <!-- Title for the prompt shown as a placeholder if no accessibility services are installed. [CHAR LIMIT=50] -->
@@ -2664,6 +3350,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the acccessibility shortcut's summary if no service is selected for use with the shortcut. [CHAR LIMIT=50] -->
     <!-- Default description for an accessibility service if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
     <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+    <string name="settings_button">Gosodiadau</string>
     <!-- Printing settings -->
     <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
     <string name="print_settings">Argraffu</string>
@@ -2676,7 +3363,9 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the prompt shown as a placeholder if no print services are installed. [CHAR LIMIT=50] -->
     <string name="print_no_services_installed">Dim gwasanaeth wedi\'i osod</string>
     <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+    <string name="print_no_printers_found">Ni ddaethpwyd o hyd i argraffydd</string>
     <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_settings">Gosodiadau</string>
     <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
     <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
     <string name="print_feature_state_on">Ymlaen</string>
@@ -2696,9 +3385,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
     <string name="print_cancel">Diddymu</string>
     <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+    <string name="print_job_summary"><xliff:g id="printer">%1$s</xliff:g>\n<xliff:g id="time">%2$s</xliff:g></string>
     <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
     <string name="print_printing_state_title_template">Yn argraffu <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
     <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+    <string name="print_cancelling_state_title_template">Yn diddymu <xliff:g id="print_job_name" example="foo.jpg">%1$s </xliff:g></string>
     <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
     <!-- Template for the label of the state for a blocked print job. [CHAR LIMIT=25] -->
     <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
@@ -2710,31 +3401,47 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Activity title for App Fuel Gauge summary -->
     <string name="power_usage_summary_title">Batri</string>
     <!-- Activity title summary for App Fuel Gauge summary -->
+    <string name="power_usage_summary">Pethau sydd wedi bod yn defnyddio\'r batri</string>
     <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+    <string name="power_usage_not_available">Dyw data defnydd batri ddim ar gael.</string>
     <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+    <string name="power_usage_level_and_status"><xliff:g id="level">%1$s</xliff:g>
+            - <xliff:g id="status">%2$s</xliff:g></string>
     <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+    <string name="power_discharge_remaining"><xliff:g id="remain">%1$s</xliff:g> yn weddill</string>
     <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
     <!-- Title for the background activity setting, which allows a user to control whether an app can run in the background [CHAR_LIMIT=40] -->
     <!-- Summary for the background activity [CHAR_LIMIT=120] -->
+    <string name="background_activity_summary">Caniatáu i\'r ap hwn redeg yn y cefndir</string>
     <!-- Summary for the background activity when it is on [CHAR_LIMIT=120] -->
+    <string name="background_activity_summary_on">Gall yr ap redeg yn y cefndir pan nad yw\'n cael ei ddefnyddio</string>
     <!-- Summary for the background activity when it is off [CHAR_LIMIT=120] -->
     <!-- Summary for the background activity when it is disabled [CHAR_LIMIT=120] -->
+    <string name="background_activity_summary_disabled">Ni chaniateir i\'r ap redeg yn y cefndir</string>
     <!-- Title for the screen usage in power use UI [CHAR_LIMIT=60] -->
     <!-- Title for the screen consumption in power use UI(i.e. Screen consumption: 30% of battery usage) [CHAR_LIMIT=40] -->
     <!-- Title for the cellular network in power use UI(i.e. Mobile network scanning: 30% of battery usage) [CHAR_LIMIT=40] -->
     <!-- Label for time since last full charge in power use UI, i.e. "7 h 20 min ago". Note: ^1 should be used in all translations [CHAR_LIMIT=60] -->
+    <string name="power_last_full_charge_summary"><xliff:g id="time">^1</xliff:g> yn ôl</string>
     <!-- Label for list of apps using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
+    <string name="power_usage_list_summary">Defnydd apiau ers gwefru\'n llawn (<xliff:g id="time">^1</xliff:g> yn ôl)</string>
     <!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
     <!-- Description for the screen usage item [CHAR_LIMIT=120] -->
+    <string name="screen_usage_summary">Pa mor hir mae\'r sgrin wedi bod ymlaen ers gwefru\'n llawn</string>
     <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
     <!-- Battery usage since unplugged -->
+    <string name="battery_since_unplugged">Defnydd batri ers datgysylltu\'r gwefrydd</string>
     <!-- Battery usage since user reset the stats -->
+    <string name="battery_since_reset">Defnydd batri ers ailosod</string>
     <!-- Battery usage on battery duration -->
+    <string name="battery_stats_on_battery"><xliff:g id="time">%1$s</xliff:g> ar fatri</string>
     <!-- Battery usage duration -->
     <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+    <string name="battery_stats_charging_label">Yn gwefru</string>
     <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
     <string name="battery_stats_screen_on_label">Sgrin ymlaen</string>
     <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+    <string name="battery_stats_gps_on_label">GPS ymlaen</string>
     <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
     <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
     <string name="battery_stats_flashlight_on_label">Fflacholau ymlaen.</string>
@@ -2746,25 +3453,36 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Wifi on time -->
     <!-- Bluetooth on time -->
     <!-- Activity title for advanced battery usage page [CHAR LIMIT=60] -->
+    <string name="advanced_battery_title">Defnydd batri uwch</string>
     <!-- Activity title for battery usage history details [CHAR LIMIT=60] -->
+    <string name="history_details_title">Manylion hanes</string>
     <!-- Activity title for battery usage details for an app. or power consumer -->
+    <string name="battery_details_title">Defnydd batri</string>
     <!-- Subtitle for application/subsystem details -->
     <!-- Subtitle for possible options -->
     <!-- Subtitle for list of packages -->
     <!-- Activity title for battery abnormal details page [CHAR LIMIT=60] -->
+    <string name="battery_abnormal_details_title">Apiau sy\'n draenio batri</string>
     <!-- Summary for wakelock anomaly, means device been kept awake [CHAR LIMIT=60] -->
     <!-- Summary for wakeup alarm anomaly, meaning device been wakeup in the background [CHAR LIMIT=60] -->
     <!-- Summary for location anomaly, meaning device is requesting location too frequently [CHAR LIMIT=60] -->
     <!-- Summary for anomalies, meaning some apps behaving abnormally  [CHAR LIMIT=80] -->
+    <string name="battery_abnormal_apps_summary"><xliff:g id="number">%1$d</xliff:g> ap yn camymddwyn</string>
     <!-- Title for force stop dialog [CHAR LIMIT=30] -->
     <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
     <string name="dialog_stop_message" product="default">Ni all dy ffôn reoli\'r batri fel arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn cadw dy ffôn yn effro.\n\nI geisio cywiro hyn, rhaid stopio\'r ap.\n\nOs yw hyn yn parhau i ddigwydd, mae\'n bosib bydd yn rhaid dadosod yr ap i wella perfformiad batri.</string>
     <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message" product="tablet">Ni all dy lechen reoli\'r batri yn yr un modd ag arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn cadw dy ddyfais yn effro.\n\nI geisio cywiro hyn, rhaid stopio\'r ap.\n\nOs yw hyn yn parhau i ddigwydd, mae\'n bosib bydd yn rhaid dadosod yr ap i wella perfformiad batri.</string>
     <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message" product="device">Ni all dy ddyfais reoli\'r batri yn yr un modd ag arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn cadw dy ddyfais yn effro.\n\nI geisio cywiro hyn, rhaid stopio\'r ap.\n\nOs yw hyn yn parhau i ddigwydd, mae\'n bosib bydd yn rhaid dadosod yr ap i wella perfformiad batri.</string>
     <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message_wakeup_alarm" product="default">Ni all dy ffôn reoli\'r batri yn yr un modd ag arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn deffro\'r ddyfais o hyd.\n\nI geisio cywiro hyn, gellir stopio <xliff:g id="app">%1$s</xliff:g>.\n\nOs yw hyn yn parhau i ddigwydd, mae\'n bosib bydd yn rhaid dadosod yr ap i wella perfformiad batri.</string>
     <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet">Ni all dy lechen reoli\'r batri yn yr un modd ag arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn deffro\'r ddyfais o hyd.\n\nI geisio cywiro hyn, gellir stopio <xliff:g id="app">%1$s</xliff:g>.\n\nOs yw hyn yn parhau i ddigwydd, mae\'n bosib bydd yn rhaid dadosod yr ap i wella perfformiad batri.</string>
     <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message_wakeup_alarm" product="device">Ni all dy ddyfais reoli\'r batri yn yr un modd ag arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn deffro\'r ddyfais o hyd.\n\nI geisio cywiro hyn, gellir stopio <xliff:g id="app">%1$s</xliff:g>.\n\nOs yw hyn yn parhau i ddigwydd, mae\'n bosib bydd yn rhaid dadosod yr ap i wella perfformiad batri.</string>
     <!-- Text for OK button in force stop dialog [CHAR LIMIT=30] -->
+    <string name="dialog_stop_ok">Stopio\'r ap</string>
     <!-- Title for background usage dialog [CHAR LIMIT=70] -->
     <!-- Message body for background usage dialog [CHAR LIMIT=NONE] -->
     <string name="dialog_background_check_message" product="default">Ni all dy ffôn rheoli\'r batri yn y modd arferol gan fod <xliff:g id="app">%1$s</xliff:g> yn deffro\'r ffôn o hyd.\n\nI gywiro\'r sefyllfa, awgrymir stopio <xliff:g id="app">%1$s</xliff:g> a\'i rhwystro rhag rhedeg yn y cefndir.</string>
@@ -2775,8 +3493,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Text for OK button in background usage dialog [CHAR LIMIT=30] -->
     <string name="dialog_background_check_ok">Troi i ffwrdd</string>
     <!-- Title for location dialog [CHAR LIMIT=60] -->
+    <string name="dialog_location_title">Troi lleoliad i ffwrdd?</string>
     <!-- Message body for location dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_location_message" product="default">Ni all dy ffôn rheoli\'r batri yn yr un modd ag arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn gwneud ceisiadau cyson am dy leoliad tra nad wyt yn defnyddio\'r ap.\n\nI gywiro hyn, gellir troi lleoliad i ffwrdd ar gyfer yr ap hwn.</string>
     <!-- Message body for location dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_location_message" product="tablet">Ni all dy lechen rheoli\'r batri yn yr un modd ag arfer gan fod <xliff:g id="app">%1$s</xliff:g> yn gwneud ceisiadau cyson am dy leoliad tra nad wyt yn defnyddio\'r ap.\n\nI gywiro hyn, gellir troi lleoliad i ffwrdd ar gyfer yr ap hwn.</string>
     <!-- Message body for location dialog [CHAR LIMIT=NONE] -->
     <!-- Text for OK button in location dialog [CHAR LIMIT=30] -->
     <string name="dialog_location_ok">Troi i ffwrdd</string>
@@ -2785,25 +3506,36 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for power consumed by the flashlight -->
     <string name="power_flashlight">Fflacholau</string>
     <!-- Label for power consumed by the camera -->
+    <string name="power_camera">Camera</string>
     <!-- Label for power consumed by Wi-Fi -->
+    <string name="power_wifi">Wi\u2011Fi</string>
     <!-- Label for power consumed by Bluetooth -->
+    <string name="power_bluetooth">Bluetooth</string>
     <!-- Label for power consumed by Mobile network idle -->
     <!-- Label for power consumed by Calling -->
+    <string name="power_phone">Galwadau llais</string>
     <!-- Label for power consumed when Idle -->
     <!-- Label for power consumed when Idle -->
     <!-- Label for power that we aren't able to account for -->
+    <string name="power_unaccounted">Amrywiol</string>
     <!-- Label for power that we computed too much for -->
     <!-- Label for power consumed by apps [CHAR LIMIT=30] -->
+    <string name="power_apps">Apiau</string>
     <!-- Label for power consumed by services [CHAR LIMIT=30] -->
     <string name="power_service">Gwasanaethau</string>
     <!-- Label for power consumed by system [CHAR LIMIT=30] -->
+    <string name="power_system">System</string>
     <!-- Label for power consumed by user [CHAR LIMIT=30] -->
+    <string name="power_user">Defnyddwyr eraill</string>
     <!-- Label for CPU usage time -->
     <!-- Label for CPU usage in foreground -->
     <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+    <string name="usage_type_wake_lock">Cadw\'n effro</string>
     <!-- Label for GPS usage time -->
+    <string name="usage_type_gps">GPS</string>
     <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
     <!-- Label for Phone usage time -->
+    <string name="usage_type_phone" product="tablet">Llechen</string>
     <!-- Label for Phone usage time -->
     <string name="usage_type_phone" product="default">Ffôn</string>
     <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
@@ -2815,8 +3547,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
     <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
     <!-- Label for Audio usage time -->
+    <string name="usage_type_audio">Sain</string>
     <!-- Label for Video usage time -->
+    <string name="usage_type_video">Fideo</string>
     <!-- Label for Camera usage time -->
+    <string name="usage_type_camera">Camera</string>
     <!-- Label for Flashlight usage time -->
     <string name="usage_type_flashlight">Fflacholau</string>
     <!-- Label for time that a feature has been on -->
@@ -2826,50 +3561,66 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
          the change in battery level) -->
     <!-- Label for force stop action -->
+    <string name="battery_action_stop">Gorfodi stopio</string>
     <!-- Label for app details action -->
+    <string name="battery_action_app_details">Gwybodaeth ap</string>
     <!-- Label for app settings action -->
     <string name="battery_action_app_settings">Gosodiadau apiau</string>
     <!-- Label for display settings -->
     <string name="battery_action_display">Gosodiadau\'r sgrin</string>
     <!-- Label for wifi settings -->
+    <string name="battery_action_wifi">Gosodiadau Wi\u2011Fi</string>
     <!-- Label for bluetooth settings -->
     <string name="battery_action_bluetooth">Gosodiadau Bluetooth</string>
     <!-- Description for voice call detail -->
+    <string name="battery_desc_voice">Batri a ddefnyddiwyd gan alwadau llais</string>
     <!-- Description for standby detail -->
+    <string name="battery_desc_standby" product="tablet">Batri a ddefnyddiwyd tra bod y llechen yn segur</string>
     <!-- Description for standby detail -->
+    <string name="battery_desc_standby" product="default">Batri a ddefnyddiwyd tra bod y ffôn yn segur</string>
     <!-- Description for cell radio detail -->
     <!-- Suggestion to switch to airplane mode to save power -->
     <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+    <string name="battery_desc_flashlight">Batri a ddefnyddiwyd gan y fflacholau</string>
     <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+    <string name="battery_desc_camera">Batri a ddefnyddiwyd gan y camera</string>
     <!-- Description for power consumed by display -->
+    <string name="battery_desc_display">Batri a ddefnyddiwyd gan y sgrin a\'i golau cefn</string>
     <!-- Suggestion for reducing display power -->
     <!-- Description for wifi connectivity -->
+    <string name="battery_desc_wifi">Batri a ddefnyddiwyd gan Wi-Fi</string>
     <!-- Suggestion for wifi connectivity power drain -->
     <!-- Description for bluetooth power consumption detail -->
+    <string name="battery_desc_bluetooth">Batri a ddefnyddiwyd gan Bluetooth</string>
     <!-- Suggestion for bluetooth -->
     <string name="battery_sugg_bluetooth_basic">Troi Bluetooth i ffwrdd pan nad yw\'n cael ei ddefnyddio</string>
     <!-- Suggestion for bluetooth headset -->
     <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+    <string name="battery_desc_apps">Batri a ddefnyddiwyd gan apiau</string>
     <!-- Suggestion for exploring application info to stop or uninstall -->
     <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
     <!-- Suggestion for getting apps to consume less power -->
     <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+    <string name="battery_desc_users">Batri a ddefnyddiwyd gan y defnyddiwr</string>
     <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
     <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
     <!-- [CHAR LIMIT=50] Description for over-counted power use -->
     <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+    <string name="mah"><xliff:g id="number" example="30">%d</xliff:g> mAh</string>
     <!-- Description for battery usage time for an app, i.e. Used for 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
     <!-- Description for battery usage background time for an app, i.e. Active for 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
     <!-- Description for battery screen usage time for an app, i.e. Screen usage 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
     <!-- Description for battery usage info for an app, i.e. 60% used by facebook. [CHAR LIMIT=60] -->
     <!-- Description for percentage of battery usage for an app, i.e. Screen: 30% of overall battery. [CHAR LIMIT=60] -->
     <!-- Description for battery usage detail information since last full charge. [CHAR LIMIT=120] -->
+    <string name="battery_detail_since_full_charge">Dadansoddiad ers y gwefriad llawn ddiwethaf</string>
     <!-- Title for usage time since last full charge. [CHAR LIMIT=60] -->
     <!-- Description for text in battery footer. [CHAR LIMIT=NONE] -->
     <string name="battery_footer_summary">Mae\'r data defnydd batri yn amcangyfrif a gall newid yn ôl defnydd</string>
     <!-- Title for text that shows the amount of time an app has been running while in the foreground. [CHAR LIMIT=80] -->
     <!-- Title for text that shows the amount of time an app has been running while in the background. [CHAR LIMIT=80] -->
     <!-- Title for battery usage amount by this app. [CHAR LIMIT=80] -->
+    <string name="battery_detail_power_usage">Defnydd batri</string>
     <!-- Description for battery usage amount, i.e. 16% of overall app usage(340 mAh). [CHAR LIMIT=120] -->
     <!-- Title for the battery usage group, which means all the battery data are calculated 'since full charge' [CHAR LIMIT=40] -->
     <!-- Title for the battery management group [CHAR LIMIT=40] -->
@@ -2883,20 +3634,26 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="menu_stats_refresh">Ail-lwytho</string>
     <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
     <!-- Label for kernel threads in battery usage -->
+    <string name="process_kernel_label">Android OS</string>
     <!-- Label for mediaserver process in battery usage -->
     <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
     <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
     <string name="battery_saver">Arbedwr batri</string>
     <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+    <string name="battery_saver_turn_on_automatically_title">Troi ymlaen yn awtomatig</string>
     <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+    <string name="battery_saver_turn_on_automatically_never">Byth</string>
     <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+    <string name="battery_saver_turn_on_automatically_pct">pan fo <xliff:g id="percent">%1$s</xliff:g> o fatri</string>
     <!-- [CHAR_LIMIT=40] Battery percentage: Title -->
+    <string name="battery_percentage">Canran batri</string>
     <!-- [CHAR_LIMIT=NONE] Battery percentage: Description for preference -->
     <string name="battery_percentage_description">Dangos canran batri yn y bar statws</string>
     <!-- Process Stats strings -->
     <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
     <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
     <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+    <string name="app_memory_use">Defnydd cof</string>
     <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
          timeDuration is a duration such as "1h 30m" -->
     <string name="process_stats_total_duration"><xliff:g id="usedRam">%1$s</xliff:g>
@@ -2912,6 +3669,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
     <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
     <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+    <string name="process_stats_os_label">Android OS</string>
     <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
     <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
     <string name="process_stats_os_kernel">Cnewyllyn</string>
@@ -2926,18 +3684,25 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="services_subtitle">Gwasanaethau</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
     <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+    <string name="mem_details_title">Manylion cof</string>
     <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
     <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+    <string name="mem_use_subtitle">Defnydd cof</string>
     <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
     <string name="mem_use_kernel_type">Cnewyllyn</string>
     <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
     <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
     <string name="mem_use_kernel_cache_type">Storfeydd cnewyll</string>
     <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+    <string name="mem_use_zram_type">Cyfnewid ZRam</string>
     <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+    <string name="mem_use_free_type">Ar gael</string>
     <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+    <string name="mem_use_total">Cyfanswm</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_3h">3 awr</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_6h">6 awr</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
     <string name="menu_duration_12h">12 awr</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
@@ -2948,12 +3713,14 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="menu_hide_system">Cuddio apiau system</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
          as percentages-->
+    <string name="menu_show_percentage">Dangos canrannau</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
         on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
     <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
     <string name="menu_proc_stats_type_background">Cefndir</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+    <string name="menu_proc_stats_type_foreground">Blaendir</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
     <!-- Voice input/output settings -->
     <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
@@ -2978,24 +3745,30 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
+    <string name="voice_interaction_security_warning">Bydd y gwasanaeth mewnbwn llais hwn yn gallu perfformio monitro ymlaen-o-hyd a rheoli apiau y mae\'n bosib eu rheoli â llais ar dy ran. Mae\'n dod o\'r ap <xliff:g id="voice_input_service_app_name">%s</xliff:g>. Galluogi defnydd o\'r gwasanaeth hwn?</string>
     <!-- [CHAR LIMIT=50] The text for the settings section that is used to set a preferred text to speech engine -->
     <!-- [CHAR LIMIT=50] The text for a settings screen of the currently set text to speech engine -->
     <!-- [CHAR LIMIT=50] The text for a button that goes to the speech rate and pitch settings for text to speech. -->
     <string name="tts_sliders_title">Cyflymder a thraw llefaru</string>
     <!-- [CHAR LIMIT=50] Name for the general text to speech settings section. -->
+    <string name="tts_engine_section_title">Injan</string>
     <!-- [CHAR LIMIT=50] Name for the button that goes to the voice selection screen. -->
+    <string name="tts_install_voice_title">Lleisiau</string>
     <!-- The text for the settings to choose the language to use on TTS.-->
     <!-- Title of the pop-up to install 3P voices on first use. -->
     <!-- Text of the pop-up to install 3P voices on first use. -->
     <!-- Text of the button on the pop-up to install 3P voices on first use to procedd to the 3p app. -->
+    <string name="tts_install_voices_open">Agor ap</string>
     <!-- Text of the button on the pop-up to install 3P voices on first use to cancel the operation. -->
     <string name="tts_install_voices_cancel">Diddymu</string>
     <!-- Name for button that resets speech rate and pitch for synthesized voice to default values in the text to speech settings.-->
     <string name="tts_reset">Ailosod</string>
     <!-- Name for buttont hat plays a sample of the currently selected text-to-speech engine. -->
+    <string name="tts_play">Chwarae</string>
     <!-- Power Control Widget -->
     <string name="gadget_title">Rheoli pŵer</string>
     <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+    <string name="gadget_state_template"><xliff:g name="feature" example="Wi\u2011Fi">%1$s</xliff:g> <xliff:g name="state" example="off">%2$s</xliff:g></string>
     <!-- Gadget value used to describe on state. -->
     <string name="gadget_state_on">ymlaen</string>
     <!-- Gadget value used to describe off state. -->
@@ -3004,16 +3777,22 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Gadget value used to describe turning off state. -->
     <!-- Spoken description for the Wi-Fi power control gadget. -->
     <!-- Spoken description for the Bluetooth power control gadget. -->
+    <string name="gadget_bluetooth">Bluetooth</string>
     <!-- Spoken description for the Location power control gadget. -->
     <string name="gadget_location">Lleoliad</string>
     <!-- Spoken description for the data synchronization gadget. -->
+    <string name="gadget_sync">Cysoni</string>
     <!-- Template for brightness gadget toggle button description. -->
+    <string name="gadget_brightness_template"><xliff:g name="state" example="half">%1$s</xliff:g> disgleirdeb</string>
     <!-- Brightness gadget value used to describe automatic brightness state. -->
     <!-- Brightness gadget value used to describe maximum brightness state. -->
+    <string name="gadget_brightness_state_full">llawn</string>
     <!-- Brightness gadget value used to describe half brightness state. -->
+    <string name="gadget_brightness_state_half">hanner</string>
     <!-- Brightness gadget value used to describe minimum brightness state. -->
     <string name="gadget_brightness_state_off">i ffwrdd</string>
     <!-- Title of preference to enter the VPN settings activity -->
+    <string name="vpn_settings_title">VPN</string>
     <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
@@ -3023,6 +3802,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="credentials_install_summary" product="default">Gosod tystysgrifau o gerdyn SD</string>
     <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
     <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_reset_summary">Tynnu pob tystysgrif</string>
     <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
     <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
     <!-- Title of preference to display user credentials and keys [CHAR LIMIT=30] -->
@@ -3040,8 +3820,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
     <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
     <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+    <string name="credentials_old_password">Cyfrinair cyfredol:</string>
     <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_reset_hint">Tynnu\'r holl gynnwys?</string>
     <!-- Error message [CHAR LIMIT=NONE] -->
+    <string name="credentials_wrong_password">Cyfrinair anghywir</string>
     <!-- Error message [CHAR LIMIT=NONE] -->
     <!-- Error message [CHAR LIMIT=NONE] -->
     <!-- Toast message [CHAR LIMIT=30] -->
@@ -3054,6 +3837,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Sound settings screen, setting option summary text -->
     <!-- Backup and reset Settings screen -->
     <!-- Backup and reset settings menu and activity title -->
+    <string name="privacy_settings_title">Copi wrth gefn</string>
     <!-- Backup section title -->
     <string name="backup_section_title">Cadw copi wrth gefn ac adfer</string>
     <!-- Personal data section title -->
@@ -3065,9 +3849,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Auto-restore menu title -->
     <!-- Summary text of the "automatic restore" setting -->
     <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+    <string name="backup_inactive_title">Dyw\'r gwasanaeth cadw copi wrth gefn ddim ar gael</string>
     <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
     <!-- Dialog title for confirmation to erase backup data from server -->
     <!-- Dialog title for confirmation to erase backup data from server -->
+    <string name="backup_erase_dialog_message">Stopio cadw copi wrth gefn o dy gyfrifon Wi\u2011Fi, nodau tudalennau, gosodiadau eraill, a data apiau, a dileu\'r holl gopïau ar weinyddion Google?</string>
     <!-- Dialog title for confirmation to erase full backup data from server -->
     <string name="fullbackup_erase_dialog_message">Stopio cadw copi wrth gefn o ddata\'r ddyfais (megis cyfrineiriau Wi-Fi a hanes galwadau) a data apiau (megis gosodiadau a ffeiliau sy\'n cael eu cadw gan apiau), a hefyd dileu\'r holl gopïau wrth gefn oddi ar weinyddion?</string>
     <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
@@ -3082,25 +3868,33 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for screen showing to select device admin apps -->
     <!-- Message when there are no available device admin apps to display -->
     <!-- Title for personal device admin apps on the list [CHAR_LIMIT=25] -->
+    <string name="personal_device_admin_title">Personol</string>
     <!-- Title for managed device admin apps on the list [CHAR_LIMIT=25] -->
+    <string name="managed_device_admin_title">Gwaith</string>
     <!-- Message when there are no available trust agents to display -->
     <!-- Title for screen to add a device admin app [CHAR LIMIT=40] -->
+    <string name="add_device_admin_msg">Rhoi ap gweinyddu\'r ddyfais ar waith?</string>
     <!-- Label for button to set the active device admin [CHAR_LIMIT=80] -->
+    <string name="add_device_admin">Rhoi\'r ap gweinyddu dyfais hwn ar waith</string>
     <!-- Device admin add activity title -->
     <!-- Device admin warning message about policies an admin can use -->
+    <string name="device_admin_warning">Bydd rhoi\'r ap hwn ar waith yn galluogi\'r ap <xliff:g id="app_name">%1$s</xliff:g> i wneud y canlynol:</string>
     <!-- Device admin warning message about policies an admin can use -->
     <string name="device_admin_status">Mae\'r ap gweinyddwr hwn yn weithredol ac yn caniatáu i\'r ap <xliff:g id="app_name">%1$s</xliff:g> gwneud y gweithredoedd hyn:</string>
     <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
     <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+    <string name="adding_profile_owner_warning">Wrth barhau, bydd dy Ddefnyddiwr yn cael ei reoli gan dy Weinyddwr ac mae\'n bosib y bydd gan y Gweinyddwr gyda\'r gallu i gadw data cysylltiedig, yn ogystal â dy ddata personol.\n\nMae gan dy weinyddwr y gallu i fonitro a rheoli gosodiadau, mynediad, apiau, a data yn gysylltiedig â\'r Defnyddiwr hwn, gan gynnwys gweithgaredd rhwydwaith a gwybodaeth lleoliad dy ddyfais.</string>
     <!-- Message displayed to let the user know that some of the options are disabled by admin. [CHAR LIMIT=NONE] -->
     <string name="admin_more_details">Rhagor o fanylion</string>
     <!-- Name to assign to a Network Access Point that was saved without a name -->
+    <string name="sound_category_sound_title">Cyffredinol</string>
     <string name="notification_log_title">Log hysbysiadau</string>
     <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
          [CHAR LIMIT=40] -->
     <string name="sound_category_call_ringtone_vibrate_title">Tôn caniad a dirgrynu galwadau</string>
     <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
          [CHAR LIMIT=40] -->
+    <string name="sound_category_system_title">System</string>
     <!-- Wifi Setup For Setup Wizard with XL screen -->
     <!-- Title shown in Wifi Setup Wizard with XL screen -->
     <string name="wifi_setup_title">Gosod Wi\u2011Fi</string>
@@ -3173,6 +3967,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Message shown above available networks when a user clicked one of available
          networks and the UI is prompting the user to edit the network configuration
          if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_edit_network">Rho ffurfweddiad y rhwydwaith</string>
     <!-- The message shown above available networks when a user clicked "Add network"
          button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
     <string name="wifi_setup_status_new_network">Cysylltu i rwydwaith newydd</string>
@@ -3197,21 +3992,29 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="wifi_setup_description_connected">Tara <b>Nesaf</b> i barhau i osod.\n\nTara <b>Nôl</b> i gysylltu â rhwydwaith Wi\u2011Fi gwahanol.</string>
     <!-- Do not translate. This is a stub which will be removed soon. -->
     <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_sync_enabled">Galluogwyd cysoni</string>
     <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_sync_disabled">Analluogwyd cysoni</string>
     <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_sync_in_progress">Yn cysoni nawr</string>
     <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_sync_error">Gwall cysoni.</string>
     <!-- Image description for the sync failed icon. -->
     <string name="sync_failed">Methwyd â chysoni</string>
     <!-- Animation description for the sync active icon. -->
+    <string name="sync_active">Cysoni\'n weithredol</string>
     <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+    <string name="account_sync_settings_title">Cysoni</string>
     <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
     <!-- Button label to add an account [CHAR LIMIT=20] -->
+    <string name="add_account_label">Ychwanegu cyfrif</string>
     <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
     <!-- Account Settings. The preference title for enabling work mode -->
     <string name="work_mode_label">Modd gwaith</string>
     <!-- Account Settings. The preference summary for enabling work mode -->
     <string name="work_mode_summary">Caniatáu proffil gwaith i weithio, gan gynnwys apiau, cysoni\'n y cefndir, a nodweddion cysylltiedig.</string>
     <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+    <string name="remove_managed_profile_label">Tynnu\'r proffil gwaith</string>
     <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
     <string name="background_data">Data cefndir</string>
     <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
@@ -3220,108 +4023,168 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
     <!-- Sync status messages on Accounts & Synchronization settings -->
     <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+    <string name="sync_enabled">Mae cysoni YMLAEN</string>
     <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+    <string name="sync_disabled">Mae cysoni I FFWRDD</string>
     <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+    <string name="sync_error">Gwall cysoni</string>
     <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+    <string name="last_synced">Cysonwyd diwethaf <xliff:g id="last_sync_time">%1$s</xliff:g></string>
     <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+    <string name="sync_in_progress">Yn cysoni nawr\u2026</string>
     <!-- Data synchronization settings screen, setting option name -->
     <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
     <string name="settings_backup_summary">Cadw fy ngosodiadau wrth gefn</string>
     <!-- Data synchronization settings screen, menu option -->
+    <string name="sync_menu_sync_now">Cysoni nawr</string>
     <!-- Data synchronization settings screen, menu option -->
+    <string name="sync_menu_sync_cancel">Diddymu cysoni</string>
     <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
     <string name="sync_one_time_sync">Tara nawr i gysoni <xliff:g id="last_sync_time">\n%1$s</xliff:g></string>
     <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+    <string name="sync_gmail">Gmail</string>
     <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+    <string name="sync_calendar">Calendr</string>
     <!-- Data synchronization settings screen, checkbox setting option name -->
     <string name="sync_contacts">Cysylltiadau</string>
     <!-- Message introducing the user to Google Sync. -->
     <string name="sync_plug"><font fgcolor="#ffffffff">Croeso i gysoni Google!</font>
     \nMae dull Google o gysoni data yn dy ganiatáu di i gael mynediad at dy gysylltiadau, apwyntiadau a mwy o ble bynnag wyt ti.    </string>
     <!-- Header title for those settings relating to application syncing. -->
+    <string name="header_application_sync_settings">Gosodiadau cysoni\'r ap</string>
     <!-- Header for data and synchronization -->
+    <string name="header_data_and_synchronization">Data a chysoni</string>
     <!-- Preference item that lets the user change password -->
+    <string name="preference_change_password_title">Newid cyfrinair</string>
     <!-- Header that appears at the top of Account Settings screen -->
     <string name="header_account_settings">Gosodiadau cyfrif</string>
     <!-- Button label to remove current account -->
+    <string name="remove_account_label">Tynnu\'r cyfrif</string>
     <!-- Title shown in AddAccount -->
+    <string name="header_add_an_account">Ychwanegu cyfrif</string>
     <!-- Button shown when this activity is run from SetupWizard -->
+    <string name="finish_button_label">Gorffen</string>
     <!-- Title of remove message for remove account dialog -->
+    <string name="really_remove_account_title">Tynnu\'r cyfrif?</string>
     <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+    <string name="really_remove_account_message" product="tablet">Bydd tynnu\'r cyfrif hwn yn dileu ei holl negeseuon, cysylltiadau, a data arall oddi ar y llechen!</string>
     <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+    <string name="really_remove_account_message" product="default">Bydd tynnu\'r cyfrif hwn yn dileu ei holl negeseuon, cysylltiadau, a data arall oddi ar y ffôn!</string>
     <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
     <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
     <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+    <string name="sync_item_title"><xliff:g id="authority" example="Calendar">%s</xliff:g></string>
     <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
     <!-- Messaage shown in dialog when you can't manually sync -->
+    <string name="cant_sync_dialog_message">Mae cysoni ar gyfer yr eitem hon wedi\'i analluogi. I newid y gosodiad, tro data cefndirol a chysoni awtomatig ymlaen am gyfnod dros dro.</string>
+    <string name="wimax_settings">4G</string>
     <string name="status_wimax_mac_address">Cyfeiriad MAC 4G</string>
     <!-- This is displayed to the user when the device needs to be decrypted -->
+    <string name="enter_password">I ddechrau Android, rho dy gyfrinair</string>
     <!-- Informational text on the pin entry screen prompting the user for their pin -->
+    <string name="enter_pin">I ddechrau Android, rho dy PIN</string>
     <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+    <string name="enter_pattern">I ddechrau Android, llunia dy batrwm</string>
     <!-- Message shown when user enters wrong pattern -->
+    <string name="cryptkeeper_wrong_pattern">Patrwm Anghywir</string>
     <!-- Message shown when user enters wrong password -->
+    <string name="cryptkeeper_wrong_password">Cyfrinair Anghywir</string>
     <!-- Message shown when user enters wrong PIN -->
+    <string name="cryptkeeper_wrong_pin">PIN Anghywir</string>
     <!-- Shown when a password has been entered, and we're checking it -->
+    <string name="checking_decryption">Yn gwirio\u2026</string>
     <!-- Shown when password is correct, and we're starting Android -->
     <string name="starting_android">Yn dechrau Android\u2026</string>
     <!-- the following are for Settings Storage screen -->
     <!-- Menu item/button 'delete' -->
+    <string name="delete">Dileu</string>
     <!-- Misc files [CHAR LIMIT=25] -->
     <!-- number of misc files selected [CHAR LIMIT=40] -->
+    <string name="misc_files_selected_count">dewiswyd <xliff:g id="number" example="3">%1$d</xliff:g> allan o <xliff:g id="total" example="15">%2$d</xliff:g></string>
     <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+    <string name="misc_files_selected_count_bytes"><xliff:g id="number" example="3.25MB">%1$s</xliff:g> allan o <xliff:g id="total" example="15.25MB">%2$s</xliff:g></string>
     <!--  action to select all [CHAR LIMIT=30] -->
+    <string name="select_all">Dewis y cyfan</string>
     <!-- A button that gets displayed in data plan usage preference in settings page to manage data plans [CHAR LIMIT=25] -->
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+    <string name="data_usage_summary_title">Defnydd data</string>
     <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+    <string name="data_usage_app_summary_title">Defnydd data apiau</string>
     <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
     <!-- Title for app usage. [CHAR LIMIT=40] -->
+    <string name="data_usage_app">Defnydd ap</string>
     <!-- Title for app usage. [CHAR LIMIT=40] -->
+    <string name="data_usage_app_info_label">GWYBODAETH AP</string>
     <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+    <string name="data_usage_cellular_data">Data symudol</string>
     <!-- Title for setting data limit. [CHAR LIMIT=40] -->
     <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+    <string name="data_usage_cycle">Cylchred defnydd data</string>
     <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+    <string name="data_usage_app_items_header_text">Defnydd ap</string>
     <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+    <string name="data_usage_menu_roaming">Data wrth grwydro</string>
     <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
     <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_allow_background">Caniatáu data cefndir</string>
     <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
     <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
     <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+    <string name="data_usage_menu_hide_wifi">Cuddio Wi\u2011Fi</string>
     <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
     <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+    <string name="data_usage_menu_hide_ethernet">Cuddio defnydd ether-rwyd</string>
     <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_metered">Cyfyngiadau rhwydwaith</string>
     <!-- Title for menu option to enable global auto-sync of account data -->
     <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
     <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+    <string name="data_usage_menu_cellular_networks">Rhwydweithiau symudol</string>
     <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
     <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
     <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
     <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+    <string name="account_settings_menu_auto_sync_work">Cysoni data gwaith yn awtomatig</string>
     <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
     <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+    <string name="data_usage_pick_cycle_day">Diwrnod o\'r mis i ailosod y cylchred defnydd data:</string>
     <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
     <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
     <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
     <string name="data_usage_label_background">Cefndir</string>
     <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
     <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_disable_mobile">Troi data symudol i ffwrdd?</string>
     <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+    <string name="data_usage_disable_mobile_limit">Gosod terfyn data symudol</string>
     <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+    <string name="data_usage_disable_4g_limit">Gosod terfyn data 4G</string>
     <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+    <string name="data_usage_disable_3g_limit">Gosod terfyn data 2G-3G</string>
     <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+    <string name="data_usage_disable_wifi_limit">Gosod terfyn data Wi\u2011Fi</string>
     <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_wifi">Wi\u2011Fi</string>
     <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_ethernet">Ether-rwyd</string>
     <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+    <string name="data_usage_tab_mobile">Symudol</string>
     <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_4g">4G</string>
     <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_3g">2G-3G</string>
     <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+    <string name="data_usage_list_mobile">Symudol</string>
     <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
     <string name="data_usage_list_none">Dim</string>
     <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+    <string name="data_usage_enable_mobile">Data symudol</string>
     <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+    <string name="data_usage_enable_3g">Data 2G-3G</string>
     <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+    <string name="data_usage_enable_4g">Data 4G</string>
     <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+    <string name="data_usage_forground_label">Blaendir:</string>
     <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
     <string name="data_usage_background_label">Cefndir:</string>
     <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
@@ -3329,45 +4192,65 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
     <string name="data_usage_app_restrict_background">Data cefndir</string>
     <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_app_restrict_background_summary">Galluogi defnydd data symudol yn y cefndir</string>
     <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
     <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
     <string name="data_usage_app_restrict_dialog_title">Cyfyngu data cefndir?</string>
     <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_app_restrict_dialog">Gall y nodwedd hon achosi rhai apiau sy\'n dibynnu ar ddata cefndirol i beidio â gweithio tra bod dim ond rhwydweithiau symudol ar gael.\n\nMae rhagor o wybodaeth am reolaeth defnydd data priodol yn y gosodiadau o fewn yr ap.</string>
     <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
     <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+    <string name="data_usage_auto_sync_on_dialog_title">Troi awto-cysoni data ymlaen?</string>
     <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
     <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
     <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
     <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+    <string name="data_usage_auto_sync_off_dialog">Bydd hyn yn arbed defnydd data a batri, ond bydd yn rhaid cysoni pob cyfrif dy hun i gael y wybodaeth ddiweddaraf. A ni fyddi\'n derbyn hysbysiadau pan fydd diweddariadau ar gael.</string>
     <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+    <string name="data_usage_cycle_editor_title">Dyddiad ailosod y cylchred defnydd</string>
     <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+    <string name="data_usage_cycle_editor_subtitle">Dyddiad pob mis:</string>
     <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
     <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+    <string name="data_usage_warning_editor_title">Gosod rhybudd defnydd data</string>
     <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+    <string name="data_usage_limit_editor_title">Gosod terfyn defnydd data</string>
     <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+    <string name="data_usage_limit_dialog_title">Yn gosod terfyn defnydd data</string>
     <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_limit_dialog_mobile" product="tablet">Bydd dy lechen yn diffodd defnydd data symudol pan fydd wedi cyrraedd y terfyn wyt ti\'n ei osod.\n\nWrth bod defnydd data yn cael ei fesur gan dy lechen, ac mae\'n bosib bydd dy ddarparwr gwasanaeth symudol yn cyfrif yn wahanol, gall fod yn syniad da gosod terfyn ceidwadol.</string>
     <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_limit_dialog_mobile" product="default">Bydd dy ffôn yn diffodd defnydd data symudol pan fydd wedi cyrraedd y terfyn wyt ti\'n ei osod.\n\nWrth bod defnydd data yn cael ei fesur gan dy lechen, ac mae\'n bosib bydd dy ddarparwr gwasanaeth symudol yn cyfrif yn wahanol, gall fod yn syniad da gosod terfyn ceidwadol.</string>
     <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
     <string name="data_usage_restrict_background_title">Cyfyngu data cefndir?</string>
     <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_restrict_background">Os wyt yn cyfyngu data cefndir symudol, ni fydd rhai apiau a gwasanaethau yn gweithio oni bai bod gan y ddyfais cysylltiad Wi\u2011Fi.</string>
     <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_restrict_background_multiuser" product="tablet">Os wyt yn cyfyngu data cefndir symudol, ni fydd rhai apiau a gwasanaethau yn gweithio oni bai bod gan y ddyfais cysylltiad Wi\u2011Fi.\n\nMae\'r gosodiad hwn yn effeithio ar holl ddefnyddwyr y llechen.</string>
     <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_restrict_background_multiuser" product="default">Os wyt yn cyfyngu data cefndir symudol, ni fydd rhai apiau a gwasanaethau yn gweithio oni bai bod gan y ddyfais cysylltiad Wi\u2011Fi.\n\nMae\'r gosodiad hwn yn effeithio ar holl ddefnyddwyr y ffôn hwn.</string>
     <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
     <string name="data_usage_sweep_warning"><font size="18">Rhybudd: <xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12"></font></string>
     <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
     <string name="data_usage_sweep_limit"><font size="18">Cyfyngiad: <xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12"></font></string>
     <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
     <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+    <string name="data_usage_uninstalled_apps">Apiau wedi eu tynnu</string>
     <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
     <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+    <string name="data_usage_uninstalled_apps_users">Apiau a defnyddwyr wedi eu tynnu</string>
     <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
     <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
     <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+    <string name="data_usage_total_during_range_mobile" product="tablet"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: tua <xliff:g id="total" example="128KB">%1$s</xliff:g> wedi\'i defnyddio, yn ôl mesur dy lechen. Gall fod cyfrif defnydd data dy ddarparwr gwasanaeth symudol fod yn wahanol.</string>
     <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+    <string name="data_usage_total_during_range_mobile" product="default"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: tua <xliff:g id="total" example="128KB">%1$s</xliff:g> wedi\'i defnyddio, yn ôl mesur dy ffôn. Gall fod cyfrif defnydd data dy ddarparwr gwasanaeth symudol fod yn wahanol.</string>
     <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
     <string name="data_usage_metered_title">Cyfyngiadau rhwydwaith</string>
     <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_metered_body">Mae rhwydweithiau sy\'n cael eu mesur yn cael eu trin yn yr un modd a rhwydweithiau symudol pan mae data cefndirol wedi ei gyfyngu. Gall apiau rhoi rhybudd cyn defnyddio\'r rhwydweithiau hyn i lawrlwytho llawer o ddata.</string>
     <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+    <string name="data_usage_metered_mobile">Rhwydweithiau symudol</string>
     <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
     <string name="data_usage_metered_wifi">Rhwydweithiau Wi-Fi wedi\'u mesur</string>
     <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
@@ -3377,6 +4260,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Option for indicating that a network is not metered (inexpensive). [CHAR LIMIT=32] -->
     <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
     <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+    <string name="cryptkeeper_emergency_call">Galwad brys</string>
     <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
     <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_name">Enw</string>
@@ -3395,11 +4279,17 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
     <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
     <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_username">Enw defnyddiwr</string>
     <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_password">Cyfrinair</string>
     <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_save_login">Cadw gwybodaeth y cyfrif</string>
     <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_not_used">(heb ei ddefnyddio)</string>
     <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+    <string name="vpn_no_ca_cert">(peidio â gwirio\'r gweinydd)</string>
     <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+    <string name="vpn_no_server_cert">(derbyniwyd gan y gweinydd)</string>
     <!-- Error message displayed below the always-on VPN checkbox when the checkbox is disabled:
         the selected VPN type doesn't support always-on. [CHAR LIMIT=120] -->
     <!-- Error message displayed below the always-on VPN checkbox when the checkbox is disabled:
@@ -3417,14 +4307,19 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_save">Cadw</string>
     <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_connect">Cysylltu</string>
     <!-- Button label to connect a VPN profile, replacing the current one. [CHAR LIMIT=40] -->
     <string name="vpn_replace">Disodli</string>
     <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
     <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_forget">Anghofio</string>
     <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
     <!-- Dialog message body to disconnect from a VPN profile. -->
+    <string name="vpn_disconnect_confirm">Datgysylltu\'r VPN hwn?</string>
     <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_disconnect">Datgysylltu</string>
     <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+    <string name="vpn_version">Fersiwn <xliff:g id="version" example="3.3.0">%s</xliff:g></string>
     <!-- Button label to forget a VPN profile [CHAR LIMIT=40] -->
     <string name="vpn_forget_long">Anghofio\'r VPN</string>
     <!-- Dialog message title to set another VPN app to be always-on [CHAR LIMIT=40] -->
@@ -3441,9 +4336,13 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="vpn_cant_connect_title">Dyw <xliff:g id="vpn_name" example="OpenVPN">%1$s</xliff:g> methu â chysylltu</string>
     <!-- Dialog message subtitle when the user can't connect an always-on vpn [CHAR LIMIT=NONE] -->
     <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+    <string name="vpn_title">VPN</string>
     <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_create">Ychwanegu proffil VPN</string>
     <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_edit">Golygu proffil</string>
     <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_delete">Dileu\'r proffil</string>
     <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
     <!-- Placeholder when VPN settings is open but no VPNs have been created. [CHAR LIMIT=100] -->
     <!-- Preference summary for always-on VPN checkbox. [CHAR LIMIT=40] -->
@@ -3465,11 +4364,17 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Seting subtext indicating the device is not currently connected to any VPN [CHAR LIMIT=40]-->
     <string name="vpn_disconnected_summary">Dim</string>
     <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+    <string name="vpn_missing_cert">Mae tystysgrif ar goll. Ceisia olygu\'r proffil.</string>
     <!-- Tab label for built-in system CA certificates. -->
+    <string name="trusted_credentials_system_tab">System</string>
     <!-- Tab label for user added CA certificates. -->
+    <string name="trusted_credentials_user_tab">Defnyddiwr</string>
     <!-- Button label for disabling a system CA certificate. -->
+    <string name="trusted_credentials_disable_label">Analluogi</string>
     <!-- Button label for enabling a system CA certificate. -->
+    <string name="trusted_credentials_enable_label">Galluogi</string>
     <!-- Button label for removing a user CA certificate. -->
+    <string name="trusted_credentials_remove_label">Tynnu</string>
     <!-- Button label for trusting a user CA certificate. -->
     <string name="trusted_credentials_trust_label">Ymddiried</string>
     <!-- Alert dialog confirmation when enabling a system CA certificate. -->
@@ -3501,10 +4406,13 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
     <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
+    <string name="selinux_status_disabled">Analluogwyd</string>
+    <string name="selinux_status_enforcing">Yn gorfodi</string>
     <!-- Notification of installed CA Certs -->
     <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
     <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+    <string name="done_button">Iawn</string>
     <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
     <plurals name="ssl_ca_cert_dialog_title">
         <item quantity="zero">Ymddiried yn neu dynnu tystysgrifau</item>
@@ -3544,7 +4452,9 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     </plurals>
     <!-- User settings -->
     <!-- User settings screen title [CHAR LIMIT=25] -->
+    <string name="user_settings_title">Defnyddwyr</string>
     <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+    <string name="user_list_title">Defnyddwyr a phroffiliau</string>
     <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
     <!-- User settings add user menu [CHAR LIMIT=35] -->
     <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
@@ -3559,6 +4469,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
     <string name="user_admin">Gweinyddwr</string>
     <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+    <string name="user_you">Ti (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
     <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
     <string name="user_nickname">Llysenw</string>
     <!-- Title for add user type dialog [CHAR LIMIT=45] -->
@@ -3582,34 +4493,59 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
     <string name="user_cannot_manage_message" product="default">Dim ond perchennog y ffôn gall rheoli defnyddwyr.</string>
     <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+    <string name="user_cannot_add_accounts_message">Ni all proffiliau cyfyngedig ychwanegu cyfrifon</string>
     <!-- User details remove user menu [CHAR LIMIT=20] -->
+    <string name="user_remove_user_menu">Dileu <xliff:g id="user_name">%1$s</xliff:g> o\'r ddyfais hon.</string>
     <!-- User lock screen settings header[CHAR LIMIT=40] -->
     <string name="user_lockscreen_settings">Gosodiadau sgrin cloi</string>
     <!-- User settings item to allow creating new users from locks screen [CHAR LIMIT=50] -->
+    <string name="user_add_on_lockscreen_menu">Ychwanegu defnyddwyr o\'r sgrin cloi</string>
     <!-- User details new user name [CHAR LIMIT=30] -->
+    <string name="user_new_user_name">Defnyddiwr newydd</string>
     <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+    <string name="user_new_profile_name">Proffil newydd</string>
     <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+    <string name="user_confirm_remove_self_title">Dileu dy hun?</string>
     <!-- User removal confirmation title [CHAR LIMIT=25] -->
+    <string name="user_confirm_remove_title">Tynnu\'r defnyddiwr hwn?</string>
     <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+    <string name="user_profile_confirm_remove_title">Tynnu\'r proffil hwn?</string>
     <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+    <string name="work_profile_confirm_remove_title">Tynnu\'r proffil gwaith?</string>
     <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_confirm_remove_self_message" product="tablet">Mi fyddi\'n colli dy holl ddata a lle ar y llechen hon. Nid yw\'n bosib dadwneud y weithred hon.</string>
     <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_confirm_remove_self_message" product="default">Mi fyddi\'n colli dy holl ddata a lle ar y ffôn hwn. Nid yw\'n bosib dadwneud y weithred hon.</string>
     <!-- User removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_confirm_remove_message">Caiff yr holl apiau a data eu dileu.</string>
     <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+    <string name="work_profile_confirm_remove_message">Caiff pob ap a holl ddata\'r proffil hwn ei dileu os wyt ti\'n parhau.</string>
     <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_profile_confirm_remove_message">Caiff yr holl apiau a data eu dileu.</string>
     <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+    <string name="user_adding_new_user">Yn ychwanegu defnyddiwr newydd\u2026</string>
     <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+    <string name="user_delete_user_description">Dileu\'r defnyddiwr</string>
     <!-- Delete button text [CHAR LIMIT=25] -->
+    <string name="user_delete_button">Dileu</string>
     <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
     <!-- Title for Guest user [CHAR LIMIT=35] -->
+    <string name="user_guest">Gwestai</string>
     <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+    <string name="user_exit_guest_title">Tynnu gwestai</string>
     <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+    <string name="user_exit_guest_confirm_title">Tynnu\'r gwestai?</string>
     <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+    <string name="user_exit_guest_confirm_message">Caiff holl apiau a data\'r sesiwn hon eu dileu.</string>
     <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+    <string name="user_exit_guest_dialog_remove">Tynnu</string>
     <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+    <string name="user_enable_calling">Troi galwadau ffôn ymlaen</string>
     <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
     <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+    <string name="user_remove_user">Tynnu defnyddiwr</string>
     <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+    <string name="user_enable_calling_confirm_title">Troi galwadau ffôn ymlaen?</string>
     <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
     <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
     <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
@@ -3626,12 +4562,14 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="global_locale_change_title">Newid iaith</string>
     <!-- NFC payment settings -->
     <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+    <string name="nfc_payment_how_it_works">Sut mae\'n gweithio</string>
     <!-- String shown when there are no NFC payment applications installed -->
     <!-- Header text that can be clicked on to change the default payment app -->
     <string name="nfc_payment_default">Ap talu arferol</string>
     <!-- Summary text that is shown when no default app is set -->
     <string name="nfc_payment_default_not_set">Heb ei osod</string>
     <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+    <string name="nfc_payment_app_and_desc"><xliff:g id="app">%1$s</xliff:g> - <xliff:g id="description">%2$s</xliff:g></string>
     <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
     <!-- Always use the default app (independent of what app is open) -->
     <!-- If open app supports TapPay, use that app instead of the default -->
@@ -3641,6 +4579,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Content for text explaning how to pay at a payment terminal in a store -->
     <string name="nfc_how_it_works_content">Sefydla ap talu ac yna cei dal dy ffôn wrth unrhyw derfynell gyda\'r symbol talu awyr.</string>
     <!-- Button the user can click to indicate he understood and dismiss the screen -->
+    <string name="nfc_how_it_works_got_it">Deall yn iawn</string>
     <!-- NFC More... title.  [CHAR LIMIT=40] -->
     <string name="nfc_more_title">Mwy...</string>
     <!-- Label for the dialog that is shown when the user is asked to set a
@@ -3648,7 +4587,9 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Restrictions settings -->
     <!-- Restriction settings title [CHAR LIMIT=35] -->
     <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+    <string name="restriction_menu_reset">Cyfyngiadau rhwydwaith</string>
     <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+    <string name="restriction_menu_change_pin">Newid PIN</string>
     <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
     <string name="app_notifications_switch_label">Dangos hysbysiadau</string>
     <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
@@ -3697,6 +4638,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="user_account_title">Cyfrif ar gyfer cynnwys</string>
     <!-- User picture title [CHAR LIMIT=30] -->
     <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+    <string name="extreme_threats_title">Bygythiadau eithafol</string>
     <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
     <!-- Severe threats title.  [CHAR LIMIT=30] -->
     <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
@@ -3705,11 +4647,13 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
          For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
     <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+    <string name="call_manager_enable_title">Galluogi Rheolwr Galwadau</string>
     <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
     <string name="call_manager_enable_summary">Caniatáu i\'r gwasanaeth hwn reoli sut mae dy alwadau yn cael eu gwneud.</string>
     <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
     <string name="call_manager_title">Rheolwr Galwadau</string>
     <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+    <string name="call_manager_summary"><xliff:g id="app">%1$s</xliff:g></string>
     <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
     <!-- Network operators settings title.  [CHAR LIMIT=50] -->
     <!-- Access point names title.  [CHAR LIMIT=50] -->
@@ -3731,11 +4675,14 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
     <string name="restriction_wifi_config_summary">Caniatáu addasu gosodiadau Wi\u2011Fi a Symudol</string>
     <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+    <string name="restriction_bluetooth_config_title">Bluetooth</string>
     <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
     <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
     <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
     <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+    <string name="restriction_nfc_enable_summary" product="tablet">Caniatáu cyfnewid data pan mae\'r llechen yn cyffwrdd â dyfais arall</string>
     <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+    <string name="restriction_nfc_enable_summary" product="default">Caniatáu cyfnewid data pan mae\'r ffôn yn cyffwrdd â dyfais arall</string>
     <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
     <string name="restriction_location_enable_title">Lleoliad</string>
     <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
@@ -3744,58 +4691,76 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Wizard next button label [CHAR LIMIT=25] -->
     <string name="wizard_next">Nesaf</string>
     <!-- Wizard next button label [CHAR LIMIT=25] -->
+    <string name="wizard_finish">Gorffen</string>
     <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+    <string name="user_image_take_photo" msgid="7496128293167402354">Tynnu llun</string>
     <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
     <string name="user_image_choose_photo" msgid="3746334626214970837">Dewis llun o\'r oriel</string>
     <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
     <!-- Text to display in regulatory info screen (from device overlay). -->
     <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+    <string name="sim_setup_wizard_title">Cardiau SIM</string>
     <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+    <string name="sim_settings_title">Cardiau SIM</string>
     <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+    <string name="sim_settings_summary"><xliff:g id="sim_name">%1$s</xliff:g> - <xliff:g id="sim_number">%2$s</xliff:g></string>
     <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
     <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
     <string name="sim_cards_changed_message_summary">Tara i osod gweithgareddau</string>
     <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+    <string name="sim_cellular_data_unavailable">Dyw data symudol ddim ar gael.</string>
     <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
     <string name="sim_cellular_data_unavailable_summary">Tara i ddewis SIM data</string>
     <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+    <string name="sim_calls_always_use">Defnyddio hwn bob tro ar gyfer galwadau</string>
     <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
     <!-- Message for switching data SIM; switching takes a while -->
+    <string name="data_switch_started">Yn newid SIM data. Gall hyn gymryd munud...</string>
     <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
     <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
     <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+    <string name="sim_card_number_title">SIM <xliff:g id="card_number">%1$d</xliff:g></string>
     <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
     <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
     <string name="sim_editor_name">Enw\'r SIM</string>
     <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
     <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
     <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+    <string name="sim_editor_carrier">Darparwr gwasanaeth</string>
     <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+    <string name="sim_editor_number">Rhif</string>
     <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
     <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
     <!-- Orange label.  [CHAR LIMIT=40] -->
+    <string name="color_orange">Oren</string>
     <!-- Purple label.  [CHAR LIMIT=40] -->
+    <string name="color_purple">Porffor</string>
     <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+    <string name="sim_no_inserted_msg">Dim cerdyn SIM wedi\'i osod</string>
     <!-- SIM status title  [CHAR LIMIT=40] -->
     <string name="sim_status_title">Statws SIM</string>
     <!-- Title for call back. [CHAR LIMIT=60] -->
     <!-- Title for outgoing back. [CHAR LIMIT=60] -->
     <!-- Title for other call settings. [CHAR LIMIT=60] -->
+    <string name="sim_other_call_settings">Gosodiadau galwadau eraill</string>
     <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
     <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
     <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
     <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
     <string name="preferred_network_offload_popup">Bydd analluogi Darlledu Enw\'r Rhwydwaith yn rhwystro cysylltu\'n awtomatig i rwydweithiau cudd.</string>
     <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+    <string name="sim_signal_strength"><xliff:g id="dbm">%1$d</xliff:g> dBm <xliff:g id="asu">%2$d</xliff:g> asu</string>
     <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
     <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
     <string name="sim_notification_summary">Tara i\'w osod</string>
     <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
     <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+    <string name="sim_calls_ask_first_prefs_title">Gofyn bob tro</string>
     <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
     <!-- Title for SIM selection notification channel -->
     <!--Dashboard strings-->
     <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+    <string name="dashboard_title">Gosodiadau</string>
     <!-- Text to describe the items to be expanded as suggested settings [CHAR LIMIT=none] -->
     <plurals name="settings_suggestion_header_summary_hidden_items">
         <item quantity="zero">Dangos %d eitemau wedi eu cuddio</item>
@@ -3808,12 +4773,16 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
     <!-- Summary for Network and Internet settings, explaining it contains mobile network setting [CHAR LIMIT=NONE]-->
     <!-- Summary for Network and Internet settings, explaining it contains network data usage setting [CHAR LIMIT=NONE]-->
+    <string name="network_dashboard_summary_data_usage">defnydd data</string>
     <!-- Summary for Network and Internet settings, explaining it contains hotspot (tethering) setting [CHAR LIMIT=NONE]-->
+    <string name="network_dashboard_summary_hotspot">llecyn</string>
     <!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
     <string name="connected_devices_dashboard_title">Dyfeisiadau wedi cysylltu</string>
     <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
     <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="connected_devices_dashboard_no_nfc_summary">Bluetooth, Bwrw</string>
     <!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
+    <string name="app_and_notification_dashboard_title">Apiau a hysbysiadau</string>
     <!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
     <!-- Title for setting tile leading to User and accounts settings [CHAR LIMIT=40]-->
     <!-- Title for setting tile leading to setting UI which allows user set default app to
@@ -3822,12 +4791,16 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Summary text for system preference tile, showing important setting items under system setting [CHAR LIMIT=NONE]-->
     <!-- Search strings -->
     <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+    <string name="search_results_title">Gosodiadau</string>
     <!-- Text used as a search hint into the search box -->
+    <string name="search_menu">Gosodiadau chwilio</string>
     <!-- Text used as a search hint into the search box -->
+    <string name="query_hint_text">Gosodiadau chwilio</string>
     <!-- Search breadcrumb connector symbol -->
     <!--Search Keywords [CHAR LIMIT=NONE]-->
     <string name="keywords_wifi">WiFi, wi-fi, cysylltiad rhwydwaith</string>
     <string name="keywords_more_default_sms_app">neges destun, testun, neges, negeseuon, negeseua, negesu</string>
+    <string name="keywords_more_mobile_networks">symudol, darparwr gwasanaeth, di-wifr, data, 4g, 3g, 2g, lte, signal</string>
     <string name="keywords_wifi_calling">WiFi, wi-fi, galwad, galw</string>
     <string name="keywords_display">sgrin, sgrin cyffwrdd</string>
     <string name="keywords_display_brightness_level">pylu sgrin, pylu\'r sgrin, sgrin cyffwrdd, batri</string>
@@ -3845,10 +4818,12 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="keywords_network_reset">ailosod, ail-osod, ffatri</string>
     <string name="keywords_factory_data_reset">dileu, dadosod, ailosod, ail-osod, clirio, tynnu</string>
     <string name="keywords_sounds_and_notifications_interruptions">dim tarfu, tarfu, ymyrryd, torriad</string>
+    <string name="keywords_app">RAM</string>
     <string name="keywords_location">gerllaw, lleol, lleoliad, hanes, adrodd</string>
+    <string name="keywords_accounts">cyfrif</string>
     <string name="keywords_users">rhwystr, rhwystro, rhwystrwyd</string>
     <string name="keywords_keyboard_and_ime">cywiro testun, cywiriad sillafu, cywiro, sain, dirgrynu, awto, iaith, ystum, awgrym, awgrymiad, awgrymu, thema, gair, math, emoji, gwenoglun, rhyngwladol</string>
-    <string name="keywords_reset_apps">ailsod, dewisiadau, rhagosod, rhagosodedig</string>
+    <string name="keywords_reset_apps">ailosod, dewisiadau, rhagosod, rhagosodedig</string>
     <string name="keywords_emergency_app">argyfwng, rhew, ap, rhagosodedig</string>
     <string name="keywords_default_phone_app">ffôn, deialu, deialydd, rhagosodedig</string>
     <string name="keywords_all_apps">ap, lawrlwytho, llwytho i lawr, apiau, system</string>
@@ -3857,13 +4832,17 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="keywords_lockscreen">llusgo i ddatgloi, cyfrinair, patrwm, PIN</string>
     <string name="keywords_profile_challenge">her gwaith, gwaith, proffil</string>
     <string name="keywords_unification">proffil gwaithh, proffil, rheoli, uno, gwaitth, rheolaeth proffil</string>
+    <string name="keywords_gesture">ystumiau</string>
+    <string name="keywords_backup">cadw copi wrth gefn, copi wrth gefn</string>
     <string name="keywords_assist_gesture_launch">ystum</string>
     <!-- NFC Wi-Fi pairing/setup strings-->
     <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
     <!-- Text for button to confirm writing tag -->
+    <string name="write_tag">Ysgrifennu</string>
     <!-- Text to inform the user to tap a tag to complete the setup process -->
     <!-- Text to inform the user that the network key entered was incorrect -->
     <!-- Text displayed when tag successfully writen -->
+    <string name="status_write_success">Llwyddiant!</string>
     <!-- Text displayed in error cases (failure to write to tag) -->
     <!-- Text displayed when tag is not writable -->
     <!-- Option title for the default sound, context based on screen -->
@@ -3882,9 +4861,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Sound: Dashboard summary example used in Setup Wizard preview screen. [CHAR LIMIT=100] -->
     <string name="sound_settings_example_summary">Uchder sain canu ar 80%</string>
     <!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->
+    <string name="media_volume_option_title">Uchder sain cyfryngau</string>
     <!-- Sound: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
     <string name="alarm_volume_option_title">Uchder sain larymau</string>
     <!-- Sound: Title for the option managing ring volume. [CHAR LIMIT=30] -->
+    <string name="ring_volume_option_title">Uchder sain caniad ffôn</string>
     <!-- Sound: Title for the option managing notification volume. [CHAR LIMIT=30] -->
     <string name="notification_volume_option_title">Uchder sain hysbysiadau</string>
     <!-- Sound: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
@@ -3897,10 +4878,12 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Sound: Title for the option defining the default alarm sound. [CHAR LIMIT=30] -->
     <!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
     <!-- Sound: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="other_sound_settings">Synau eraill</string>
     <!-- Sound: Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
     <string name="dial_pad_tones_title">Tonau pad deialu</string>
     <!-- Sound: Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
     <!-- Sound: Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+    <string name="charging_sounds_title">Seiniau gwefru</string>
     <!-- Sound: Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
     <!-- Sound: Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
     <string name="touch_sounds_title">Seiniau cyffwrdd</string>
@@ -3914,11 +4897,13 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Sound: Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
     <string name="emergency_tone_alert">Rhybudd</string>
     <!-- Sound: Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+    <string name="emergency_tone_vibrate">Dirgrynu</string>
     <!-- Sound: Other sounds: Title for the option enabling boot sounds. [CHAR LIMIT=30] -->
     <string name="boot_sounds_title">Synau wrth droi ymlaen</string>
     <!-- Sound: Summary for the Do not Disturb option when there is no automatic rules turned on. [CHAR LIMIT=NONE]-->
     <!-- Sound: Summary for the Do not Disturb option when at least one automatic rules turned on. [CHAR LIMIT=NONE]-->
     <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
+    <string name="zen_mode_settings_title">Dewisiadau Dim Tarfu</string>
     <!-- Do not disturb: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
     <!--  Do not disturb: Title for the zen mode automation listing. [CHAR LIMIT=30] -->
     <!--  Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=50] -->
@@ -3941,6 +4926,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Work Sound: Confirm action text for dialog shown when overriding work notification sounds with personal sounds. [CHAR LIMIT=30] -->
     <string name="work_sync_dialog_yes">Disodli</string>
     <!-- Work Sound: Message for dialog shown when using the same sounds for work events as for personal events (notifications / ringtones / alarms). [CHAR LIMIT=none] -->
+    <string name="work_sync_dialog_message">Caiff seiniau dy broffil personol eu defnyddio ar gyfer dy broffil gwaith</string>
     <!-- Sound installation: Title for the dialog to confirm that a new sound will be installed to the Ringtones, Notifications, or Alarms folder. [CHAR LIMIT=50] -->
     <!-- Sound installation: Message for the dialog to confirm that a new sound will be installed to the Ringtones, Notifications, or Alarms folder. [CHAR LIMIT=none] -->
     <string name="ringtones_install_custom_sound_content">Caiff y ffeil ei gopïo i\'r ffolder <xliff:g id="folder_name" example="Ringtones">%s</xliff:g></string>
@@ -3955,6 +4941,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="profile_section_header">Hysbysiadau gwaith</string>
     <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5125022693565388760] -->
     <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+    <string name="notification_pulse_title">Golau ysbeidiol</string>
     <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
     <string name="lock_screen_notifications_title">Ar y sgrin cloi</string>
     <!-- Configure Notifications: Value for lockscreen notifications:  all information will be
@@ -3989,6 +4976,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Notification Settings: Title for an individual app's notification settings. [CHAR LIMIT=30] -->
     <string name="notifications_title">Hysbysiadau</string>
     <!-- Notification Settings: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+    <string name="app_notifications_title">Hysbysiadau apiau</string>
     <!-- [CHAR LIMIT=100] Notification channel title -->
     <!-- [CHAR LIMIT=100] Notification importance screen title -->
     <string name="notification_importance_title">Pwysigrwydd</string>
@@ -4001,6 +4989,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
      summary on the channel page-->
     <!-- [CHAR LIMIT=100] Notification Importance: min importance level description -->
     <!-- [CHAR LIMIT=100] Notification Importance: low importance level description -->
+    <string name="notification_importance_low">Dim sain</string>
     <!-- [CHAR LIMIT=100] Notification Importance: normal importance level description -->
     <!-- [CHAR LIMIT=100] Notification Importance: high importance level description -->
     <!-- [CHAR LIMIT=100] Notification Importance: high importance level description,
@@ -4008,9 +4997,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Importance title strings for the Importance page. Also the first part of the importance
      summary on the channel page-->
     <!-- [CHAR LIMIT=100] Notification Importance title: min importance level title -->
+    <string name="notification_importance_min_title">Isel</string>
     <!-- [CHAR LIMIT=100] Notification Importance title: low importance level title -->
     <string name="notification_importance_low_title">Canolig</string>
     <!-- [CHAR LIMIT=100] Notification Importance title: normal importance level title -->
+    <string name="notification_importance_default_title">Uchel</string>
     <!-- [CHAR LIMIT=100] Notification Importance title: high importance level title -->
     <!-- [CHAR LIMIT=40] Notification importance title. This setting controls how notifications in older apps may alert the user (eg, sound, visual, vibrate). -->
     <string name="allow_interruption">Caniatáu torri ar draws</string>
@@ -4058,21 +5049,36 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Special access > Picture-in-picture > Additional keywords to search for. [CHAR LIMIT=NONE] -->
     <!-- Apps > App Details > Advanced section string title. [CHAR LIMIT=NONE] -->
     <!-- Apps > App Details > Picture-in-picture > Switch title. [CHAR LIMIT=NONE] -->
+    <string name="picture_in_picture_app_detail_switch">Caniatáu llun-o-fewn-llun</string>
     <!-- Apps > App Details > Picture-in-picture > Description. [CHAR LIMIT=NONE] -->
+    <string name="picture_in_picture_app_detail_summary">Caniatáu i\'r ap hwn greu ffenestr llun-o-fewn-llun tra bod yr ap ar agor neu ar ôl i ti ei adael (i barhau i wylio fideo, er enghraifft). Bydd y ffenestr hon yn ymddangos dros ben yr apiau eraill sy\'n cael eu defnyddio.</string>
     <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
     <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
     <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
     <string name="loading_notification_apps">Yn llwytho apiau...</string>
     <!-- [CHAR LIMIT=NONE] Text appearing when app notifications are off -->
+    <string name="app_notifications_off_desc">Mae Android yn rhwystro hysbysiadau\'r ap hwn rhag ymddangos ar y ddyfais hon</string>
     <!-- [CHAR LIMIT=NONE] Text appearing when channel notifications are off -->
+    <string name="channel_notifications_off_desc">Mae Android yn rhwystro\'r categori hwn o hysbysiadau rhag ymddangos ar y ddyfais hon</string>
     <!-- [CHAR LIMIT=NONE] App notification settings: channels title -->
+    <string name="notification_channels">Categorïau</string>
     <!-- [CHAR LIMIT=NONE] App notification settings: non-grouped-channels title -->
     <string name="notification_channels_other">Arall</string>
     <!-- [CHAR LIMIT=NONE] App notification settings: no channels -->
     <!-- [CHAR LIMIT=NONE] App notification settings: link to app notification settings-->
+    <string name="app_settings_link">Gosodiadau ychwanegol yn yr ap</string>
     <!-- [CHAR LIMIT=45] App notification listing summary, blocked apps -->
+    <string name="app_notification_listing_summary_zero">Wedi\'i droi ymlaen ar gyfer pob ap</string>
     <!-- [CHAR LIMIT=45] App notification listing summary, blocked apps -->
     <!-- [CHAR LIMIT=NONE] Footer listing a count of deleted channels. -->
+    <plurals name="deleted_channels">
+        <item quantity="zero"><xliff:g id="count" example="10">%d</xliff:g> categori wedi\'u dileu</item>
+        <item quantity="one"><xliff:g id="count" example="10">%d</xliff:g> categori wedi\'i ddileu</item>
+        <item quantity="two"><xliff:g id="count" example="10">%d</xliff:g> gategori wedi\'u dileu</item>
+        <item quantity="few"><xliff:g id="count" example="10">%d</xliff:g> categori wedi\'u dileu</item>
+        <item quantity="many"><xliff:g id="count" example="10">%d</xliff:g> chategori wedi\'u dileu</item>
+        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> categori wedi\'u dileu</item>
+    </plurals>
     <!-- [CHAR LIMIT=NONE] App notification settings: notifications enabled-->
     <string name="notification_toggle_on">Ymlaen</string>
     <!-- [CHAR LIMIT=NONE] App notification settings: notifications disabled-->
@@ -4095,13 +5101,17 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
     <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
     <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+    <string name="app_notifications_dialog_done">Iawn</string>
     <!-- [CHAR LIMIT=150] App notification settings: App notifications Importance title -->
     <string name="app_notification_importance_title">Pwysigrwydd</string>
     <!-- [CHAR LIMIT=180] Notification settings: lights -->
+    <string name="notification_show_lights_title">Golau ysbeidiol</string>
     <!-- [CHAR LIMIT=180] Notification settings: vibration -->
+    <string name="notification_vibrate_title">Dirgrynu</string>
     <!-- [CHAR LIMIT=180] Notification settings: sound -->
     <string name="notification_channel_sound_title">Sain</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Rule delete button -->
+    <string name="zen_mode_rule_delete_button">Dileu</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Rule name edit button -->
     <string name="zen_mode_rule_rename_button">Ailenwi</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
@@ -4109,33 +5119,48 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
     <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+    <string name="zen_mode_add_rule">Ychwanegu rhagor</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+    <string name="zen_mode_delete_rule">Dileu rheol</string>
     <!-- [CHAR LIMIT=60] Zen mode settings: Choose rule type dialog title -->
     <string name="zen_mode_choose_rule_type">Dewis math o reol</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+    <string name="zen_mode_delete_rule_confirmation">Dileu\'r rheol \u201c<xliff:g id="rule" example="Weekends">%1$s</xliff:g>\u201d?</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+    <string name="zen_mode_delete_rule_button">Dileu</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+    <string name="zen_mode_rule_type">Math o reol</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+    <string name="zen_mode_rule_type_unknown">Anhysybys</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+    <string name="zen_mode_configure_rule">Ffurfweddu rheol</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+    <string name="zen_schedule_rule_type_name">Rheol amser</string>
     <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+    <string name="zen_event_rule_type_name">Rheol digwyddiad</string>
     <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+    <string name="zen_mode_event_rule_summary_any_calendar">unrhyw galendr</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+    <string name="zen_mode_event_rule_calendar_any">Unrhyw galendr</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+    <string name="zen_mode_event_rule_reply_any_except_no">Ie, Efallai, neu Heb ateb</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+    <string name="zen_mode_event_rule_reply_yes_or_maybe">Ie neu Efallai</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+    <string name="zen_mode_event_rule_reply_yes">Ie</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
     <string name="zen_mode_rule_summary_enabled_combination">Ymlaen / <xliff:g id="mode" example="Alarms only">%1$s</xliff:g></string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Third party Rule summary template -->
     <string name="zen_mode_rule_summary_provider_combination"><xliff:g id="package" example="Condition Provider App">%1$s</xliff:g>\n<xliff:g id="summary" example="On / Alarms only">%2$s</xliff:g></string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+    <string name="zen_mode_schedule_rule_days">Diwrnodau</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
     <string name="zen_mode_schedule_rule_days_none">Dim</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
@@ -4145,34 +5170,51 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- [CHAR LIMIT=NONE] Zen mode settings: Downtime rule setting -->
     <string name="zen_mode_schedule_alarm_summary">Stopio am yr amser diwedd neu\'r larwm nesaf, pa bynnag un sy\'n dod gyntaf.</string>
     <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+    <string name="summary_divider_text">,\u0020</string>
     <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+    <string name="summary_range_symbol_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> - <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
     <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+    <string name="summary_range_verbal_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> i <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
     <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+    <string name="zen_mode_calls">Galwadau</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+    <string name="zen_mode_messages">Negeseuon</string>
     <!-- [CHAR LIMIT=50] Zen mode settings: All messages summary -->
     <string name="zen_mode_all_messages">Pob neges</string>
     <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+    <string name="zen_mode_from_anyone">Oddi wrth unrhyw un</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+    <string name="zen_mode_from_contacts">Oddi wrth cysylltiadau yn unig</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+    <string name="zen_mode_from_starred">Oddi wrth cysylltiadau serennog yn unig</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
     <string name="zen_mode_from_none">Dim</string>
     <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+    <string name="zen_mode_alarms">Larymau</string>
     <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option summary -->
     <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+    <string name="zen_mode_reminders">Negeseuon atgoffa</string>
     <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+    <string name="zen_mode_events">Digwyddiadau</string>
     <!-- [CHAR LIMIT=50] Zen mode settings: All callers summary -->
     <string name="zen_mode_all_callers">Pob galwr</string>
     <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
     <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
     <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
     <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+    <string name="zen_mode_when">Troi ymlaen yn atomatig</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+    <string name="zen_mode_when_never">Byth</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+    <string name="zen_mode_when_every_night">Pob nos</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
     <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+    <string name="zen_mode_start_time">Amser dechrau</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+    <string name="zen_mode_end_time">Amser gorffen</string>
     <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+    <string name="zen_mode_end_time_next_day_summary_format"><xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g> y diwrnod canlynol</string>
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
@@ -4211,18 +5253,26 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- [CHAR LIMIT=300] Screen pinning description -->
     <string name="screen_pinning_description">Pan mae\'r gosodiad hwn wedi ei droi ymlaen, mae\'n bosib defnyddio pinio sgrin i gadw\'r sgrin bresennol mewn golwg nes dy fod yn ei datbinio.\n\nI ddefnyddio pinio sginiau:\n\n1. Sicrha bod pinio sgrin wedi ei droi ymlaen.\n\n2. Agora\'r sgrin wyt am ei phinio.\n\n3. Tara \'Trosolwg\'.\n\n4. Llithra i fyny ac yna taro\'r eicon pin.</string>
     <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_pattern">Gofyn am batrwm datgloi cyn dadbinio</string>
     <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_pin">Gofyn am PIN cyn dadbinio</string>
     <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_password">Gofyn am gyfrinair cyn dadbinio</string>
     <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
     <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+    <string name="opening_paragraph_delete_profile_unknown_company">Mae\'r proffil hwn yn cael ei reoli gan:</string>
     <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
     <string name="managing_admin">Rheolir gan <xliff:g id="admin_app_label">%s</xliff:g></string>
     <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+    <string name="experimental_preference">(Arbrofol)</string>
     <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
     <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
     <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_pin">Mae\'n bosib diogelu\'r ddyfais ymhellach gan fynnu bod angen PIN er mwyn cychwyn y system. Ni fydd y ddyfais yn medru derbyn galwadau, negeseuon na hysbysiadau, gan gynnwys larymau, nes ei bod wedi ei chychwyn.\n\nMae hyn yn helpu diogelu data yn yr achos bod y ddyfais yn cael ei cholli neu ei dwyn. Wyt ti am ddefnyddio PIN i fedru cychwyn dy ddyfais?   </string>
     <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_pattern">Mae\'n bosib diogelu\'r ddyfais ymhellach gan fynnu bod angen patrwm er mwyn cychwyn y system. Ni fydd y ddyfais yn medru derbyn galwadau, negeseuon na hysbysiadau, gan gynnwys larymau, nes ei bod wedi ei chychwyn.\n\nMae hyn yn helpu diogelu data yn yr achos bod y ddyfais yn cael ei cholli neu ei dwyn. Wyt ti am ddefnyddio patrwm i fedru cychwyn dy ddyfais?   </string>
     <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_password">Mae\'n bosib diogelu\'r ddyfais ymhellach gan fynnu bod angen cyfrinair er mwyn cychwyn y system. Ni fydd y ddyfais yn medru derbyn galwadau, negeseuon na hysbysiadau, gan gynnwys larymau, nes ei bod wedi ei chychwyn.\n\nMae hyn yn helpu diogelu data yn yr achos bod y ddyfais yn cael ei cholli neu ei dwyn. Wyt ti am ddefnyddio cyfrinair i fedru cychwyn dy ddyfais?   </string>
     <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
     <string name="encryption_interstitial_message_pin_for_fingerprint">Yn ogystal â defnyddio ôl dy fys i ddatgloi\'r ddyfais, mae\'n bosib diogelu\'r ddyfais ymhellach gan fynnu bod angen PIN er mwyn dechrau\'r system. Nes bod y system yn rhedeg, ni all y ddyfais derbyn galwadau, negeseuon na hysbysiadau, gan gynnwys larymau.\n\nMae hyn yn helpu diogelu data yn yr achos bod y ddyfais yn cael ei cholli neu ei dwyn. Wyt ti am osod PIN er mwyn medru dechrau dy ddyfais?</string>
     <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
@@ -4231,6 +5281,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="encryption_interstitial_message_password_for_fingerprint">Yn ogystal â defnyddio ôl dy fys i ddatgloi\'r ddyfais, mae\'n bosib diogelu\'r ddyfais ymhellach gan fynnu bod angen cyfrinair er mwyn dechrau\'r system. Nes bod y system yn rhedeg, ni all y ddyfais derbyn galwadau, negeseuon na hysbysiadau, gan gynnwys larymau.\n\nMae hyn yn helpu diogelu data yn yr achos bod y ddyfais yn cael ei cholli neu ei dwyn. Wyt ti am osod cyfrinair er mwyn medru dechrau dy ddyfais?</string>
     <!-- Button label to say yes to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
     <!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
+    <string name="encryption_interstitial_no">Na</string>
     <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
     <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
     <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
@@ -4242,23 +5293,32 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="direct_boot_unaware_dialog_message">Nodyn: Ar ôl ailddechrau, ni all yr ap hwn ddechrau nes bod dy ffôn wedi ei ddatgloi.</string>
     <!-- Title and summary for SIM Status -->
     <string name="imei_information_title">Gwybodaeth IMEI</string>
+    <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
     <!-- New strings needed for App Info 2 -->
     <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
     <!-- Category name for App Launch -->
     <string name="app_launch_domain_links_title">Agor dolenni</string>
+    <string name="app_launch_open_domain_urls_summary">Agor heb ofyn</string>
     <!-- Summary for app storage preference -->
     <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
     <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+    <string name="storage_type_external">Storfa allanol</string>
     <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+    <string name="app_data_usage">Defnydd data\'r ap</string>
     <!-- Summary for data usage preference [CHAR LIMIT=15] -->
     <!-- Title of storage preference to control where app is stored -->
     <!-- Title of button to change storage [CHAR LIMIT=25] -->
+    <string name="change">Newid</string>
     <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+    <string name="change_storage">Newid storfa</string>
     <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+    <string name="notifications_label">Hysbysiadau apiau</string>
     <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
     <string name="notifications_enabled">Ymlaen</string>
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+    <string name="notifications_disabled">Popeth wedi\'i troi ffwrdd</string>
     <!-- Label for showing apps with some blocked notifications in list [CHAR LIMIT=30] -->
+    <string name="notifications_partly_blocked"><xliff:g id="count" example="1">%1$d</xliff:g> o <xliff:g id="count" example="10">%2$d</xliff:g> categori wedi\'u troi ffwrdd</string>
     <!-- App notification summary with notifications silenced [CHAR LIMIT=40] -->
     <string name="notifications_silenced">Wedi\'i distewi</string>
     <!-- App notification summary with notifications redacted [CHAR LIMIT=70] -->
@@ -4271,44 +5331,54 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- App notification summary for advanced controls -->
     <string name="notification_summary_level">Lefel %d</string>
     <!-- App notification summary channel divider-->
+    <string name="notification_summary_channel"><xliff:g id="channel_name">%1$s</xliff:g> \u2022 <xliff:g id="group_name">%2$s</xliff:g></string>
     <!-- Permissions preference summary [CHAR LIMIT=40] -->
     <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
     <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
     <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
     <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
     <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+    <string name="filter_all_apps">Pob ap</string>
     <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
     <string name="filter_enabled_apps">Apiau wedi eu gosod</string>
     <!-- Label for showing instant apps in list [CHAR LIMIT=40] -->
     <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
     <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+    <string name="filter_work_apps">Gwaith</string>
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
     <string name="filter_notif_all_apps">Apiau: Pob un</string>
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
     <string name="filter_notif_blocked_apps">Apiau: Wedi\'u troi ffwrdd</string>
     <!-- Label for showing categories with urgent notifications in list [CHAR LIMIT=30] -->
+    <string name="filter_notif_urgent_channels">Categorïau: Pwysigrwydd brys</string>
     <!-- Label for showing categories with low importance notifications in list [CHAR LIMIT=30] -->
+    <string name="filter_notif_low_channels">Categorïau: Pwysigrwydd isel</string>
     <!-- Label for showing categories with blocked notifications in list [CHAR LIMIT=30] -->
     <string name="filter_notif_blocked_channels">Categorïau: Wedi\'u troi ffwrdd</string>
     <!-- Label for showing categories with notifications that override dnd in list [CHAR LIMIT=30] -->
+    <string name="filter_notif_dnd_channels">Categorïau: Yn anwybyddu Dim Tarfu</string>
     <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
     <string name="advanced_apps">Uwch</string>
     <!-- Title for application configuration settings [CHAR LIMIT=30] -->
     <!-- Warning toast shown when data usage screen can't find specified app -->
     <!-- Label for list that shows all permissions -->
+    <string name="app_permissions">Caniatâd yr ap</string>
     <!-- Summary of permissions currently granted to apps [CHAR LIMIT=60] -->
+    <string name="app_permissions_summary">Apiau sy\'n defnyddio <xliff:g id="apps" example="location">%1$s</xliff:g></string>
     <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
     <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
     <!-- Title of a preference item that will show the user's preferences for this app's priority for opening links to websites that it claims to support [CHAR LIMIT=30] -->
     <string name="domain_urls_title">Agor dolenni</string>
     <!-- Summary for an app that doesn't open any domain URLs [CHAR LIMIT=45] -->
     <!-- Summary of an app that can open URLs for exactly one domain [CHAR LIMIT=45] -->
+    <string name="domain_urls_summary_one">Agor <xliff:g id="domain" example="mail.google.com">%s</xliff:g></string>
     <!-- Summary of an app that can open several domain's URLs [CHAR LIMIT=45] -->
     <string name="domain_urls_summary_some">Agor <xliff:g id="domain" example="mail.google.com">%s</xliff:g> ac URLs eraill</string>
     <!-- Summary of open web links settings when no app can open supported links [CHAR LIMIT=NONE] -->
     <!-- Summary of open web links settings when at least one app can open supported links [CHAR LIMIT=NONE] -->
     <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
     <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+    <string name="app_link_open_ask">Gofyn bob tro</string>
     <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
     <!-- Fingerprint hint message when finger was not recognized.-->
     <string name="fingerprint_not_recognized">Dim yn ei adnabod</string>
@@ -4321,26 +5391,36 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="assistant_security_warning_title">Gosod <xliff:g id="assistant_app_name">%s</xliff:g> fel dy gynorthwyydd?    </string>
     <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
          displayed as a dialog message when the user selects an assistant. -->
+    <string name="assistant_security_warning">Bydd y cynorthwyydd yn medru darllen gwybodaeth am yr apiau mewn defnydd ar dy system, gan gynnwys gwybodaeth sy\'n weledol ar dy sgrin neu ar gael o fewn yr apiau.</string>
     <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+    <string name="assistant_security_warning_agree">Cytuno</string>
     <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+    <string name="assistant_security_warning_disagree">Anghytuno</string>
     <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
     <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
     <string name="default_browser_title">Ap Porwr</string>
     <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+    <string name="default_browser_title_none">Dim porwr rhagosodedig</string>
     <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+    <string name="default_phone_title">Ap ffôn</string>
     <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+    <string name="default_app">(Rhagosodiad)</string>
     <!-- Label of system app for current setting -->
     <string name="system_app">(System)</string>
     <!-- Label of system and default app for current setting -->
     <string name="system_default_app">(Rhagosodiad y system)</string>
     <!-- Title of app storage screen [CHAR LIMIT=30] -->
+    <string name="apps_storage">Storfa apiau</string>
     <!-- Title of usage access screen [CHAR LIMIT=30] -->
     <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
     <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+    <string name="app_usage_preference">Dewisiadau defnydd apiau</string>
     <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
     <string name="usage_access_description">Mae mynediad defnydd yn caniatáu i ap ddilyn pa apiau eraill wyt yn eu defnyddio a pha mor aml, yn ogystal â dy ddarparwr gwasanaeth, iaith y system a manylion eraill.</string>
     <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+    <string name="memory_settings_title">Cof</string>
     <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+    <string name="memory_details_title">Manylion cof</string>
     <!-- Description of app always running [CHAR LIMIT=45] -->
     <!-- Description of app sometimes running [CHAR LIMIT=45] -->
     <!-- Description of app rarely running [CHAR LIMIT=45] -->
@@ -4350,6 +5430,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Average memory used by an app [CHAR LIMIT=25] -->
     <!-- Formatting for memory description [CHAR LIMIT=25] -->
     <!-- Label for process [CHAR LIMIT=25] -->
+    <string name="process_format"><xliff:g id="app_name" example="Settings">%1$s</xliff:g> (<xliff:g id="count" example="3">%2$d</xliff:g>)</string>
     <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
     <!-- Label for menu to launch a screen showing usage alerts for battery [CHAR LIMIT=30] -->
     <string name="additional_battery_info">Rhybuddion defnydd</string>
@@ -4364,15 +5445,21 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
     <!-- Description of high power switch [CHAR LIMIT=NONE] -->
     <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+    <string name="high_power_prompt_title">Gadael i\'r ap redeg yn y cefndir o hyd?</string>
     <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+    <string name="high_power_prompt_body">        Gall caniatáu <xliff:g id="app_name" example="Settings">%1$s</xliff:g> i redeg yn y cefndir o hyd leihau oes batri.
+        \n\nGellir newid hyn yn hwyrach yn Gosodiadau &gt; Apiau a hysbysiadau.</string>
     <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+    <string name="battery_summary"><xliff:g id="percentage" example="2">%1$s</xliff:g> ers gwefru\'n llawn tro diwethaf</string>
     <!-- Title of a group of settings that let you manage settings that affect battery life [CHAR LIMIT=60] -->
     <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+    <string name="no_battery_summary">Dim defnydd batri ers gwefru llawn ddiwethaf</string>
     <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
     <string name="app_notification_preferences">Gosodiadau apiau</string>
     <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
     <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
     <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+    <string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> yn rhagor</string>
     <!-- Title of dialog shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->
     <string name="share_remote_bugreport_dialog_title">Rhannu adroddiad am wall?</string>
     <!-- Message of a dialog shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->
@@ -4414,6 +5501,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring photos via PTP. -->
+    <string name="usb_use_photo_transfers_desc">Trosglwyddo lluniau neu ffeiliau (dull PTP) os na chefnogir MTP</string>
     <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for entering MIDI mode. -->
@@ -4427,9 +5515,11 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
          usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
     <string name="usb_use">Defnyddio USB i</string>
     <!-- Settings item title for USB preference [CHAR LIMIT=35] -->
+    <string name="usb_pref">USB</string>
     <!-- Settings item summary for USB preference when set to charging only [CHAR LIMIT=NONE] -->
     <!-- Settings item summary for USB preference when set to powering the other device only [CHAR LIMIT=NONE] -->
     <!-- Settings item summary for USB preference when set to transferring files via MTP [CHAR LIMIT=NONE] -->
+    <string name="usb_summary_file_transfers">Trosglwyddo ffeiliau</string>
     <!-- Settings item summary for USB preference when set to transferring photos via PTP [CHAR LIMIT=NONE] -->
     <!-- Settings item summary for USB preference when set to entering MIDI mode [CHAR LIMIT=NONE] -->
     <!-- Settings item title for SMS Mirroring preference [CHAR LIMIT=35] -->
@@ -4449,17 +5539,23 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for average memory use section [CHAR LIMIT=30] -->
     <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
     <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+    <string name="memory_usage">Defnydd cof</string>
     <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+    <string name="app_list_memory_use">Defnydd ap</string>
     <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
     <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
     <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
     <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
     <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
     <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+    <string name="memory_performance">Perfformiad</string>
     <!-- Label for total memory of device [CHAR LIMIT=25] -->
     <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+    <string name="average_used">Cyfartaledd defnyddiwyd (&#x0025;)</string>
     <!-- Label for free memory of device [CHAR LIMIT=25] -->
+    <string name="free_memory">Ar gael</string>
     <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+    <string name="memory_usage_apps">Cof a ddefnyddir gan apiau</string>
     <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
     <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
     <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
@@ -4478,21 +5574,27 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
     <string name="app_list_preference_none">Dim</string>
     <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+    <string name="work_profile_usage_access_warning">Dyw diffodd mynediad data ar gyfer yr ap hwn ddim yn rhwystro dy weinyddwr rhag tracio defnydd data ar gyfer apiau yn dy broffil gwaith</string>
     <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
     <string name="accessibility_lock_screen_progress"><xliff:g id="count" example="1">%1$d</xliff:g> o <xliff:g id="count" example="1">%2$d</xliff:g> wedi\'u defnyddio</string>
     <!-- System Alert Window settings -->
     <!-- Title of display overlay screen [CHAR LIMIT=30] -->
     <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
     <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+    <string name="system_alert_window_apps_title">Apiau</string>
     <!-- Title for the apps that are allowed to display over other apps [CHAR LIMIT=60] -->
     <!-- Label for setting which controls whether app can display over other apps [CHAR LIMIT=45] -->
+    <string name="permit_draw_overlay">Caniatáu dangos dros ben apiau eraill</string>
     <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
     <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+    <string name="allow_overlay_description">Caniatáu i\'r ap hwn ymddangos dros ben apiau eraill sy\u2019n cael eu defnyddio. Mae\'n bosib y gellir ymyrryd yn dy ddefnydd o apiau eraill neu newid sut maen nhw\'n ymddangos neu\'n ymddwyn.</string>
     <!-- Keyword for VR setting -->
     <!-- Keyword for SYSTEM_ALERT_WINDOW -->
     <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
     <!-- Summary of number of apps currently can display over other apps [CHAR LIMIT=60] -->
+    <string name="system_alert_window_summary"><xliff:g id="count" example="10">%1$d</xliff:g> o <xliff:g id="count" example="10">%2$d</xliff:g> ap yn cael dangos dros ben apiau eraill</string>
     <!-- Label for showing apps that can display over other apps [CHAR LIMIT=45] -->
+    <string name="filter_overlay_apps">Apiau gyda chaniatâd</string>
     <!-- Preference summary text for an app when it is allowed for a permission. [CHAR LIMIT=45] -->
     <string name="app_permission_summary_allowed">Caniateir</string>
     <!-- Preference summary text for an app when it is disallowed for a permission. [CHAR LIMIT=45] -->
@@ -4503,7 +5605,9 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="write_settings">Addasu gosodiadau\'r system</string>
     <!-- Keyword for WRITE_SETTINGS -->
     <!-- Summary of number of apps currently can write system settings [CHAR LIMIT=60] -->
+    <string name="write_settings_summary"><xliff:g id="count" example="10">%1$d</xliff:g> o <xliff:g id="count" example="10">%2$d</xliff:g> ap yn cael addasu gosodiadau\'r system</string>
     <!-- Label for showing apps that can install other apps [CHAR LIMIT=45] -->
+    <string name="filter_install_sources_apps">Yn medru gosod apiau eraill</string>
     <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
     <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
     <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
@@ -4515,7 +5619,9 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="write_settings_description">Mae\'n caniatáu i ap addasu gosodiadau\'r system.</string>
     <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
     <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+    <string name="write_settings_off">Na</string>
     <!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] -->
+    <string name="external_source_switch_title">Caniatáu o\'r ffynhonnell hon</string>
     <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
     <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
     <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
@@ -4567,6 +5673,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Example summary of apps used in Setup Wizard preview screen [CHAR LIMIT=NONE] -->
     <string name="apps_summary_example">24 ap wedi eu gosod</string>
     <!-- Summary of storage usage [CHAR LIMIT=NONE] -->
+    <string name="storage_summary"><xliff:g id="percentage" example="54%">%1$s</xliff:g> wedi\'i defnyddio - <xliff:g id="free_space" example="32GB">%2$s</xliff:g> ar gael</string>
     <!-- Summary of storage usage when there is SD card [CHAR LIMIT=NONE] -->
     <!-- Summary of display with screen sleep timeout [CHAR LIMIT=NONE] -->
     <!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
@@ -4589,6 +5696,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for dialog displayed when user clicks on a setting locked by an admin [CHAR LIMIT=30] -->
     <string name="disabled_by_policy_title">Gweithred heb ei ganiatáu</string>
     <!-- Title for dialog displayed to tell user that changing volume was disallowed by an admin [CHAR LIMIT=50] -->
+    <string name="disabled_by_policy_title_adjust_volume">Methu â newid uchder sain</string>
     <!-- Title for dialog displayed to tell user that outgoing calls were disabled by an admin [CHAR LIMIT=50] -->
     <!-- Title for dialog displayed to tell user that sending SMS were disabled by an admin [CHAR LIMIT=50] -->
     <string name="disabled_by_policy_title_sms">Ni chaniateir SMS</string>
@@ -4616,6 +5724,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title of condition that airplane mode is on [CHAR LIMIT=30] -->
     <string name="condition_airplane_title">Mae\'r modd awyren ymlaen</string>
     <!-- Summary of condition that airplane mode is on [CHAR LIMIT=NONE] -->
+    <string name="condition_airplane_summary">Mae Wi-Fi, Bluetooth a rhwydwaith symudol wedi eu diffodd. Nid yw\'n bosib gwneud galwadau na chysylltu â\'r rhyngrwyd.</string>
     <!-- Title of condition that do not disturb is on [CHAR LIMIT=30] -->
     <string name="condition_zen_title">Mae Dim Tarfu ymlaen (<xliff:g name="zen_mode_type" example="Alarms only">%1$s</xliff:g>)</string>
     <!-- Title of condition that battery saver is on [CHAR LIMIT=30] -->
@@ -4623,6 +5732,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Summary of condition that battery saver is on [CHAR LIMIT=NONE] -->
     <string name="condition_battery_summary">Mae perfformiad yn salach. Dyw gwasanaethau lleoliad a data cefndir ddim ar waith.</string>
     <!-- Title of condition that cellular data is off [CHAR LIMIT=50] -->
+    <string name="condition_cellular_title">Mae data symudol i ffwrdd</string>
     <!-- Summary of condition that cellular data is off [CHAR LIMIT=NONE] -->
     <string name="condition_cellular_summary">Dyw\'r rhyngrwyd ond ar gael trwy Wi-Fi.</string>
     <!-- Title of condition that background data is off [CHAR LIMIT=30] -->
@@ -4645,6 +5755,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Summary for the suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=10] -->
     <string name="suggestions_summary">+<xliff:g name="count" example="3">%1$d</xliff:g></string>
     <!-- Title for the suggestions section on the dashboard, representing number of suggestions to show when expanded. [CHAR LIMIT=10] -->
+    <string name="suggestions_more_title">+<xliff:g name="count" example="3">%1$d</xliff:g> arall</string>
     <!-- Title for the collapsed suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=30] -->
     <!-- Summary for the collapsed suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=30] -->
     <plurals name="suggestions_collapsed_summary">
@@ -4656,6 +5767,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
         <item quantity="other">+<xliff:g id="count" example="10">%1$d</xliff:g> awgrym</item>
     </plurals>
     <!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->
+    <string name="suggestion_remove">Tynnu</string>
     <!-- Name of the setting to change the display's color temperature -->
     <!-- Description of the setting to change the display's color temperature -->
     <!-- Toast message letting the user know the color temperature setting is not immediate -->
@@ -4666,6 +5778,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for category for data usage [CHAR LIMIT=30] -->
     <string name="usage">Defnydd</string>
     <!-- Label for cellular data usage in data usage screen [CHAR LIMIT=60] -->
+    <string name="cellular_data_usage">Defnydd data symudol</string>
     <!-- Label for wifi data usage in data usage screen [CHAR LIMIT=60] -->
     <string name="wifi_data_usage">Defnydd data dros Wi-Fi</string>
     <!-- Label for ethernet data usage in data usage screen [CHAR LIMIT=60] -->
@@ -4673,9 +5786,13 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for section about wifi in data usage screen [CHAR LIMIT=60] -->
     <string name="wifi">Wi-Fi</string>
     <!-- Label for section about ethernet in data usage screen [CHAR LIMIT=60] -->
+    <string name="ethernet">Ether-rwyd</string>
     <!-- Format string for amount of cellular data used [CHAR LIMIT=30] -->
+    <string name="cell_data_template"><xliff:g id="amount" example="1 GB">^1</xliff:g> data symudol</string>
     <!-- Format string for amount of wifi data used [CHAR LIMIT=30] -->
+    <string name="wifi_data_template"><xliff:g id="amount" example="1 GB">^1</xliff:g> data Wi-Fi</string>
     <!-- Format string for amount of ethernet data used [CHAR LIMIT=30] -->
+    <string name="ethernet_data_template"><xliff:g id="amount" example="1 GB">^1</xliff:g> data ether-rwyd</string>
     <!-- Format for a summary describing the amount of data before the user is warned [CHAR LIMIT=NONE] -->
     <string name="cell_warning_only">Rhybydd data <xliff:g name="amount" example="1 GB">%1$s</xliff:g></string>
     <!-- Format for a summary describing the amount of data before the user is warned or limited [CHAR LIMIT=NONE] -->
@@ -4698,11 +5815,21 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label for button to set the amount of data before user is limited [CHAR LIMIT=30] -->
     <string name="data_limit">Terfyn data</string>
     <!-- Summary about how much data has been used in a date range [CHAR LIMIT=NONE] -->
+    <string name="data_usage_template"><xliff:g name="amount" example="200 MB">%1$s</xliff:g> wedi\'i defnyddio <xliff:g name="date_range" example="Jan 1 -- Feb 2">%2$s</xliff:g></string>
     <!-- Accessibility label for button that leads to screen with more configuration options [CHAR LIMIT=NONE] -->
+    <string name="configure">Ffurfweddu</string>
     <!-- List of app names included in data usage on app data usage screen
          [CHAR LIMIT=50] -->
     <string name="data_usage_other_apps">Apiau eraill yn y defnydd</string>
     <!-- Description of number of apps allowed to ignore Data Saver [CHAR LIMIT=NONE] -->
+    <plurals name="data_saver_unrestricted_summary">
+        <item quantity="zero"><xliff:g id="count" example="10">%1$d</xliff:g> apiau yn cael defnyddio data yn ddiderfyn tra bod Arbedwr Data ymlaen.</item>
+        <item quantity="one"><xliff:g id="count" example="10">%1$d</xliff:g> ap yn cael defnyddio data yn ddiderfyn tra bod Arbedwr Data ymlaen.</item>
+        <item quantity="two"><xliff:g id="count" example="10">%1$d</xliff:g> ap yn cael defnyddio data yn ddiderfyn tra bod Arbedwr Data ymlaen.</item>
+        <item quantity="few"><xliff:g id="count" example="10">%1$d</xliff:g> ap yn cael defnyddio data yn ddiderfyn tra bod Arbedwr Data ymlaen.</item>
+        <item quantity="many"><xliff:g id="count" example="10">%1$d</xliff:g> ap yn cael defnyddio data yn ddiderfyn tra bod Arbedwr Data ymlaen.</item>
+        <item quantity="other"><xliff:g id="count" example="10">%1$d</xliff:g> ap yn cael defnyddio data yn ddiderfyn tra bod Arbedwr Data ymlaen.</item>
+    </plurals>
     <!-- Name of Data Saver screens [CHAR LIMIT=30] -->
     <string name="data_saver_title">Arbedwr Data</string>
     <!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] -->
@@ -4816,6 +5943,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Summary of notification suggestion during optional steps of setup. [CHAR_LIMIT=80] -->
     <string name="notification_suggestion_summary">Dangos neu guddio cynnwys hysbysiadau</string>
     <!-- Setting tab title for all setting options. [CHAR LIMIT=20] -->
+    <string name="page_tab_title_summary">Y cwbl</string>
     <!-- Setting tab title for support setting options. [CHAR LIMIT=25] -->
     <!-- Summary of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
     <!-- Title of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
@@ -4856,6 +5984,8 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Template for formatting country and language. eg Canada - French [CHAR LIMIT=NONE]-->
     <string name="support_country_format"><xliff:g id="country" example="Canada">%1$s</xliff:g> - <xliff:g id="language" example="Ffrangeg">%2$s</xliff:g></string>
     <!-- Template for formatting phone number and language. eg English (800-000-0000) [CHAR LIMIT=NONE]-->
+    <string name="support_phone_international_format">        <xliff:g id="language" example="English">%1$s</xliff:g> (<xliff:g id="phone" example="800-000-0000">%2$s</xliff:g>)
+    </string>
     <!-- Title text for a list of international support phone numbers. [CHAR LIMIT=60]-->
     <string name="support_international_phone_title">Yn teithio tramor?</string>
     <!-- Description text warning international phone charge may apply when dialing support numbers. [CHAR LIMIT=NONE]-->
@@ -4881,6 +6011,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="support_disclaimer_do_not_show">Peidio â dangos eto</string>
     <!-- Prefix text for the account picker, e.g. "Requesting as user@gmail.com" [CHAR LIMIT=60] -->
     <!-- Spinner dropdown text, when selected will try to add account [CHAR LIMIT=60] -->
+    <string name="support_account_picker_add_account">Ychwanegu cyfrif</string>
     <!-- Title for the dialog containing system information shown [CHAR LIMIT=30] -->
     <!-- [CHAR LIMIT=60] Title of work profile setting page -->
     <string name="managed_profile_settings_title">Gosodiadau proffil gwaith</string>
@@ -4928,6 +6059,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="bluetooth_talkback_headphone">Clustffonau</string>
     <!-- Message for telling the user the kind of BT device being displayed in list. -->
     <!-- Message for telling the user the kind of BT device being displayed in list. -->
+    <string name="bluetooth_talkback_bluetooth">Bluetooth</string>
     <!-- Used as title on the automatic storage manager settings. [CHAR LIMIT=60] -->
     <string name="automatic_storage_manager_settings">Rheoli storfa</string>
     <!-- Used as wall of text to describe the feature. [CHAR LIMIT=NONE] -->
@@ -4949,6 +6081,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Preference summary for gesture settings (device) [CHAR LIMIT=NONE]-->
     <string name="gesture_preference_summary" product="device">Ystumiau cyflym i reoli dy ddyfais</string>
     <!-- Title text for double tap power for camera [CHAR LIMIT=60]-->
+    <string name="double_tap_power_for_camera_title">Neidio i\'r Camera</string>
     <!-- Summary text for double tap power for camera [CHAR LIMIT=160]-->
     <string name="double_tap_power_for_camera_summary">I agor y camera\'n gyflym, gwasga\'r botwm pŵer dwywaith. Mae\'n gweithio pa bynnag beth sydd ar y sgrin.</string>
     <!-- Title for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
@@ -5009,6 +6142,7 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Accounts for section header [CHAR LIMIT=30] -->
     <string name="account_for_section_header">Cyfrifon ar gyfer <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
     <!-- Configure section header [CHAR LIMIT=30] -->
+    <string name="configure_section_header">Ffurfweddu</string>
     <!-- Switch label to enable auto sync account [CHAR LIMIT=60] -->
     <string name="auto_sync_account_title">Cysoni data yn awtomatig</string>
     <!-- Switch label to enable auto sync personal account [CHAR LIMIT=60] -->
@@ -5030,23 +6164,35 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the 'Types of information your organization can see' preference category. [CHAR LIMIT=60] -->
     <!-- Title for the 'Changes made by your organization’s admin' preference category. [CHAR LIMIT=60] -->
     <!-- Title for the 'Your access to this device' preference category. [CHAR LIMIT=60] -->
+    <string name="enterprise_privacy_device_access_category">Dy fynediad i\'r ddyfais hon</string>
     <!-- Label explaining that the admin can see data associated with his/her work account. [CHAR LIMIT=NONE] -->
     <!-- Label explaining that the admin can see apps installed on the device. [CHAR LIMIT=NONE] -->
     <!-- Label explaining that the admin can see app usage statistics. [CHAR LIMIT=NONE] -->
+    <string name="enterprise_privacy_usage_stats">Yr amser a data y\'i defnyddir ar bob ap</string>
     <!-- Label explaining that the admin can retrieve network logs on the device. [CHAR LIMIT=NONE] -->
     <!-- Label explaining that the admin can request bug reports on the device. [CHAR LIMIT=NONE] -->
     <!-- Label explaining that the admin can retrieve security on from the device. [CHAR LIMIT=NONE] -->
     <!-- Label indicating that the the admin never took a given action so far (e.g. did not retrieve security logs or request bug reports). -->
     <string name="enterprise_privacy_none">Dim</string>
     <!-- Label indicating that the admin installed one or more apps on the device. -->
+    <string name="enterprise_privacy_enterprise_installed_packages">Apiau wedi\'u gosod</string>
     <!-- Label explaining that the the number of apps is an estimation. [CHAR LIMIT=NONE] -->
     <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. The number shown is a minimum as there may be additional apps we do not know about. [CHAR LIMIT=NONE] -->
     <!-- Label indicating that the admin granted one or more apps access to the device's location. [CHAR LIMIT=NONE] -->
     <!-- Label indicating that the admin granted one or more apps access to the microphone. [CHAR LIMIT=NONE] -->
     <!-- Label indicating that the admin granted one or more apps access to the camera. [CHAR LIMIT=NONE] -->
+    <string name="enterprise_privacy_camera_access">Caniatâd camea</string>
     <!-- Label indicating that the admin set one or more apps as defaults for common actions (e.g. open browser, send e-mail). [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_enterprise_set_default_apps">Apiau rhagosodedig</string>
     <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. [CHAR LIMIT=NONE] -->
+    <plurals name="enterprise_privacy_number_packages">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> apiau</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> ap</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> ap</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> ap</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> ap</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> ap</item>
+    </plurals>
     <!-- Label explaining that the current input method was set by the admin. [CHAR LIMIT=NONE] -->
     <!-- Summary indicating the input method set by the admin. [CHAR LIMIT=NONE] -->
     <!-- Label explaining that an always-on VPN was set by the admin for the entire device. [CHAR LIMIT=NONE] -->
@@ -5064,12 +6210,29 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Label explaining that the admin configured the device to wipe itself when the password is mistyped too many times. [CHAR LIMIT=NONE] -->
     <!-- Label explaining that the admin configured the work profile to wipe itself when the password is mistyped too many times. [CHAR LIMIT=NONE] -->
     <!-- Summary indicating the number of mistyped passwords after which the device or work profile wipes itself. [CHAR LIMIT=NONE] -->
+    <plurals name="enterprise_privacy_number_failed_password_wipe">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> ymdrechion</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> ymdrech</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> ymdrech</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> ymdrech</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> ymdrech</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> ymdrech</item>
+    </plurals>
     <!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
     <!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
     <!-- Message indicating that the device is enterprise-managed: Space that separates the main text and the "learn more" link that follows it. [CHAR LIMIT=NONE] -->
     <!-- Message indicating that the device is enterprise-managed: Link to learn more about what a Device Owner app can do [CHAR LIMIT=NONE] -->
+    <string name="do_disclosure_learn_more">Dysgu mwy</string>
     <!-- Strings for displaying which applications were set as default for specific actions. -->
     <!-- Title for the apps that have been set as default handlers of camera-related intents. [CHAR LIMIT=30] -->
+    <plurals name="default_camera_app_title">
+        <item quantity="zero">Apiau camera</item>
+        <item quantity="one">Ap camera</item>
+        <item quantity="two">Apiau camera</item>
+        <item quantity="few">Apiau camera</item>
+        <item quantity="many">Apiau camera</item>
+        <item quantity="other">Apiau camera</item>
+    </plurals>
     <!-- Title for the app that has been set as default handler of calendar-related intents. [CHAR LIMIT=30] -->
     <string name="default_calendar_app_title">Ap calendr</string>
     <!-- Title for the app that has been set as default handler of contacts-related intents. [CHAR LIMIT=30] -->
@@ -5078,17 +6241,31 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <!-- Title for the app that has been set as default handler of geo-related intents. [CHAR LIMIT=30] -->
     <string name="default_map_app_title">Ap map</string>
     <!-- Title for the apps that have been set as default handlers of call-related intents. [CHAR LIMIT=30] -->
+    <plurals name="default_phone_app_title">
+        <item quantity="zero">Apiau ffôn</item>
+        <item quantity="one">Ap ffôn</item>
+        <item quantity="two">Apiau ffôn</item>
+        <item quantity="few">Apiau ffôn</item>
+        <item quantity="many">Apiau ffôn</item>
+        <item quantity="other">Apiau ffôn</item>
+    </plurals>
     <!-- Template for concatenating two app names -->
+    <string name="app_names_concatenation_template_2"><xliff:g id="first_app_name">%1$s</xliff:g>, <xliff:g id="second_app_name">%2$s</xliff:g></string>
     <!-- Template for concatenating three app names -->
+    <string name="app_names_concatenation_template_3"><xliff:g id="first_app_name">%1$s</xliff:g>, <xliff:g id="second_app_name">%2$s</xliff:g>, <xliff:g id="third_app_name">%3$s</xliff:g></string>
     <!-- Preference label for the Photos & Videos storage section. [CHAR LIMIT=50] -->
     <!-- Preference label for the Music & Audio storage section. [CHAR LIMIT=50] -->
     <!-- Preference label for the Games storage section. [CHAR LIMIT=50] -->
     <!-- Preference label for the Other apps storage section. [CHAR LIMIT=50] -->
+    <string name="storage_other_apps">Apiau eraill</string>
     <!-- Preference label for the Files storage section. [CHAR LIMIT=50] -->
+    <string name="storage_files">Ffeiliau</string>
     <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+    <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></string>
     <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
     <string name="storage_volume_total">Wedi defnyddio o <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
     <!-- Follows the percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=7]-->
+    <string name="storage_percent_full">defnyddiwyd</string>
     <!-- Label for button allow user to remove the instant app from the device. -->
     <!-- Confirmation message displayed when the user taps Clear app, to ensure they want to remove
          the instant app from the device. -->
@@ -5097,11 +6274,20 @@ Defnyddio\'r gwirydd sillafu hwn?</string>
     <string name="audio_files_title">Ffeiliau sain</string>
     <!-- Title for the installed app info storage page. The total storage space taken up by this app. [CHAR LIMIT=40]-->
     <!-- UI webview setting: WebView uninstalled-for-user explanatory text [CHAR LIMIT=30] -->
+    <string name="webview_uninstalled_for_user">(wedi\'i ddadosod ar gyfer y defnyddiwr <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
     <!-- UI webview setting: WebView disabled-for-user explanatory text [CHAR LIMIT=30] -->
+    <string name="webview_disabled_for_user">(wedi\'i analluogi ar gyfer y defnyddiwr <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
     <!-- AutoFill strings -->
     <!-- Preference label for choosing auto-fill service. [CHAR LIMIT=60] -->
+    <string name="autofill_app">Gwasanaeth awtolenwi</string>
     <!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->
+    <string name="autofill_keywords">awto, llenwi, cwblhau, awtolenwi, awtogwblhau</string>
     <!-- Message of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->
+    <string name="autofill_confirmation_message"><![CDATA[        <b>Sicrha dy fod yn ymddiried yn yr ap hwn</b>
+        <br/>
+        <br/>
+       Mae  <xliff:g id="app_name" example="Google Autofill">%1$s</xliff:g> yn defnyddio beth sydd ar dy sgrin i benderfynu pa bethau gellir eu awtolenwi.
+        ]]></string>
     <!-- Name of setting for switching device theme [CHAR LIMIT=60] -->
     <!-- Name of default device theme [CHAR LIMIT=60] -->
     <!-- Temporary reboot string, will be removed -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 305f4e76c5920c724bef31fa5632bf3eaaa6e35d..aab68f6d994f948a4506e6dc25810718558f8dcc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -3568,7 +3568,7 @@
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Schnelle Gesten zum Steuern deines Tablets"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Schnelle Gesten zum Steuern deines Geräts"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Zur Kamera wechseln"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ein-/Aus-Taste zweimal drücken, um Kamera direkt zu starten. Funktioniert bei jedem Display."</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ein-/Aus-Taste zweimal drücken, um Kamera direkt zu starten. Funktioniert unabhängig davon, welche App gerade geöffnet ist."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamera schnell öffnen"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Ein-/Aus-Taste zweimal drücken, um die Kamera zu öffnen"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamera wechseln"</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index c14e5f279f9a6538d5110da2789d2bca05f277ee..16d271b0d7d8dbeb79e112da3da3f8295be67e75 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -118,7 +118,7 @@
     <string name="sim_enabler_need_disable_sim">O cartão SIM será desativado. Quer continuar?</string>
     <string name="sim_enabler_will_disable_sim_title">Atenção</string>
     <string name="sim_enabler_need_switch_data_service">Este cartão SIM será desativado e o cartão SIM <xliff:g id="slotid">%1$s</xliff:g> será usado para os serviços de dados. Tem a certeza que deseja continuar?</string>
-    <string name="sim_enabler_airplane_on">Não é possível executar a operação enquanto o modo de avião estiver ativado.</string>
+    <string name="sim_enabler_airplane_on">Não é possível executar a operação enquanto o modo de voo estiver ativado.</string>
     <string name="sim_enabler_in_call">Não é possível executar a operação enquanto estiver numa chamada.</string>
     <string name="sim_enabler_both_inactive">Não é possível desativar todos os cartões SIM</string>
     <string name="sim_enabler_enabling">A ativar\u2026</string>
diff --git a/res/values-sc-rIT/cm_strings.xml b/res/values-sc-rIT/cm_strings.xml
index 32c55fb5afe581b75e774be140d587ed8f4f8245..60b57e7790c78b2c9ca9924fb18db2f1aa5cdba3 100644
--- a/res/values-sc-rIT/cm_strings.xml
+++ b/res/values-sc-rIT/cm_strings.xml
@@ -23,6 +23,7 @@
     <!-- Hardware info -->
     <!-- Label for device's hardware platform value [CHAR LIMIT=40] -->
     <!-- Label for device's hardware ram size [CHAR LIMIT=40] -->
+    <string name="total_ram">RAM totale</string>
     <!-- Launch Dev Tools -->
     <!-- Advanced restart options -->
     <!-- Setting checkbox title for root access -->
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index fd297e35397bbd1bdff98f3f9a84285b3587d8e5..0000000000000000000000000000000000000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all makefiles in subdirectories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/anomaly-tester/Android.mk b/tests/anomaly-tester/Android.mk
deleted file mode 100644
index ade37db02849340ed06f316b9a32d82cef1f1b86..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-test \
-    mockito-target \
-    ub-uiautomator \
-    truth-prebuilt \
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_PACKAGE_NAME := AnomalyTester
-
-LOCAL_INSTRUMENTATION_FOR := Settings
-
-LOCAL_USE_AAPT2 := true
-
-include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/tests/anomaly-tester/AndroidManifest.xml b/tests/anomaly-tester/AndroidManifest.xml
deleted file mode 100644
index 7893b866bfa797c6f9f5d3f30468ef780b3431cc..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/AndroidManifest.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.settings.anomaly.tester">
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-
-    <application
-        android:allowBackup="false"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@android:style/Theme.Material.Light.DarkActionBar">
-        <uses-library android:name="android.test.runner" />
-        <activity
-            android:name=".AnomalyActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <service
-            android:name=".service.AnomalyService"
-            android:exported="false"/>
-    </application>
-
-    <instrumentation
-        android:name="android.support.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.settings"
-        android:label="Settings Test Cases">
-    </instrumentation>
-
-</manifest>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/layout/activity_main.xml b/tests/anomaly-tester/res/layout/activity_main.xml
deleted file mode 100644
index 0561cff9fc355bbb03910d7c7e258eeb28c6c5c5..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/layout/activity_main.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="4"
-        android:padding="4dp"
-        android:textSize="16sp">
-        <TextView
-            android:id="@+id/displayText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="100000"/>
-    </ScrollView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="#444444"/>
-
-    <ScrollView
-        android:layout_height="0dp"
-        android:layout_width="match_parent"
-        android:layout_weight="6"
-        android:padding="5dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:gravity="center">
-
-            <include layout="@layout/bluetooth_anomaly"/>
-
-            <include layout="@layout/wakelock_anomaly"/>
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/layout/bluetooth_anomaly.xml b/tests/anomaly-tester/res/layout/bluetooth_anomaly.xml
deleted file mode 100644
index 87e61b0d786eaa1a5abcf9813ff87e2cd1ac90c9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/layout/bluetooth_anomaly.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="6dp">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Bluetooth Anomaly"
-        android:textSize="16sp"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <EditText
-            android:id="@+id/bluetooth_threshold"
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="wrap_content"
-            android:hint="Threshold(ms)"
-            android:text="3000"
-            android:inputType="number"/>
-
-        <EditText
-            android:id="@+id/bluetooth_run_time"
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="wrap_content"
-            android:hint="Run time(ms)"
-            android:text="6000"
-            android:inputType="number"/>
-
-        <Button
-            android:id="@+id/bluetooth_button"
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="wrap_content"
-            android:text="START"
-            android:onClick="startBluetoothAnomaly"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/layout/wakelock_anomaly.xml b/tests/anomaly-tester/res/layout/wakelock_anomaly.xml
deleted file mode 100644
index 08cb7958419f86ccece61531b8b22f980ff5aaf6..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/layout/wakelock_anomaly.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="6dp">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Wakelock Anomaly"
-        android:textSize="16sp"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <EditText
-            android:id="@+id/wakelock_threshold"
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="wrap_content"
-            android:hint="Threshold(ms)"
-            android:text="3000"
-            android:inputType="number"/>
-
-        <EditText
-            android:id="@+id/wakelock_run_time"
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="wrap_content"
-            android:hint="Run time(ms)"
-            android:text="6000"
-            android:inputType="number"/>
-
-        <Button
-            android:id="@+id/wakelock_button"
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="wrap_content"
-            android:text="START"
-            android:onClick="startWakelockAnomaly"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/values-af/strings.xml b/tests/anomaly-tester/res/values-af/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-af/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-am/strings.xml b/tests/anomaly-tester/res/values-am/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-am/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ar/strings.xml b/tests/anomaly-tester/res/values-ar/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ar/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-az/strings.xml b/tests/anomaly-tester/res/values-az/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-az/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-b+sr+Latn/strings.xml b/tests/anomaly-tester/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-be/strings.xml b/tests/anomaly-tester/res/values-be/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-be/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-bg/strings.xml b/tests/anomaly-tester/res/values-bg/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-bg/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-bn/strings.xml b/tests/anomaly-tester/res/values-bn/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-bn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-bs/strings.xml b/tests/anomaly-tester/res/values-bs/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-bs/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ca/strings.xml b/tests/anomaly-tester/res/values-ca/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ca/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-cs/strings.xml b/tests/anomaly-tester/res/values-cs/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-cs/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-da/strings.xml b/tests/anomaly-tester/res/values-da/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-da/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-de/strings.xml b/tests/anomaly-tester/res/values-de/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-de/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-el/strings.xml b/tests/anomaly-tester/res/values-el/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-el/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-en-rAU/strings.xml b/tests/anomaly-tester/res/values-en-rAU/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-en-rCA/strings.xml b/tests/anomaly-tester/res/values-en-rCA/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-en-rCA/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-en-rGB/strings.xml b/tests/anomaly-tester/res/values-en-rGB/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-en-rIN/strings.xml b/tests/anomaly-tester/res/values-en-rIN/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-en-rXC/strings.xml b/tests/anomaly-tester/res/values-en-rXC/strings.xml
deleted file mode 100644
index 8fce2b841b02b0417e713edbe99b8cb5c63e935b..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-en-rXC/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎AnomalyTester‎‏‎‎‏‎"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-es-rUS/strings.xml b/tests/anomaly-tester/res/values-es-rUS/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-es/strings.xml b/tests/anomaly-tester/res/values-es/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-es/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-et/strings.xml b/tests/anomaly-tester/res/values-et/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-et/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-eu/strings.xml b/tests/anomaly-tester/res/values-eu/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-eu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-fa/strings.xml b/tests/anomaly-tester/res/values-fa/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-fa/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-fi/strings.xml b/tests/anomaly-tester/res/values-fi/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-fi/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-fr-rCA/strings.xml b/tests/anomaly-tester/res/values-fr-rCA/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-fr/strings.xml b/tests/anomaly-tester/res/values-fr/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-fr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-gl/strings.xml b/tests/anomaly-tester/res/values-gl/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-gl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-gu/strings.xml b/tests/anomaly-tester/res/values-gu/strings.xml
deleted file mode 100644
index 8c09d6cbea04b85991e420a587abc725dfc45a76..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-gu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"અસંગતિ પરીક્ષક"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-hi/strings.xml b/tests/anomaly-tester/res/values-hi/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-hi/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-hr/strings.xml b/tests/anomaly-tester/res/values-hr/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-hr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-hu/strings.xml b/tests/anomaly-tester/res/values-hu/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-hu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-hy/strings.xml b/tests/anomaly-tester/res/values-hy/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-hy/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-in/strings.xml b/tests/anomaly-tester/res/values-in/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-in/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-is/strings.xml b/tests/anomaly-tester/res/values-is/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-is/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-it/strings.xml b/tests/anomaly-tester/res/values-it/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-it/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-iw/strings.xml b/tests/anomaly-tester/res/values-iw/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-iw/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ja/strings.xml b/tests/anomaly-tester/res/values-ja/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ja/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ka/strings.xml b/tests/anomaly-tester/res/values-ka/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ka/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-kk/strings.xml b/tests/anomaly-tester/res/values-kk/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-kk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-km/strings.xml b/tests/anomaly-tester/res/values-km/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-km/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-kn/strings.xml b/tests/anomaly-tester/res/values-kn/strings.xml
deleted file mode 100644
index dace89cfd41c5ac87505b18c90e00869cdd74785..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-kn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"ಅನೋಮಲಿಟೆಸ್ಟರ್"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ko/strings.xml b/tests/anomaly-tester/res/values-ko/strings.xml
deleted file mode 100644
index d8b6c6aa169de97d80e627ec53eed074ff93bf04..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ko/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"비정상 상황 테스터"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ky/strings.xml b/tests/anomaly-tester/res/values-ky/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ky/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-lo/strings.xml b/tests/anomaly-tester/res/values-lo/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-lo/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-lt/strings.xml b/tests/anomaly-tester/res/values-lt/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-lt/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-lv/strings.xml b/tests/anomaly-tester/res/values-lv/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-lv/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-mk/strings.xml b/tests/anomaly-tester/res/values-mk/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-mk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ml/strings.xml b/tests/anomaly-tester/res/values-ml/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ml/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-mn/strings.xml b/tests/anomaly-tester/res/values-mn/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-mn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-mr/strings.xml b/tests/anomaly-tester/res/values-mr/strings.xml
deleted file mode 100644
index 3472e9934d1c9da5e1817ed11659c6fa8ec5b77d..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-mr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"विसंगती परीक्षक"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ms/strings.xml b/tests/anomaly-tester/res/values-ms/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ms/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-my/strings.xml b/tests/anomaly-tester/res/values-my/strings.xml
deleted file mode 100644
index 3535a3f3f07beefd86f1e80c84a6d95d07b85c1e..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-my/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"Anomaly စမ်းသပ်ကိရိယာ"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-nb/strings.xml b/tests/anomaly-tester/res/values-nb/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-nb/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ne/strings.xml b/tests/anomaly-tester/res/values-ne/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ne/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-nl/strings.xml b/tests/anomaly-tester/res/values-nl/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-nl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-pa/strings.xml b/tests/anomaly-tester/res/values-pa/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-pa/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-pl/strings.xml b/tests/anomaly-tester/res/values-pl/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-pl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-pt-rBR/strings.xml b/tests/anomaly-tester/res/values-pt-rBR/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-pt-rPT/strings.xml b/tests/anomaly-tester/res/values-pt-rPT/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-pt/strings.xml b/tests/anomaly-tester/res/values-pt/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-pt/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ro/strings.xml b/tests/anomaly-tester/res/values-ro/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ro/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ru/strings.xml b/tests/anomaly-tester/res/values-ru/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ru/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-si/strings.xml b/tests/anomaly-tester/res/values-si/strings.xml
deleted file mode 100644
index de39b09515d300f70251ef554669e855fa771717..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-si/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"විෂමතා පරීක්ෂක"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-sk/strings.xml b/tests/anomaly-tester/res/values-sk/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-sk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-sl/strings.xml b/tests/anomaly-tester/res/values-sl/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-sl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-sq/strings.xml b/tests/anomaly-tester/res/values-sq/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-sq/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-sr/strings.xml b/tests/anomaly-tester/res/values-sr/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-sr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-sv/strings.xml b/tests/anomaly-tester/res/values-sv/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-sv/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-sw/strings.xml b/tests/anomaly-tester/res/values-sw/strings.xml
deleted file mode 100644
index e8d6de8e628bead0349bb03a31265ba8f85a27bf..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-sw/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"Kipengele cha Kubaini Hitilafu"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ta/strings.xml b/tests/anomaly-tester/res/values-ta/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ta/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-te/strings.xml b/tests/anomaly-tester/res/values-te/strings.xml
deleted file mode 100644
index f1758403fc18ff3a166dd89ffb421f960ee230a0..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-te/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"అనామలీ టెస్టర్"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-th/strings.xml b/tests/anomaly-tester/res/values-th/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-th/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-tl/strings.xml b/tests/anomaly-tester/res/values-tl/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-tl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-tr/strings.xml b/tests/anomaly-tester/res/values-tr/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-tr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-uk/strings.xml b/tests/anomaly-tester/res/values-uk/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-uk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-ur/strings.xml b/tests/anomaly-tester/res/values-ur/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-ur/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-uz/strings.xml b/tests/anomaly-tester/res/values-uz/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-uz/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-vi/strings.xml b/tests/anomaly-tester/res/values-vi/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-vi/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rCN/strings.xml b/tests/anomaly-tester/res/values-zh-rCN/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rHK/strings.xml b/tests/anomaly-tester/res/values-zh-rHK/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rTW/strings.xml b/tests/anomaly-tester/res/values-zh-rTW/strings.xml
deleted file mode 100644
index cdc7ee558a9f75fffd91f35d9d8aa742d9331ea9..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values-zu/strings.xml b/tests/anomaly-tester/res/values-zu/strings.xml
deleted file mode 100644
index e28ad504d8eece809f7688059b6ebcaddf231cae..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values-zu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="4895205370884535654">"I-AnomalyTester"</string>
-</resources>
diff --git a/tests/anomaly-tester/res/values/strings.xml b/tests/anomaly-tester/res/values/strings.xml
deleted file mode 100644
index 99de34e62dd1e8d97777135177170f348d3f918a..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/res/values/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
-    <string name="app_name">AnomalyTester</string>
-</resources>
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java
deleted file mode 100644
index e4567c2fbc31e717e24412347e59be329e159748..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.anomaly.tester;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.ResultReceiver;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import com.android.settings.anomaly.tester.service.AnomalyService;
-import com.android.settings.anomaly.tester.utils.AnomalyActions;
-import com.android.settings.anomaly.tester.utils.AnomalyPolicyBuilder;
-
-/**
- * Main activity to control and start anomaly
- */
-public class AnomalyActivity extends Activity {
-    private static final String TAG = AnomalyActivity.class.getSimpleName();
-
-    public static final String KEY_TARGET_BUTTON = "target_button";
-
-    private AnomalyResultReceiver mResultReceiver;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        mResultReceiver = new AnomalyResultReceiver(new Handler());
-    }
-
-    public void startBluetoothAnomaly(View view) {
-        try {
-            // Enable anomaly detection and change the threshold
-            final String config = new AnomalyPolicyBuilder()
-                    .addPolicy(AnomalyPolicyBuilder.KEY_ANOMALY_DETECTION_ENABLED, true)
-                    .addPolicy(AnomalyPolicyBuilder.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true)
-                    .addPolicy(AnomalyPolicyBuilder.KEY_BLUETOOTH_SCAN_THRESHOLD,
-                            getValueFromEditText(R.id.bluetooth_threshold))
-                    .build();
-            Settings.Global.putString(getContentResolver(),
-                    Settings.Global.ANOMALY_DETECTION_CONSTANTS, config);
-
-            // Start the anomaly service
-            Intent intent = new Intent(this, AnomalyService.class);
-            intent.putExtra(AnomalyActions.KEY_ACTION, AnomalyActions.ACTION_BLE_SCAN_UNOPTIMIZED);
-            intent.putExtra(AnomalyActions.KEY_DURATION_MS,
-                    getValueFromEditText(R.id.bluetooth_run_time));
-            intent.putExtra(AnomalyActions.KEY_RESULT_RECEIVER, mResultReceiver);
-            intent.putExtra(KEY_TARGET_BUTTON, view.getId());
-            startService(intent);
-
-            view.setEnabled(false);
-        } catch (NumberFormatException e) {
-            Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    public void startWakelockAnomaly(View view) {
-        try {
-            // Enable anomaly detection and change the threshold
-            final String config = new AnomalyPolicyBuilder()
-                    .addPolicy(AnomalyPolicyBuilder.KEY_ANOMALY_DETECTION_ENABLED, true)
-                    .addPolicy(AnomalyPolicyBuilder.KEY_WAKELOCK_DETECTION_ENABLED, true)
-                    .addPolicy(AnomalyPolicyBuilder.KEY_WAKELOCK_THRESHOLD,
-                            getValueFromEditText(R.id.wakelock_threshold))
-                    .build();
-            Settings.Global.putString(getContentResolver(),
-                    Settings.Global.ANOMALY_DETECTION_CONSTANTS,
-                    config);
-
-            // Start the anomaly service
-            Intent intent = new Intent(this, AnomalyService.class);
-            intent.putExtra(AnomalyActions.KEY_ACTION, AnomalyActions.ACTION_WAKE_LOCK);
-            intent.putExtra(AnomalyActions.KEY_DURATION_MS,
-                    getValueFromEditText(R.id.wakelock_run_time));
-            intent.putExtra(AnomalyActions.KEY_RESULT_RECEIVER, mResultReceiver);
-            intent.putExtra(KEY_TARGET_BUTTON, view.getId());
-            startService(intent);
-
-            view.setEnabled(false);
-        } catch (NumberFormatException e) {
-            Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private long getValueFromEditText(final int id) throws NumberFormatException {
-        final EditText editText = findViewById(id);
-        if (editText != null) {
-            final long value = Long.parseLong(editText.getText().toString());
-            if (value > 0) {
-                return value;
-            }
-        }
-
-        throw new NumberFormatException("Number should be positive");
-    }
-
-    private class AnomalyResultReceiver extends ResultReceiver {
-
-        public AnomalyResultReceiver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        protected void onReceiveResult(int resultCode, Bundle resultData) {
-            super.onReceiveResult(resultCode, resultData);
-
-            final Button button = findViewById(resultData.getInt(KEY_TARGET_BUTTON));
-            if (button != null) {
-                button.setEnabled(true);
-            }
-
-        }
-    }
-}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/service/AnomalyService.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/service/AnomalyService.java
deleted file mode 100644
index b569bcecb373374a87beb1f371b2725c591ce545..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/service/AnomalyService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.anomaly.tester.service;
-
-import android.annotation.Nullable;
-import android.app.IntentService;
-import android.content.Intent;
-import android.os.ResultReceiver;
-
-import com.android.settings.anomaly.tester.utils.AnomalyActions;
-
-/**
- * Service to run the anomaly action
- */
-public class AnomalyService extends IntentService {
-    private static final String TAG = AnomalyService.class.getSimpleName();
-
-    public AnomalyService() {
-        super(AnomalyService.class.getSimpleName());
-    }
-
-    @Override
-    protected void onHandleIntent(@Nullable Intent intent) {
-        final String action = intent.getStringExtra(AnomalyActions.KEY_ACTION);
-        final long durationMs = intent.getLongExtra(AnomalyActions.KEY_DURATION_MS, 0);
-        final ResultReceiver resultReceiver = intent.getParcelableExtra(
-                AnomalyActions.KEY_RESULT_RECEIVER);
-
-        AnomalyActions.doAction(this, action, durationMs);
-
-        if (resultReceiver != null) {
-            resultReceiver.send(0 /* resultCode */, intent.getExtras());
-        }
-    }
-}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyActions.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyActions.java
deleted file mode 100644
index 58e5a99fb5227113179b6e2dce9bef7a96cda9c4..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyActions.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.anomaly.tester.utils;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.le.BluetoothLeScanner;
-import android.bluetooth.le.ScanCallback;
-import android.bluetooth.le.ScanResult;
-import android.bluetooth.le.ScanSettings;
-import android.content.Context;
-import android.os.PowerManager;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * Actions to generate anomaly.
- */
-public class AnomalyActions {
-    private static final String TAG = AnomalyActions.class.getSimpleName();
-
-    public static final String KEY_ACTION = "action";
-    public static final String KEY_DURATION_MS = "duration_ms";
-    public static final String KEY_RESULT_RECEIVER = "result_receiver";
-
-    public static final String ACTION_BLE_SCAN_UNOPTIMIZED = "action.ble_scan_unoptimized";
-    public static final String ACTION_WAKE_LOCK = "action.wake_lock";
-
-    public static void doAction(Context ctx, String actionCode, long durationMs) {
-        if (actionCode == null) {
-            Log.e(TAG, "Intent was missing action.");
-            return;
-        }
-        switch (actionCode) {
-            case ACTION_BLE_SCAN_UNOPTIMIZED:
-                doUnoptimizedBleScan(ctx, durationMs);
-                break;
-            case ACTION_WAKE_LOCK:
-                doHoldWakelock(ctx, durationMs);
-            default:
-                Log.e(TAG, "Intent had invalid action");
-        }
-    }
-
-    private static void doUnoptimizedBleScan(Context ctx, long durationMs) {
-        ScanSettings scanSettings = new ScanSettings.Builder()
-                .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build();
-
-        // perform ble scanning
-        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-        if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled() ) {
-            Log.e(TAG, "Device does not support Bluetooth or Bluetooth not enabled");
-            return;
-        }
-        BluetoothLeScanner bleScanner = bluetoothAdapter.getBluetoothLeScanner();
-        if (bleScanner == null) {
-            Log.e(TAG, "Cannot access BLE scanner");
-            return;
-        }
-
-        ScanCallback scanCallback = new ScanCallback() {
-            @Override
-            public void onScanResult(int callbackType, ScanResult result) {
-                Log.v(TAG, "called onScanResult");
-            }
-
-            @Override
-            public void onScanFailed(int errorCode) {
-                Log.v(TAG, "called onScanFailed");
-            }
-
-            @Override
-            public void onBatchScanResults(List<ScanResult> results) {
-                Log.v(TAG, "called onBatchScanResults");
-            }
-        };
-
-        bleScanner.startScan(null, scanSettings, scanCallback);
-        try {
-            Thread.sleep(durationMs);
-        } catch (InterruptedException e) {
-            Log.e(TAG, "Thread couldn't sleep for " + durationMs, e);
-        }
-        bleScanner.stopScan(scanCallback);
-    }
-
-    private static void doHoldWakelock(Context ctx, long durationMs) {
-        PowerManager powerManager = ctx.getSystemService(PowerManager.class);
-        PowerManager.WakeLock wl = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-                "AnomalyWakeLock");
-        wl.acquire();
-        try {
-            Thread.sleep(durationMs);
-        } catch (InterruptedException e) {
-            Log.e(TAG, "Thread couldn't sleep for " + durationMs, e);
-        }
-        wl.release();
-    }
-}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyPolicyBuilder.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyPolicyBuilder.java
deleted file mode 100644
index bf8e075d4f84359d07ff8946dd932129cfc80df7..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyPolicyBuilder.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.anomaly.tester.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Builder to build the anomaly policy string, used in {@link android.provider.Settings.Global}
- *
- * @see android.provider.Settings.Global#ANOMALY_DETECTION_CONSTANTS
- */
-public class AnomalyPolicyBuilder {
-    public static final String KEY_ANOMALY_DETECTION_ENABLED = "anomaly_detection_enabled";
-    public static final String KEY_WAKELOCK_DETECTION_ENABLED = "wakelock_enabled";
-    public static final String KEY_WAKEUP_ALARM_DETECTION_ENABLED = "wakeup_alarm_enabled";
-    public static final String KEY_BLUETOOTH_SCAN_DETECTION_ENABLED = "bluetooth_scan_enabled";
-    public static final String KEY_WAKELOCK_THRESHOLD = "wakelock_threshold";
-    public static final String KEY_WAKEUP_ALARM_THRESHOLD = "wakeup_alarm_threshold";
-    public static final String KEY_BLUETOOTH_SCAN_THRESHOLD = "bluetooth_scan_threshold";
-
-    public static final String DELIM = ",";
-
-    private Map<String, String> mValues;
-
-    public AnomalyPolicyBuilder() {
-        mValues = new HashMap<>();
-    }
-
-    public AnomalyPolicyBuilder addPolicy(String key, String value) {
-        mValues.put(key, value);
-        return this;
-    }
-
-    public AnomalyPolicyBuilder addPolicy(String key, long value) {
-        mValues.put(key, Long.toString(value));
-        return this;
-    }
-
-
-    public AnomalyPolicyBuilder addPolicy(String key, boolean value) {
-        mValues.put(key, value ? "true" : "false");
-        return this;
-    }
-
-    public String build() {
-        StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, String> entry : mValues.entrySet()) {
-            sb.append(entry.getKey() + "=" + entry.getValue() + DELIM);
-        }
-
-        if (sb.length() != 0) {
-            return sb.substring(0, sb.length() - 1);
-        } else {
-            return "";
-        }
-    }
-}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java
deleted file mode 100644
index 3630ce420dd38dbfff0f724dc67763a39f647643..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.anomaly.tests;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
-import android.text.format.DateUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Functional test for bluetooth unoptimized scanning anomaly detector
- *
- * @see com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector
- */
-@RunWith(AndroidJUnit4.class)
-public class BluetoothAnomalyTest {
-    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
-    private static final String RES_BT_EDITTEXT =
-            "com.android.settings.anomaly.tester:id/bluetooth_run_time";
-    private static final String RES_BT_BUTTON =
-            "com.android.settings.anomaly.tester:id/bluetooth_button";
-    private static final long TIME_OUT = 3000;
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        final Context context = instrumentation.getContext();
-        mDevice = UiDevice.getInstance(instrumentation);
-
-        // setup environment
-        TestUtils.setUp(instrumentation);
-        // start anomaly-tester app
-        TestUtils.startAnomalyApp(context, mDevice);
-    }
-
-    @After
-    public void tearDown() {
-        TestUtils.tearDown(InstrumentationRegistry.getInstrumentation());
-    }
-
-    @Test
-    public void testBluetoothAnomaly_longScanningTime_reportAnomaly() throws InterruptedException {
-        // Set running time
-        final long durationMs = DateUtils.SECOND_IN_MILLIS * 15;
-        TestUtils.setEditTextWithValue(mDevice, RES_BT_EDITTEXT, durationMs);
-
-        // Click start button
-        TestUtils.clickButton(mDevice, RES_BT_BUTTON);
-
-        // Wait for its running
-        mDevice.pressHome();
-        TestUtils.wait(mDevice, durationMs);
-
-        // Check it in battery main page
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
-        assertWithMessage("Doesn't have bluetooth anomaly").that(
-                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
-                        TIME_OUT)).isNotNull();
-    }
-
-    @Test
-    public void testBluetoothAnomaly_shortScanningTime_notReport() throws InterruptedException {
-        // Set running time
-        final long durationMs = DateUtils.SECOND_IN_MILLIS;
-        TestUtils.setEditTextWithValue(mDevice, RES_BT_EDITTEXT, durationMs);
-
-        // Click start button
-        TestUtils.clickButton(mDevice, RES_BT_BUTTON);
-
-        // Wait for its running
-        mDevice.pressHome();
-        TestUtils.wait(mDevice, durationMs);
-
-        // Check it in battery main page
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
-        assertWithMessage("Shouldn't have bluetooth anomaly").that(
-                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
-                        TIME_OUT)).isNull();
-    }
-
-}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/TestUtils.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/TestUtils.java
deleted file mode 100644
index ac15d77bb18736cc3169c81babd234b885e30f16..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/TestUtils.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.anomaly.tests;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import android.app.Instrumentation;
-import android.app.UiAutomation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-
-public class TestUtils {
-    private static final String PACKAGE_NAME = "com.android.settings.anomaly.tester";
-    private static final long TIME_OUT = 3000;
-
-    /**
-     * This method set up the environment for anomaly test
-     *
-     * @param instrumentation to execute command
-     */
-    public static void setUp(Instrumentation instrumentation) {
-        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
-        // pretend unplug and screen off, also reset the battery stats
-        uiAutomation.executeShellCommand("dumpsys battery unplug");
-        uiAutomation.executeShellCommand("dumpsys batterystats enable pretend-screen-off");
-        uiAutomation.executeShellCommand("dumpsys batterystats --reset");
-    }
-
-    /**
-     * This method cleans up all the commands in {@link #setUp(Instrumentation)}
-     *
-     * @param instrumentation to execute command
-     */
-    public static void tearDown(Instrumentation instrumentation) {
-        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
-        // reset unplug and screen-off
-        uiAutomation.executeShellCommand("dumpsys battery reset");
-        uiAutomation.executeShellCommand("dumpsys batterystats disable pretend-screen-off");
-    }
-
-    public static void startAnomalyApp(Context context, UiDevice uiDevice) {
-        final Intent intent = context.getPackageManager().getLaunchIntentForPackage(PACKAGE_NAME);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        context.startActivity(intent);
-        uiDevice.wait(Until.hasObject(By.pkg(PACKAGE_NAME).depth(0)), TIME_OUT);
-    }
-
-    /**
-     * Find {@link android.widget.EditText} with {@code res} and set its {@code value}
-     */
-    public static void setEditTextWithValue(UiDevice uiDevice, String res, long value) {
-        final UiObject2 editText = uiDevice.findObject(By.res(res));
-        assertWithMessage("Cannot find editText with res: " + res).that(editText).isNotNull();
-        editText.setText(String.valueOf(value));
-    }
-
-    /**
-     * Find {@link android.widget.Button} with {@code res} and click it
-     */
-    public static void clickButton(UiDevice uiDevice, String res) {
-        final UiObject2 button = uiDevice.findObject(By.res(res));
-        assertWithMessage("Cannot find button with res: " + res).that(button).isNotNull();
-        button.click();
-    }
-
-    /**
-     * Make {@link UiDevice} wait for {@code timeMs}
-     *
-     * @see Thread#sleep(long)
-     */
-    public static void wait(UiDevice uiDevice, long timeMs) throws InterruptedException {
-        uiDevice.waitForIdle();
-        Thread.sleep(timeMs);
-    }
-}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java
deleted file mode 100644
index a2f380489777064742272e750426ea1961b69947..0000000000000000000000000000000000000000
--- a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.anomaly.tests;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
-import android.text.format.DateUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Functional test for bluetooth unoptimized scanning anomaly detector
- *
- * @see com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector
- */
-@RunWith(AndroidJUnit4.class)
-public class WakelockAnomalyTest {
-    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
-    private static final String RES_WAKELOCK_EDITTEXT =
-            "com.android.settings.anomaly.tester:id/wakelock_run_time";
-    private static final String RES_WAKELOCK_BUTTON =
-            "com.android.settings.anomaly.tester:id/wakelock_button";
-    private static final long TIME_OUT = 3000;
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        final Context context = instrumentation.getContext();
-        mDevice = UiDevice.getInstance(instrumentation);
-
-        // setup environment
-        TestUtils.setUp(instrumentation);
-        // start anomaly-tester app
-        TestUtils.startAnomalyApp(context, mDevice);
-    }
-
-    @After
-    public void tearDown() {
-        TestUtils.tearDown(InstrumentationRegistry.getInstrumentation());
-    }
-
-    @Test
-    public void testWakelockAnomaly_longTimeWhileRunning_report() throws InterruptedException {
-        // Set running time
-        final long durationMs = DateUtils.SECOND_IN_MILLIS * 15;
-        TestUtils.setEditTextWithValue(mDevice, RES_WAKELOCK_EDITTEXT, durationMs);
-
-        // Click start button
-        TestUtils.clickButton(mDevice, RES_WAKELOCK_BUTTON);
-
-        // Wait for its running
-        mDevice.pressHome();
-        // Sleeping time less than running time, so the app still holding wakelock when we check
-        TestUtils.wait(mDevice, durationMs - TIME_OUT);
-
-        // Check it in battery main page
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
-        assertWithMessage("Doesn't have wakelock anomaly").that(
-                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
-                        TIME_OUT)).isNotNull();
-    }
-
-    @Test
-    public void testWakelockAnomaly_shortTime_notReport() throws InterruptedException {
-        // Set running time
-        final long durationMs = DateUtils.SECOND_IN_MILLIS;
-        TestUtils.setEditTextWithValue(mDevice, RES_WAKELOCK_EDITTEXT, durationMs);
-
-        // Click start button
-        TestUtils.clickButton(mDevice, RES_WAKELOCK_BUTTON);
-
-        // Wait for its running
-        mDevice.pressHome();
-        TestUtils.wait(mDevice, durationMs);
-
-        // Check it in battery main page
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
-        assertWithMessage("Shouldn't have wakelock anomaly").that(
-                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
-                        TIME_OUT)).isNull();
-    }
-
-    @Test
-    public void testWakelockAnomaly_longTimeWhileNotRunning_notReport()
-            throws InterruptedException {
-        // Set running time
-        final long durationMs = DateUtils.SECOND_IN_MILLIS * 10;
-        TestUtils.setEditTextWithValue(mDevice, RES_WAKELOCK_EDITTEXT, durationMs);
-
-        // Click start button
-        TestUtils.clickButton(mDevice, RES_WAKELOCK_BUTTON);
-
-        // Wait for its running
-        mDevice.pressHome();
-        // Wait more time for releasing the wakelock
-        TestUtils.wait(mDevice, durationMs + TIME_OUT);
-
-        // Check it in battery main page
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
-        assertWithMessage("Shouldn't have wakelock anomaly").that(
-                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
-                        TIME_OUT)).isNull();
-    }
-
-}
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
deleted file mode 100644
index c0c0ccfc852c6346caaa1c9c2907c82b5122b2a4..0000000000000000000000000000000000000000
--- a/tests/app/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-test \
-    mockito-target \
-    espresso-core \
-    espresso-contrib-nodep \
-    espresso-intents-nodep \
-    ub-uiautomator \
-    truth-prebuilt \
-    legacy-android-test
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SettingsTests
-
-LOCAL_INSTRUMENTATION_FOR := Settings
-
-include $(BUILD_PACKAGE)
diff --git a/tests/app/AndroidManifest.xml b/tests/app/AndroidManifest.xml
deleted file mode 100644
index 6659e5ff18482d99d7f18654b2376a731ba7790c..0000000000000000000000000000000000000000
--- a/tests/app/AndroidManifest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.tests">
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="BluetoothRequestPermissionTest"
-            android:label="Bluetooth Perm Test" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="Operator" android:label="Operator Hook Test" >
-            <intent-filter>
-                <action android:name="com.android.settings.OPERATOR_APPLICATION_SETTING" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.title" android:resource="@string/operator_settings_title" />
-            <meta-data android:name="com.android.settings.summary" android:resource="@string/operator_settings_summary" />
-            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
-        </activity>
-        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test" >
-            <intent-filter>
-                <action android:name="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.title" android:resource="@string/manufacturer_settings_title" />
-            <meta-data android:name="com.android.settings.summary" android:resource="@string/manufacturer_settings_summary" />
-            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
-        </activity>
-    </application>
-
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.settings"
-        android:label="Settings Test Cases">
-    </instrumentation>
-
-    <instrumentation android:name="SettingsLaunchPerformance"
-        android:targetPackage="com.android.settings"
-        android:label="Settings Launch Performance">
-    </instrumentation>
-
-</manifest>
diff --git a/tests/app/res/drawable-hdpi/ic_settings_applications.png b/tests/app/res/drawable-hdpi/ic_settings_applications.png
deleted file mode 100755
index 5cea33f487a41ed762dfdb099a479faee02943b8..0000000000000000000000000000000000000000
Binary files a/tests/app/res/drawable-hdpi/ic_settings_applications.png and /dev/null differ
diff --git a/tests/app/res/drawable-mdpi/ic_settings_applications.png b/tests/app/res/drawable-mdpi/ic_settings_applications.png
deleted file mode 100755
index 745ff2a159880c08df7ed2f02ed8260ae02b066b..0000000000000000000000000000000000000000
Binary files a/tests/app/res/drawable-mdpi/ic_settings_applications.png and /dev/null differ
diff --git a/tests/app/res/drawable-xhdpi/ic_settings_applications.png b/tests/app/res/drawable-xhdpi/ic_settings_applications.png
deleted file mode 100644
index 8eda83fc81d6934551a25a9380f2c505a7a1a45b..0000000000000000000000000000000000000000
Binary files a/tests/app/res/drawable-xhdpi/ic_settings_applications.png and /dev/null differ
diff --git a/tests/app/res/layout/bluetooth_request_permission_test.xml b/tests/app/res/layout/bluetooth_request_permission_test.xml
deleted file mode 100644
index b62db197ce60587dbbc547bae6555409fe34ad9b..0000000000000000000000000000000000000000
--- a/tests/app/res/layout/bluetooth_request_permission_test.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView android:id="@+id/msg_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:transcriptMode="normal"/>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@android:style/ButtonBar">
-
-        <Button android:id="@+id/enable"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/enable" />
-
-        <Button android:id="@+id/discoverable"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/discoverable" />
-
-        <Button android:id="@+id/scan"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/start_scan" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/tests/app/res/layout/manufacturer_main.xml b/tests/app/res/layout/manufacturer_main.xml
deleted file mode 100644
index 8f8c48f1f26f62829d06ea81530db4217ba15600..0000000000000000000000000000000000000000
--- a/tests/app/res/layout/manufacturer_main.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical" android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  <TextView android:layout_width="fill_parent"
-    android:layout_height="wrap_content" android:text="@string/manufacturer_hello" />
-</LinearLayout>
diff --git a/tests/app/res/layout/operator_main.xml b/tests/app/res/layout/operator_main.xml
deleted file mode 100644
index 3cf8e00aab2ef11f85d8265e49758ac78fd36d7c..0000000000000000000000000000000000000000
--- a/tests/app/res/layout/operator_main.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical" android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  <TextView android:layout_width="fill_parent"
-    android:layout_height="wrap_content" android:text="@string/operator_hello" />
-</LinearLayout>
diff --git a/tests/app/res/values-af/strings.xml b/tests/app/res/values-af/strings.xml
deleted file mode 100644
index 5a9ae32ae58e73eab7f1b80b35a1c3703910ca4f..0000000000000000000000000000000000000000
--- a/tests/app/res/values-af/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Opspoorbaar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Begin skandering"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop skandering"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hallo, operateur!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operateur"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operateurhoek wat gebruik kan word om voorkeuraktiwiteit te begin"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hallo, vervaardiger!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Vervaardiger"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Vervaardigerhoek wat gebruik kan word om voorkeuraktiwiteit te begin"</string>
-</resources>
diff --git a/tests/app/res/values-am/strings.xml b/tests/app/res/values-am/strings.xml
deleted file mode 100644
index f77c8528a087e15ed3c53fd026bb11380083c20e..0000000000000000000000000000000000000000
--- a/tests/app/res/values-am/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"ሊገኝ የሚችል"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ቅኝት ጀምር"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ቅኝት አቁም"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ታዲያስ ከዋኝ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ከዋኝ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"የምርጫን እንቅስቃሴ ለማስጀመር ጥቅም ላይ መዋል የሚችል የከዋኝ መንጠቆ።"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ታዲያስ አምራች!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"አምራች"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"የምርጫን እንቅስቃሴ ለማስጀመር ጥቅም ላይ መዋል የሚችል የአምራች መንጠቆ።"</string>
-</resources>
diff --git a/tests/app/res/values-ar/strings.xml b/tests/app/res/values-ar/strings.xml
deleted file mode 100644
index 6ca54bef0120befd62fff1d0b6082cc09a4690f2..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ar/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"قابل للاكتشاف"</string>
-    <string name="start_scan" msgid="3834980997400324437">"بدء الفحص"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"إيقاف الفحص"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"مرحبًا بمشغِّل شبكة الجوّال!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"مشغِّل شبكة الجوال"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"أداة مشغِّل شبكة الجوّال التي يمكن استخدامها لبدء النشاط المختار"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"مرحبًا بجهة التصنيع!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"جهة التصنيع"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"أداة جهة التصنيع التي يمكن استخدامها لبدء النشاط المختار"</string>
-</resources>
diff --git a/tests/app/res/values-az/strings.xml b/tests/app/res/values-az/strings.xml
deleted file mode 100644
index d24e093e49e38c5ea2e3defb3efcebaa117263b8..0000000000000000000000000000000000000000
--- a/tests/app/res/values-az/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Aşkarlana bilən"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Skana başlay"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Skan prosesini dayandırın"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Salam, Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Seçim fəaliyyətinə başlamaq üçün istifadə edilə bilən Operator qarmağı"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"İstehsalçıya Salamlar!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"İstehsalçı"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"İstehsalçı dəhrəsi seçim aktivliyinə başlamaq üçün işlənə bilər"</string>
-</resources>
diff --git a/tests/app/res/values-b+sr+Latn/strings.xml b/tests/app/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 9ee1c5ee8e36f433e1c04de0baf5cb191ca35718..0000000000000000000000000000000000000000
--- a/tests/app/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Vidljivo"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Pokreni skeniranje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zaustavi skeniranje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Zdravo, operateru!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Mobilni operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Mamac za operatera koji može da se koristi za pokretanje željene aktivnosti"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Zdravo, proizvođaču!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvođač"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Mamac za proizvođača koji može da se koristi za pokretanje željene aktivnosti"</string>
-</resources>
diff --git a/tests/app/res/values-be/strings.xml b/tests/app/res/values-be/strings.xml
deleted file mode 100644
index 41d62b43d69741346e8d95e8cdefe4ceccc98eb0..0000000000000000000000000000000000000000
--- a/tests/app/res/values-be/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Бачная прылада"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Пачаць сканіраванне"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Спыніць сканіраванне"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Прывітанне, аператар!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Аператар"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Хітрык аператара, які можна выкарыстоўваць для выбранай дзейнасці"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Прывітанне, вытворца!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Вытворца"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Заводскі сродак перахопу, праз які можна распачаць патрэбныя дзеянні"</string>
-</resources>
diff --git a/tests/app/res/values-bg/strings.xml b/tests/app/res/values-bg/strings.xml
deleted file mode 100644
index 580bf85e4f5ee679f7ec2a92adbd3e9bda91ffda..0000000000000000000000000000000000000000
--- a/tests/app/res/values-bg/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Откриваемо"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Стартиране на сканирането"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Спиране на сканирането"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здравейте, операторе!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Фраза за поздрав към оператора, чрез която може да се стартира желана дейност"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Здравейте, производителю!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Производител"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Фраза за поздрав към производителя, чрез която може да се стартира желана дейност"</string>
-</resources>
diff --git a/tests/app/res/values-bn/strings.xml b/tests/app/res/values-bn/strings.xml
deleted file mode 100644
index ac6edab94419e494f8e20876bfe7926ecdbeaaa9..0000000000000000000000000000000000000000
--- a/tests/app/res/values-bn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"খুঁজে নেওয়ার যোগ্য"</string>
-    <string name="start_scan" msgid="3834980997400324437">"স্ক্যান শুরু করুন"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"স্ক্যান বন্ধ করুন"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"হ্যালো অপারেটর!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"অপারেটর"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"অপারেটর হুক যা পছন্দের কার্যকলাপ শুরু করতে ব্যবহার করা যেতে পারে"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"হ্যালো প্রস্তুতকর্তা!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"প্রস্তুতকারক"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"প্রস্তুতকর্তা হুক যা পছন্দের কার্যকলাপ শুরু করতে ব্যবহার করা যেতে পারে"</string>
-</resources>
diff --git a/tests/app/res/values-bs/strings.xml b/tests/app/res/values-bs/strings.xml
deleted file mode 100644
index db915321d89f0e5690789d1d57a6268a5bb41c19..0000000000000000000000000000000000000000
--- a/tests/app/res/values-bs/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Vidljiv"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Započni skeniranje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zaustavi skeniranje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Zdravo, operateru!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Zakačka operatera koja se može koristiti za pokretanje aktivnosti po izboru"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Zdravo, proizvođaču!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvođač"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Zakačka proizvođača koja se može koristiti za pokretanje aktivnosti po izboru"</string>
-</resources>
diff --git a/tests/app/res/values-ca/strings.xml b/tests/app/res/values-ca/strings.xml
deleted file mode 100644
index e324eeb4678d02da6af42b88e25ad6e24c8bbf89..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ca/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Inicia la cerca"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Atura la cerca"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hola, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Esquer per a l\'operador que es pot utilitzar per iniciar l\'activitat triada"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hola, fabricant!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Esquer per al fabricant que es pot utilitzar per iniciar l\'activitat triada"</string>
-</resources>
diff --git a/tests/app/res/values-cs/strings.xml b/tests/app/res/values-cs/strings.xml
deleted file mode 100644
index 92a93cf50a486919cb0df8fd997b135e4bdc61cb..0000000000000000000000000000000000000000
--- a/tests/app/res/values-cs/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Viditelné"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Zahájit vyhledávání"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zastavit vyhledávání"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ahoj operátore!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operátor"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Háček operátora, který lze použít ke spuštění vybrané činnosti"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Ahoj výrobce!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Výrobce"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Háček výrobce, který lze použít ke spuštění vybrané činnosti"</string>
-</resources>
diff --git a/tests/app/res/values-da/strings.xml b/tests/app/res/values-da/strings.xml
deleted file mode 100644
index 6a76b15bdaddbeaf9f545b0f97533b583834aa4d..0000000000000000000000000000000000000000
--- a/tests/app/res/values-da/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Søgbar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scanning"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scanning"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hej mobilselskab"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Mobilselskab"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook fra mobilselskabet, der kan bruges til at starte en aktivitet"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hej producent"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Producent"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook fra producenten, der kan bruges til at starte en aktivitet"</string>
-</resources>
diff --git a/tests/app/res/values-de/strings.xml b/tests/app/res/values-de/strings.xml
deleted file mode 100644
index 8916379f42779ffffff873382ef8d227ee86b73c..0000000000000000000000000000000000000000
--- a/tests/app/res/values-de/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Sichtbar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Scan starten"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Scan beenden"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hallo Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator-Hook zum Starten einer gewünschten Aktivität"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hallo Hersteller!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Hersteller"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hersteller-Hook zum Starten einer gewünschten Aktivität"</string>
-</resources>
diff --git a/tests/app/res/values-el/strings.xml b/tests/app/res/values-el/strings.xml
deleted file mode 100644
index 1e7f4ec18b2a889e641f645cd1fda803a476a00f..0000000000000000000000000000000000000000
--- a/tests/app/res/values-el/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Ανιχνεύσιμο"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Έναρξη σάρωσης"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Διακοπή σάρωσης"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Γεια σας, χειριστή!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Χειριστής"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Άγκιστρο χειριστή που μπορεί να χρησιμοποιηθεί για την έναρξη της επιλεγμένης δραστηριότητας"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Γεια σας, κατασκευαστή!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Κατασκευαστής"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Άγκιστρο κατασκευαστή που μπορεί να χρησιμοποιηθεί για την έναρξη της επιλεγμένης δραστηριότητας"</string>
-</resources>
diff --git a/tests/app/res/values-en-rAU/strings.xml b/tests/app/res/values-en-rAU/strings.xml
deleted file mode 100644
index e1a9a098364476a88754c5e075102a4e727d0bb1..0000000000000000000000000000000000000000
--- a/tests/app/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Discoverable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator\'s hook that can be used to start activity of choice"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Manufacturer\'s hook that can be used to start activity of choice"</string>
-</resources>
diff --git a/tests/app/res/values-en-rCA/strings.xml b/tests/app/res/values-en-rCA/strings.xml
deleted file mode 100644
index e1a9a098364476a88754c5e075102a4e727d0bb1..0000000000000000000000000000000000000000
--- a/tests/app/res/values-en-rCA/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Discoverable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator\'s hook that can be used to start activity of choice"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Manufacturer\'s hook that can be used to start activity of choice"</string>
-</resources>
diff --git a/tests/app/res/values-en-rGB/strings.xml b/tests/app/res/values-en-rGB/strings.xml
deleted file mode 100644
index e1a9a098364476a88754c5e075102a4e727d0bb1..0000000000000000000000000000000000000000
--- a/tests/app/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Discoverable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator\'s hook that can be used to start activity of choice"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Manufacturer\'s hook that can be used to start activity of choice"</string>
-</resources>
diff --git a/tests/app/res/values-en-rIN/strings.xml b/tests/app/res/values-en-rIN/strings.xml
deleted file mode 100644
index e1a9a098364476a88754c5e075102a4e727d0bb1..0000000000000000000000000000000000000000
--- a/tests/app/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Discoverable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator\'s hook that can be used to start activity of choice"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Manufacturer\'s hook that can be used to start activity of choice"</string>
-</resources>
diff --git a/tests/app/res/values-en-rXC/strings.xml b/tests/app/res/values-en-rXC/strings.xml
deleted file mode 100644
index 0b0936161d9ca0ec61f0a229efa6e3f877714f37..0000000000000000000000000000000000000000
--- a/tests/app/res/values-en-rXC/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎Discoverable‎‏‎‎‏‎"</string>
-    <string name="start_scan" msgid="3834980997400324437">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎Start scan‎‏‎‎‏‎"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎Stop scan‎‏‎‎‏‎"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎Hello Operator!‎‏‎‎‏‎"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎Operator‎‏‎‎‏‎"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎Operator hook that can be used to start activity of choice‎‏‎‎‏‎"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎Hello Manufacturer!‎‏‎‎‏‎"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎Manufacturer‎‏‎‎‏‎"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎Manufacturer hook that can be used to start activity of choice‎‏‎‎‏‎"</string>
-</resources>
diff --git a/tests/app/res/values-es-rUS/strings.xml b/tests/app/res/values-es-rUS/strings.xml
deleted file mode 100644
index 1ea3671cd344c4390b146a85d6ae53aaa995fa44..0000000000000000000000000000000000000000
--- a/tests/app/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Comenzar lectura"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Detener lectura"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"¡Hola operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Vínculo del operador que puede utilizarse para iniciar la actividad que elijas"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"¡Hola fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Vínculo del fabricante que puede utilizarse para iniciar la actividad que elijas"</string>
-</resources>
diff --git a/tests/app/res/values-es/strings.xml b/tests/app/res/values-es/strings.xml
deleted file mode 100644
index efd42e3cc3c072a8a2d77e81e5a1096993e623e9..0000000000000000000000000000000000000000
--- a/tests/app/res/values-es/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar búsqueda"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Detener búsqueda"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"¡Hola, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Enlace del operador que se puede utilizar para iniciar la selección"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"¡Hola, fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Enlace del fabricante que se puede utilizar para iniciar la selección"</string>
-</resources>
diff --git a/tests/app/res/values-et/strings.xml b/tests/app/res/values-et/strings.xml
deleted file mode 100644
index 077d066116d034ac7722f01f25237b70f8111edc..0000000000000000000000000000000000000000
--- a/tests/app/res/values-et/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Leitav"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Käivita skannimine"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Peata skannimine"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Tere, operaator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operaator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operaatoriharki saab kasutada teie valitud tegevuse käivitamiseks"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Tere, tootja!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Tootja"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Tootjaharki saab kasutada teie valitud tegevuse käivitamiseks"</string>
-</resources>
diff --git a/tests/app/res/values-eu/strings.xml b/tests/app/res/values-eu/strings.xml
deleted file mode 100644
index 22344369f095684163c4e2fffeeca1fb25bb89fb..0000000000000000000000000000000000000000
--- a/tests/app/res/values-eu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Ikusgai"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Hasi aztertzen"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Gelditu azterketa"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Kaixo, operadore hori!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operadorea"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operadorearen lotura, jarduerak nahieran hasteko erabil daitekeena"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Kaixo, fabrikatzaile hori!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabrikatzailea"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Fabrikatzailearen lotura, jarduerak nahieran hasteko erabil daitekeena"</string>
-</resources>
diff --git a/tests/app/res/values-fa/strings.xml b/tests/app/res/values-fa/strings.xml
deleted file mode 100644
index 5f8a919204955b32ea3a915128cdb3799aa7f804..0000000000000000000000000000000000000000
--- a/tests/app/res/values-fa/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"قابل شناسایی"</string>
-    <string name="start_scan" msgid="3834980997400324437">"شروع اسکن"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"توقف اسکن"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"سلام اپراتور!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"اپراتور"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"گیره اپراتور که می‌توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"سلام سازنده!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"سازنده"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"گیره سازنده که می‌توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
-</resources>
diff --git a/tests/app/res/values-fi/strings.xml b/tests/app/res/values-fi/strings.xml
deleted file mode 100644
index 0b2b23708b8746d88974fa26c7b7e062ad43c989..0000000000000000000000000000000000000000
--- a/tests/app/res/values-fi/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Tunnistettavissa"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Aloita haku"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Pysäytä haku"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hei operaattori!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operaattori"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operaattorin pakote, jonka avulla voidaan aloittaa valittu toiminto"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hei valmistaja!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Valmistaja"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Valmistajan pakote, jonka avulla valittu toiminto voidaan aloittaa"</string>
-</resources>
diff --git a/tests/app/res/values-fr-rCA/strings.xml b/tests/app/res/values-fr-rCA/strings.xml
deleted file mode 100644
index f8df49a74c3e41cf0bbbe5c6488fb3619cd9cf7b..0000000000000000000000000000000000000000
--- a/tests/app/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Démarrer la recherche"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Arrêter la recherche"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Bonjour, fournisseur de services!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Fournisseur de services"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Accroche à l\'intention du fournisseur de services pouvant servir à démarrer l\'opération souhaitée"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Bonjour, fabricant!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Accroche à l\'intention du fabricant pouvant servir à démarrer l\'opération souhaitée"</string>
-</resources>
diff --git a/tests/app/res/values-fr/strings.xml b/tests/app/res/values-fr/strings.xml
deleted file mode 100644
index a2df7ed96451b39f808e805023ccd5dbef273c40..0000000000000000000000000000000000000000
--- a/tests/app/res/values-fr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Démarrer la recherche"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Arrêter la recherche"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Opérateur"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Accroche opérateur pouvant servir à démarrer l\'opération souhaitée"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Accroche fabricant pouvant servir à démarrer l\'opération souhaitée"</string>
-</resources>
diff --git a/tests/app/res/values-gl/strings.xml b/tests/app/res/values-gl/strings.xml
deleted file mode 100644
index d4343d21cd3ba8d7825d078327c0551e89a2084e..0000000000000000000000000000000000000000
--- a/tests/app/res/values-gl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Detectable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar escaneo"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Deter escaneo"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ola, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Gancho do operador que se pode usar para iniciar a actividade escollida"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Ola, fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Gancho do fabricante que se pode usar para iniciar a actividade escollida"</string>
-</resources>
diff --git a/tests/app/res/values-gu/strings.xml b/tests/app/res/values-gu/strings.xml
deleted file mode 100644
index 703f70e8e869ab1086a9c3883eb2a131846014ec..0000000000000000000000000000000000000000
--- a/tests/app/res/values-gu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"શોધવાયોગ્ય"</string>
-    <string name="start_scan" msgid="3834980997400324437">"સ્કૅન પ્રારંભ કરો"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"સ્કૅન રોકો"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ઓપરેટરને નમસ્કાર!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ઓપરેટર"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ઓપરેટર હુક કે જેનો ઉપયોગ પસંદગીની પ્રવૃત્તિ પ્રારંભ કરવા માટે કરી શકાય છે"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"નિર્માતાને નમસ્કાર!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"નિર્માતા"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"નિર્માતા હુક કે જેનો ઉપયોગ પસંદગીની પ્રવૃત્તિ પ્રારંભ કરવા માટે કરી શકાય છે"</string>
-</resources>
diff --git a/tests/app/res/values-hi/strings.xml b/tests/app/res/values-hi/strings.xml
deleted file mode 100644
index 3a754c65ce3249009c4416f54d1256d8583f5ba0..0000000000000000000000000000000000000000
--- a/tests/app/res/values-hi/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"खोजे जाने लायक"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्कैन शुरू करें"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"स्कैन बंद करें"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"नमस्कार ऑपरेटर!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"पसंद की गतिविधि प्रारंभ करने में उपयोग किया जाने वाला ऑपरेटर हुक"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"नमस्कार निर्माता!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"निर्माता"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"पसंद की गतिविधि प्रारंभ करने में उपयोग किया जाने वाला निर्माता हुक"</string>
-</resources>
diff --git a/tests/app/res/values-hr/strings.xml b/tests/app/res/values-hr/strings.xml
deleted file mode 100644
index 768ebb75a87a7c8908777c21bc3bd501e833f2fd..0000000000000000000000000000000000000000
--- a/tests/app/res/values-hr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Moguće otkrivanje"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Pokreni skeniranje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zaustavi skeniranje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Pozdrav, operateru!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Mobilni operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatorska kvaka koja se može upotrijebiti da bi se započela odabrana aktivnost"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Pozdrav, proizvođaču!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvođač"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Proizvođačka kvaka koja se može upotrijebiti da bi se započela odabrana aktivnost"</string>
-</resources>
diff --git a/tests/app/res/values-hu/strings.xml b/tests/app/res/values-hu/strings.xml
deleted file mode 100644
index da413963e8fff599afa18aaaa84bcd6a5d2f189a..0000000000000000000000000000000000000000
--- a/tests/app/res/values-hu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Látható"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Keresés indítása"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Keresés leállítása"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Üdv, Operátor!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Szolgáltató"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operátori horog, amelyet tetszés szerinti tevékenység elindítására lehet használni"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Tisztelt Gyártó!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Gyártó"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Gyártói horog, amely tetszés szerinti tevékenység elindítására használható"</string>
-</resources>
diff --git a/tests/app/res/values-hy/strings.xml b/tests/app/res/values-hy/strings.xml
deleted file mode 100644
index c8cd4a148ec352592177daf1042b0f13db8528e9..0000000000000000000000000000000000000000
--- a/tests/app/res/values-hy/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Հայտնաբերելի"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Սկսել սկանավորումը"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Դադարեցնել սկանավորումը"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ողջու˜յն, օպերատոր:"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Օպերատոր"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Օպերատորի սլաքը կարող է օգտագործվել ընտրված գործողությունը սկսելու համար"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Ողջու˜յն, արտադրող:"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Արտադրող"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Արտադրողի սլաքը կարող է օգտագործվել ընտրված գործողությունը սկսելու համար"</string>
-</resources>
diff --git a/tests/app/res/values-in/strings.xml b/tests/app/res/values-in/strings.xml
deleted file mode 100644
index 51c474c463ea9810284faef0991c2ecf5f9751d5..0000000000000000000000000000000000000000
--- a/tests/app/res/values-in/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Dapat ditemukan"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Mulai memindai"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Hentikan pemindaian"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Halo Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook operator yang dapat digunakan untuk memulai aktivitas pilihan"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Halo Pabrikan!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Produsen"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook produsen yang dapat digunakan untuk memulai aktivitas pilihan"</string>
-</resources>
diff --git a/tests/app/res/values-is/strings.xml b/tests/app/res/values-is/strings.xml
deleted file mode 100644
index 4d694ccead1220083803b3676d689c663f9d0c7f..0000000000000000000000000000000000000000
--- a/tests/app/res/values-is/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Sýnilegt"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Hefja skönnun"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stöðva skönnun"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Halló, símafyrirtæki!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Símafyrirtæki"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Símafyrirtækishlið sem hægt er að nota til að ræsa hvaða virkni sem er"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Halló, framleiðandi!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Framleiðandi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Framleiðandahlið sem hægt er að nota til að ræsa hvaða virkni sem er"</string>
-</resources>
diff --git a/tests/app/res/values-it/strings.xml b/tests/app/res/values-it/strings.xml
deleted file mode 100644
index 46a8a1c22e7834b0dc5464dd60a2ec1a541017c7..0000000000000000000000000000000000000000
--- a/tests/app/res/values-it/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Rilevabile"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Avvia scansione"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Interrompi scansione"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ciao operatore!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatore"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Collegamento all\'operatore utilizzabile per avviare l\'attività di propria scelta"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Ciao produttore!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Produttore"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Collegamento al produttore utilizzabile per avviare l\'attività di propria scelta"</string>
-</resources>
diff --git a/tests/app/res/values-iw/strings.xml b/tests/app/res/values-iw/strings.xml
deleted file mode 100644
index a2c9e4654a33433d13906385cb8abf26203c85b6..0000000000000000000000000000000000000000
--- a/tests/app/res/values-iw/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"גלוי"</string>
-    <string name="start_scan" msgid="3834980997400324437">"התחל סריקה"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"הפסק סריקה"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"שלום לך ספק!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ספק"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"חיבור ספק שיכול לשמש להתחלת הפעילות שנבחרה"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"שלום לך יצרן!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"יצרן"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"חיבור יצרן שיכול לשמש להתחלת הפעילות שנבחרה"</string>
-</resources>
diff --git a/tests/app/res/values-ja/strings.xml b/tests/app/res/values-ja/strings.xml
deleted file mode 100644
index 5b663e7ec8049335a18e911bb1e970e12b2c38f7..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ja/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"検出可能"</string>
-    <string name="start_scan" msgid="3834980997400324437">"スキャンを開始"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"スキャンを停止"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"オペレーター"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"オペレーター"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"選択した操作を開始するためのオペレーター フック"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"メーカー"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"メーカー"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"選択した操作を開始するためのメーカーフック"</string>
-</resources>
diff --git a/tests/app/res/values-ka/strings.xml b/tests/app/res/values-ka/strings.xml
deleted file mode 100644
index 303a3c525489c0abd3b8f71d32220fdf867c06b9..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ka/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"აღმოჩენადი"</string>
-    <string name="start_scan" msgid="3834980997400324437">"სკანირების დაწყება"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"სკანირების შეწყვეტა"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"გამარჯობა, ოპერატორო!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ოპერატორი"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ოპერატორის ფანდი, რომლის გამოყენებაც არჩევანის გაკეთების იძულებისთვის შეიძლება"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"გამარჯობა, მწარმოებელო!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"მწარმოებელი"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"მწარმოებლის ფანდი, რომლის გამოყენებაც არჩევანის გაკეთების იძულებისთვის შეიძლება"</string>
-</resources>
diff --git a/tests/app/res/values-kk/strings.xml b/tests/app/res/values-kk/strings.xml
deleted file mode 100644
index f68c61b54e44db0386fe71c76da54f14e0f20457..0000000000000000000000000000000000000000
--- a/tests/app/res/values-kk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Табу мүмкіндігі бар"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Іздеуді бастау"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Іздеуді тоқтату"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Сәлем, Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Таңдалған әрекетті іске қосу үшін пайдалануға болатын Operator хугы"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Сәлем, Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Өндіруші"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Таңдалған әрекетті іске қосу үшін пайдалануға болатын Manufacturer хугы"</string>
-</resources>
diff --git a/tests/app/res/values-km/strings.xml b/tests/app/res/values-km/strings.xml
deleted file mode 100644
index a738ee00488e6e5ae992e9226ae7a10dd7917302..0000000000000000000000000000000000000000
--- a/tests/app/res/values-km/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"អាចរកឃើញ"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ចាប់ផ្ដើមស្កេន"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ឈប់ស្កេន"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"សួស្ដីប្រតិបត្តិករ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ប្រតិបត្តិករ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ការទាក់ទាញប្រតិបត្តិករអាចត្រូវបានប្រើដើម្បីចាប់ផ្ដើមជម្រើសសកម្មភាព"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"សួស្ដីក្រុមហ៊ុនផលិត!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"ក្រុមហ៊ុនផលិត"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ការទាក់ទាញក្រុមហ៊ុនផលិតអាចត្រូវបានប្រើដើម្បីចាប់ផ្ដើមជម្រើសសកម្មភាព"</string>
-</resources>
diff --git a/tests/app/res/values-kn/strings.xml b/tests/app/res/values-kn/strings.xml
deleted file mode 100644
index 2bc15ed342aa4e46fdfa2bdd8afa36111a54fc70..0000000000000000000000000000000000000000
--- a/tests/app/res/values-kn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"ಅನ್ವೇಷಿಸಬಹುದಾದ"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ಸ್ಕ್ಯಾನ್ ಪ್ರಾರಂಭಿಸಿ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ಸ್ಕ್ಯಾನ್ ನಿಲ್ಲಿಸಿ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ಹಲೋ ಆಪರೇಟರ್!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ಆಪರೇಟರ್"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ಆಯ್ಕೆಯ ಚಟುವಟಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಳಸಬಹುದಾದ ಆಪರೇಟರ್ ಹುಕ್"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ಹಲೋ ತಯಾರಕರೇ!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"ತಯಾರಕರು"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ಆಯ್ಕೆಯ ಚಟುವಟಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಳಸಬಹುದಾದ ತಯಾರಕರ ಹುಕ್"</string>
-</resources>
diff --git a/tests/app/res/values-ko/strings.xml b/tests/app/res/values-ko/strings.xml
deleted file mode 100644
index 996016cfe735ecbc5428454166a759ebd69bfc96..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ko/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"검색 가능"</string>
-    <string name="start_scan" msgid="3834980997400324437">"검색 시작"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"검색 중지"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"운영자님, 안녕하세요."</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"운영자"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"선택한 작업을 시작하는 데 사용할 수 있는 운영자 안내"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"제조업자님, 안녕하세요."</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"제조업체"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"선택한 작업을 시작하는 데 사용할 수 있는 제조업체 안내"</string>
-</resources>
diff --git a/tests/app/res/values-ky/strings.xml b/tests/app/res/values-ky/strings.xml
deleted file mode 100644
index 766d591437b00d6d8370c86627594ae8d492a32e..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ky/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Ачык"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Скандоону баштоо"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Скандоону токтотуу"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Салам!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Тандалган аракетти баштоо үчүн колдонула турган оператордун куралы"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Салам!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Өндүрүүчү"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Тандалган аракетти баштоо үчүн колдонула турган өндүрүүчүнүн куралы"</string>
-</resources>
diff --git a/tests/app/res/values-lo/strings.xml b/tests/app/res/values-lo/strings.xml
deleted file mode 100644
index b10e8e46d7fc5cd40b371bfd1436e93cfdd2ec27..0000000000000000000000000000000000000000
--- a/tests/app/res/values-lo/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"ສາມາດຄົ້ນພົບໄດ້"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ເລີ່ມຕົ້ນສະແກນ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ຢຸດສະແກນ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ສະບາຍດີຜູ້ໃຫ້ບໍລິການ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ຜູ້ໃຫ້ບໍລິການ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ຂໍ້ຄວາມຂອງຜູ້ໃຫ້ບໍລິການທີ່ສາມາດໃຊ້ ເພື່ອເລີ່ມການເຄື່ອນໄຫວທີ່ເລືອກໄດ້"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ສະບາຍດີຜູ້ຜະລິດ!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"ຜູ້ຜະລິດ"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ຂໍ້ຄວາມຂອງຜູ້ຜະລິດທີ່ສາມາດໃຊ້ເພື່ອເລີ່ມການເຄື່ອນໄຫວທີ່ເລືອກໄດ້"</string>
-</resources>
diff --git a/tests/app/res/values-lt/strings.xml b/tests/app/res/values-lt/strings.xml
deleted file mode 100644
index a59099983044fedb78cca8721f9e18f4c9b04b89..0000000000000000000000000000000000000000
--- a/tests/app/res/values-lt/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Aptinkamas"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Pradėti nuskaitymą"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Sustabdyti nuskaitymą"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Sveiki, operatoriau!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatorius"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatoriaus dominantis turinys, kurį galima naudoti norint pradėti pasirinktą veiklą"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Sveiki, gamintojau!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Gamintojas"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Gamintojo dominantis turinys, kurį galima naudoti norint pradėti pasirinktą veiklą"</string>
-</resources>
diff --git a/tests/app/res/values-lv/strings.xml b/tests/app/res/values-lv/strings.xml
deleted file mode 100644
index e28fe2a4b422d2575e94f8d92956f729bec3f13d..0000000000000000000000000000000000000000
--- a/tests/app/res/values-lv/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Uztverama"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Sākt skenēšanu"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Apturēt skenēšanu"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Esiet sveicināts, operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operators"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatora aizķere, ko var izmantot, lai startētu izvēlētu darbību"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Esiet sveicināts, ražotāj!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Ražotājs"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ražotāja aizķere, ko var izmantot, lai startētu izvēlētu darbību"</string>
-</resources>
diff --git a/tests/app/res/values-mk/strings.xml b/tests/app/res/values-mk/strings.xml
deleted file mode 100644
index b6eca5411376565d0ecc0777861c5cb060dcb9d7..0000000000000000000000000000000000000000
--- a/tests/app/res/values-mk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Достапен"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Започни скенирање"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Запри скенирање"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здраво операторе!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Кука на оператор што може да се употреби за да се започне активност по избор"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Здраво производителе!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Производителот"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Кука на производител што може да се употреби за да се започне активност по избор"</string>
-</resources>
diff --git a/tests/app/res/values-ml/strings.xml b/tests/app/res/values-ml/strings.xml
deleted file mode 100644
index e1aa334bbc7b2843a5493f35043f7e7749147ba6..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ml/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"കണ്ടെത്താനാകുന്നത്"</string>
-    <string name="start_scan" msgid="3834980997400324437">"സ്കാൻ ചെയ്യാൻ ആരംഭിക്കുക"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"സ്‌കാൻ ചെയ്യുന്നത് നിർത്തുക"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ഹലോ, ഓപ്പറേറ്റർ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ഓപ്പറേറ്റർ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"തിരഞ്ഞെടുക്കൽ പ്രവർത്തനം ആരംഭിക്കാൻ ഉപയോഗിക്കാവുന്ന ഓപ്പറേറ്റർ ഹുക്ക്"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ഹലോ, നിർമ്മാതാവെ!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"നിർമ്മാതാവ്"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"തിരഞ്ഞെടുക്കൽ പ്രവർത്തനം ആരംഭിക്കാൻ ഉപയോഗിക്കാവുന്ന നിർമ്മാതാവിന്റെ ഹുക്ക്"</string>
-</resources>
diff --git a/tests/app/res/values-mn/strings.xml b/tests/app/res/values-mn/strings.xml
deleted file mode 100644
index c2648267c1abcbb24381e1e45a176a1d641acf17..0000000000000000000000000000000000000000
--- a/tests/app/res/values-mn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Харагдахуйц"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Сканийг эхлүүлэх"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Шинжлэхийг зогсоох"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Сайн байна уу, Оператор оо!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Сонгох ажлыг эхлүүлэхэд ашиглаж болох үйлдвэрлэгчийн хэсэг"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Сайн байна уу, үйлдвэрлэгчид ээ!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Үйлдвэрлэгч"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Сонгох ажлыг эхлүүлэхэд ашиглаж болох үйлдвэрлэгчийн хэсэг"</string>
-</resources>
diff --git a/tests/app/res/values-mr/strings.xml b/tests/app/res/values-mr/strings.xml
deleted file mode 100644
index be6511b446f0ca03a3794e938858e3f370abe4df..0000000000000000000000000000000000000000
--- a/tests/app/res/values-mr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"शोधसुलभ"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्कॅन सुरू करा"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"स्कॅन थांबवा"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"हॅलो ऑपरेटर!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"पसंतीची अॅक्टिव्हिटी सुरू करण्‍यासाठी वापरले जाऊ शकणारे अॉपरेटर हूक"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"हॅलो निर्माता!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"निर्माता"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"पसंतीची अॅक्टिव्हिटी सुरू करण्‍यासाठी वापरले जाऊ शकणारे निर्माता हूक"</string>
-</resources>
diff --git a/tests/app/res/values-ms/strings.xml b/tests/app/res/values-ms/strings.xml
deleted file mode 100644
index 6d19101e486f4fc50311ff5e866f791ffa4e24a7..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ms/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Boleh ditemui"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Mulakan pengimbasan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Hentikan pengimbasan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Helo Pembawa!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Pembawa"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Tarikan pembawa yang dapat digunakan untuk memulakan aktiviti pilihan"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Helo Pengeluar!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Pengeluar"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Tarikan pengeluar yang dapat digunakan untuk memulakan aktiviti pilihan"</string>
-</resources>
diff --git a/tests/app/res/values-my/strings.xml b/tests/app/res/values-my/strings.xml
deleted file mode 100644
index 45b090d74b289be07507fd3cd03308ce2223f5d3..0000000000000000000000000000000000000000
--- a/tests/app/res/values-my/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"ရှာတွေ့နိုင်သော"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ဖတ်ခြင်းစပါ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ဖတ်ခြင်းရပ်ပါ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"မင်္ဂလာပါ အော်ပရေတာ။"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"အော်ပရေတာ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ရွေးချယ်မှု စတင်အသုံးပြုနိုင်မည့် အော်ပရေတာမှ စိတ်ဝင်စားစရာအကြောင်းအရာ"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"မင်္လာပါ ထုတ်လုပ်သူ။"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"ထုတ်လုပ်သူ"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ရွေးချယ်မှုကို စတင်အသုံးပြုနိုင်မည့် ထုတ်လုပ်သူမှ စိတ်ဝင်စားစရာအကြောင်းအရာ"</string>
-</resources>
diff --git a/tests/app/res/values-nb/strings.xml b/tests/app/res/values-nb/strings.xml
deleted file mode 100644
index dbc3ec845c1eb7c9e4649fc19570b062019a910b..0000000000000000000000000000000000000000
--- a/tests/app/res/values-nb/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Synlig"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start skanning"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stopp skanning"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hei, operatør!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatør"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatøraktivering som kan brukes til å starte en ønsket aktivitet"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hei, produsent!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Produsent"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Produsentaktivering som kan brukes til å starte en ønsket aktivitet"</string>
-</resources>
diff --git a/tests/app/res/values-ne/strings.xml b/tests/app/res/values-ne/strings.xml
deleted file mode 100644
index 9ec6fd3b2746f5a295dad0aad626e411c80fdd68..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ne/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"पत्ता लगाउनयोग्य"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्क्यान सुरु गर्नुहोस्"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"स्क्यान बन्द गर्नुहोस्"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"नमस्कार अपरेटर!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"अपरेटर"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"अपरेटर हुक जसलाई रोजाइको गतिविधि सुरु गर्न प्रयोग गर्न सकिन्छ"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"नमस्कार निर्माता!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"निर्माता"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"निर्माता हुक जसलाई रोजाइको गतिविधि सुरु गर्न प्रयोग गर्न सकिन्छ"</string>
-</resources>
diff --git a/tests/app/res/values-nl/strings.xml b/tests/app/res/values-nl/strings.xml
deleted file mode 100644
index 384670e35db8b4efaabc4722fe06ccb2702fa312..0000000000000000000000000000000000000000
--- a/tests/app/res/values-nl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Vindbaar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Scan starten"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Scan stoppen"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hallo operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook van operator die kan worden gebruikt om de gewenste activiteit te starten"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hallo fabrikant!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabrikant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook van fabrikant die kan worden gebruikt om de gewenste activiteit te starten"</string>
-</resources>
diff --git a/tests/app/res/values-pa/strings.xml b/tests/app/res/values-pa/strings.xml
deleted file mode 100644
index 3604287d4705629e3c8dc11d9f77db08e57aaaf8..0000000000000000000000000000000000000000
--- a/tests/app/res/values-pa/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"ਖੋਜਣਯੋਗ"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ਸਕੈਨ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ਸਕੈਨ ਰੋਕੋ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ਹੈਲੋ ਓਪਰੇਟਰ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ਓਪਰੇਟਰ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ਓਪਰੇਟਰ ਹੁੱਕ ਜਿਸਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ਹੈਲੋ ਨਿਰਮਾਤਾ!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"ਨਿਰਮਾਤਾ"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ਨਿਰਮਾਤਾ ਹੁੱਕ ਜਿਸ ਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
-</resources>
diff --git a/tests/app/res/values-pl/strings.xml b/tests/app/res/values-pl/strings.xml
deleted file mode 100644
index 3d6427480d5dca981276d5af511688f8bae94c46..0000000000000000000000000000000000000000
--- a/tests/app/res/values-pl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Wykrywalny"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Rozpocznij skanowanie"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zatrzymaj skanowanie"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Witaj operatorze"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Interfejs operatora umożliwiający uruchomienie wybranego działania"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Witaj producencie"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Producent"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Interfejs producenta umożliwiający uruchomienie wybranego działania"</string>
-</resources>
diff --git a/tests/app/res/values-pt-rBR/strings.xml b/tests/app/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 0f850500dbe571840d923344964db2a679919593..0000000000000000000000000000000000000000
--- a/tests/app/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Detectável"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar verificação"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Parar verificação"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Olá, operador."</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Ferramenta do operador que pode ser usada para iniciar a atividade que você escolher"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Olá, fabricante."</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ferramenta do fabricante que pode ser usada para iniciar a atividade que você escolher"</string>
-</resources>
diff --git a/tests/app/res/values-pt-rPT/strings.xml b/tests/app/res/values-pt-rPT/strings.xml
deleted file mode 100644
index e94d5d0175abc5b455fe0995f8cd65c1a59a5967..0000000000000000000000000000000000000000
--- a/tests/app/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Detetável"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar análise"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Parar análise"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Olá, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Símbolo do operador que pode ser utilizado para iniciar uma atividade à escolha"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Olá, fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Símbolo do fabricante que pode ser utilizado para iniciar uma atividade à escolha"</string>
-</resources>
diff --git a/tests/app/res/values-pt/strings.xml b/tests/app/res/values-pt/strings.xml
deleted file mode 100644
index 0f850500dbe571840d923344964db2a679919593..0000000000000000000000000000000000000000
--- a/tests/app/res/values-pt/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Detectável"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar verificação"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Parar verificação"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Olá, operador."</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Ferramenta do operador que pode ser usada para iniciar a atividade que você escolher"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Olá, fabricante."</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ferramenta do fabricante que pode ser usada para iniciar a atividade que você escolher"</string>
-</resources>
diff --git a/tests/app/res/values-ro/strings.xml b/tests/app/res/values-ro/strings.xml
deleted file mode 100644
index a97dd140402b7aa38a25ac750ea507c39fd54ef5..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ro/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Detectabil"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Începeți scanarea"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Opriți scanarea"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Stimate operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Mesaj pentru operator, care poate fi utilizat pentru a începe activitatea dorită"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Stimate producător!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Producător"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Mesaj pentru producător, care poate fi utilizat pentru a începe activitatea dorită"</string>
-</resources>
diff --git a/tests/app/res/values-ru/strings.xml b/tests/app/res/values-ru/strings.xml
deleted file mode 100644
index d5c4d0290def5d8e8ad35862d8460a78712b2e85..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ru/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Видимость"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Начать поиск"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Остановить поиск"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здравствуйте!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Уловка оператора, побуждающая к совершению действия"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Здравствуйте!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Производитель"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Уловка производителя, побуждающая к совершению действия"</string>
-</resources>
diff --git a/tests/app/res/values-si/strings.xml b/tests/app/res/values-si/strings.xml
deleted file mode 100644
index 04c6ec2ac56afdcdc0dc73fa2acc90dfe3296030..0000000000000000000000000000000000000000
--- a/tests/app/res/values-si/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"සොයා ගත හැකි"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ස්කෑන් කිරීම අරඹන්න"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ස්කෑන් කිරීම නවත්වන්න"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ආයුබෝවන් ක්‍රියාකරු!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ක්‍රියාකරු"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"කැමැති ක්‍රියාවක් ඇරඹීමට භාවිත කළ හැකි මෙහෙයුම් අංශය"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ආයුබෝවන් නිෂ්පාදක!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"නිෂ්පාදකයා"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"අවශ්‍ය ක්‍රියාකාරකමක් කිරීමට භාවිත කළ හැකි නිෂ්පාදක අංශය"</string>
-</resources>
diff --git a/tests/app/res/values-sk/strings.xml b/tests/app/res/values-sk/strings.xml
deleted file mode 100644
index 53c2a785c1a2b2f5f19708d5c53a0ad46e2ebacf..0000000000000000000000000000000000000000
--- a/tests/app/res/values-sk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Viditeľné"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Spustiť vyhľadávanie"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zastaviť vyhľadávanie"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Dobrý deň, operátor!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operátor"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Háčik operátora, ktorý je možné použiť na spustenie vybratej činnosti"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Dobrý deň, výrobca!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Výrobca"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Háčik výrobcu, ktorý je možné použiť na spustenie vybratej činnosti"</string>
-</resources>
diff --git a/tests/app/res/values-sl/strings.xml b/tests/app/res/values-sl/strings.xml
deleted file mode 100644
index da186eb640c9e3b750e7ac263517fafcfe7e0144..0000000000000000000000000000000000000000
--- a/tests/app/res/values-sl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Vidno"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Začni iskanje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Ustavi iskanje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Živijo, operater!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Priključitvena točka za operaterja, ki jo je mogoče uporabiti za novo dejavnost"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Živijo, proizvajalec!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvajalec"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Priključitvena točka za proizvajalca, ki jo je mogoče uporabiti za poljubno dejavnost"</string>
-</resources>
diff --git a/tests/app/res/values-sq/strings.xml b/tests/app/res/values-sq/strings.xml
deleted file mode 100644
index 7de008171d515bb5b8b0f86489f8caee16e4f029..0000000000000000000000000000000000000000
--- a/tests/app/res/values-sq/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"I zbulueshëm"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Nis skanimin"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Ndalo skanimin"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Përshëndetje operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatori"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Grepi i operatorit që mund të përdoret për të filluar aktivitetin e zgjedhur"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Përshëndetje prodhues!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Prodhuesi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Grepi i prodhuesit që mund të përdoret për të nisur aktivitetin e zgjedhur"</string>
-</resources>
diff --git a/tests/app/res/values-sr/strings.xml b/tests/app/res/values-sr/strings.xml
deleted file mode 100644
index dd8b7d937a90dd63a2b5c2bc8fe209693733f05b..0000000000000000000000000000000000000000
--- a/tests/app/res/values-sr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Видљиво"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Покрени скенирање"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Заустави скенирање"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здраво, оператеру!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Мобилни оператер"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Мамац за оператера који може да се користи за покретање жељене активности"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Здраво, произвођачу!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Произвођач"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Мамац за произвођача који може да се користи за покретање жељене активности"</string>
-</resources>
diff --git a/tests/app/res/values-sv/strings.xml b/tests/app/res/values-sv/strings.xml
deleted file mode 100644
index e8f8d53ff5c2f53e3d98a127f6e02e6c4a4e6ab2..0000000000000000000000000000000000000000
--- a/tests/app/res/values-sv/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Synlig"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Starta sökning"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stoppa sökningen"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hej operatör!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatör"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatörsfunktion som kan användas för att starta en valfri aktivitet"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hej tillverkare!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Tillverkare"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Tillverkarfunktion som kan användas för att starta en valfri aktivitet"</string>
-</resources>
diff --git a/tests/app/res/values-sw/strings.xml b/tests/app/res/values-sw/strings.xml
deleted file mode 100644
index bd5a126d6974cea39bb9ea69a7868ff7b73a859e..0000000000000000000000000000000000000000
--- a/tests/app/res/values-sw/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Inaweza kutambulika"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Anza kuchanganua"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Komesha kuchanganua"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hujambo Mwendeshaji!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Kiendeshaji"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Kishikilio cha mtengenezaji ambacho inaweza kutumiwa kwa kuanza shughuli ya chaguo"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hujambo Mtengenezaji!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Mtengenezaji"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Kishikilio cha mtengenezaji ambacho kinaweza kutumiwa kwa kuanza shughuli ya chaguo"</string>
-</resources>
diff --git a/tests/app/res/values-ta/strings.xml b/tests/app/res/values-ta/strings.xml
deleted file mode 100644
index 3a80158093351f7d696b1dd4f2c732769d53e3a3..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ta/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"கண்டறியப்படலாம்"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ஸ்கேனைத் தொடங்கு"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ஸ்கேனை நிறுத்து"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ஹலோ ஆபரேட்டரே!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ஆபரேட்டர்"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"விரும்பிய செயல்பாட்டைத் தொடங்குவதற்குப் பயன்படுத்தக் கூடிய ஆபரேட்டர் பொறி"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ஹலோ உற்பத்தியாளரே!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"உற்பத்தியாளர்"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"விரும்பிய செயல்பாட்டைத் தொடங்குவதற்குப் பயன்படுத்தக் கூடிய உற்பத்தியாளர் பொறி"</string>
-</resources>
diff --git a/tests/app/res/values-te/strings.xml b/tests/app/res/values-te/strings.xml
deleted file mode 100644
index 1ffb2b745260b17ef14e5776fbf7a799f97bd1f0..0000000000000000000000000000000000000000
--- a/tests/app/res/values-te/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"కనుగొనదగినది"</string>
-    <string name="start_scan" msgid="3834980997400324437">"స్కాన్‌ని ప్రారంభించండి"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"స్కాన్‌ని ఆపివేయండి"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"హలో ఆపరేటర్!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ఆపరేటర్"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ఎంచుకున్న కార్యాచరణను ప్రారంభించడానికి ఉపయోగించగల దాన్ని ఆపరేటర్ నియంత్రించగలరు"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"హలో తయారీదారు!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"తయారీదారు"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ఎంచుకున్న కార్యాచరణను ప్రారంభించడానికి ఉపయోగించగల దాన్ని తయారీదారు నియంత్రించగలరు"</string>
-</resources>
diff --git a/tests/app/res/values-th/strings.xml b/tests/app/res/values-th/strings.xml
deleted file mode 100644
index 249d0f72b65a9f9a2b1cbf6dd047328de00f9a77..0000000000000000000000000000000000000000
--- a/tests/app/res/values-th/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"ค้นพบได้"</string>
-    <string name="start_scan" msgid="3834980997400324437">"เริ่มสแกน"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"หยุดสแกน"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"สวัสดี โอเปอเรเตอร์"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"โอเปอเรเตอร์"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ข้อความของโอเปอเรเตอร์ที่สามารถใช้เริ่มกิจกรรมที่เลือกได้"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"สวัสดี ผู้ผลิต"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"ผู้ผลิต"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ข้อความของผู้ผลิตที่สามารถใช้เริ่มกิจกรรมที่เลือกได้"</string>
-</resources>
diff --git a/tests/app/res/values-tl/strings.xml b/tests/app/res/values-tl/strings.xml
deleted file mode 100644
index c64985ebea4dfbddd53dc79af90fd055d3260950..0000000000000000000000000000000000000000
--- a/tests/app/res/values-tl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Katuklas-tuklas"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Simulan ang pag-ii-scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Ihinto ang pag-ii-scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Kumusta Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook ng operator na maaaring magamit upang simulan ang napiling aktibidad"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Kumusta Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook ng manufacturer na maaaring magamit upang simulan ang napiling aktibidad"</string>
-</resources>
diff --git a/tests/app/res/values-tr/strings.xml b/tests/app/res/values-tr/strings.xml
deleted file mode 100644
index 7c9adffa8fea6d4ebe1dbde5a6844922f935ca14..0000000000000000000000000000000000000000
--- a/tests/app/res/values-tr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Keşfedilebilir"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Taramayı başlat"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Taramayı durdur"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Merhaba Operatör!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatör"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Seçilen etkinliğin başlatılmasında kullanılabilen operatör kancası"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Merhaba Üretici!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Üretici"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Seçilen etkinliğin başlatılmasında kullanılabilen üretici kancası"</string>
-</resources>
diff --git a/tests/app/res/values-uk/strings.xml b/tests/app/res/values-uk/strings.xml
deleted file mode 100644
index 30700d8e6fbc82bd57dc536ef1cf62d57564eba6..0000000000000000000000000000000000000000
--- a/tests/app/res/values-uk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Видимий"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Почати сканування"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Припинити сканування"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Вітаємо, операторе!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Обробник оператора, за допомогою якого можна вибирати"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Вітаємо, виробнику!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Виробник"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Обробник виробника, за допомогою якого можна вибирати"</string>
-</resources>
diff --git a/tests/app/res/values-ur/strings.xml b/tests/app/res/values-ur/strings.xml
deleted file mode 100644
index 34e1e3e5037e0b58f044e8bbaf28eba6ef515e59..0000000000000000000000000000000000000000
--- a/tests/app/res/values-ur/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"قابل دریافت"</string>
-    <string name="start_scan" msgid="3834980997400324437">"اسکین شروع کریں"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"اسکین روکیں"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ہیلو آپریٹر!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"آپریٹر"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"آپریٹر ہک جس کا استعمال پسند کی سرگرمی شروع کرنے کیلئے کیا جا سکتا ہے"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"ہیلو مینوفیکچرر!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"مینوفیکچرر"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"مینوفیکچرر ہک جس کا استعمال پسند کی سرگرمی شروع کرنے کیلئے کیا جا سکتا ہے"</string>
-</resources>
diff --git a/tests/app/res/values-uz/strings.xml b/tests/app/res/values-uz/strings.xml
deleted file mode 100644
index 5e8659167da062e2f65fd6ec6435c76d72cf1dce..0000000000000000000000000000000000000000
--- a/tests/app/res/values-uz/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Ko‘rinadi"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Qidiruvni boshlash"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Qidiruvni to‘xtatish"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Salom, operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatorning tanlangan amalni ishga tushiruvchi hiylasi"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Salom, ishlab chiqaruvchi!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Ishlab chiqaruvchi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ishlab chiqaruvchining tanlangan amalni ishga tushiruvchi hiylasi"</string>
-</resources>
diff --git a/tests/app/res/values-vi/strings.xml b/tests/app/res/values-vi/strings.xml
deleted file mode 100644
index a060dc1141772298a6e4ebc8d5ec3d5d59131762..0000000000000000000000000000000000000000
--- a/tests/app/res/values-vi/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Có thể phát hiện"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Bắt đầu quét"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Dừng quét"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Xin chào Nhà cung cấp dịch vụ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Nhà cung cấp dịch vụ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Có thể sử dụng mác của nhà cung cấp dịch vụ để bắt đầu hoạt động đã chọn"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Xin chào Nhà sản xuất!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Nhà sản xuất"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Có thể sử dụng mác của nhà sản xuất để bắt đầu hoạt động đã chọn"</string>
-</resources>
diff --git a/tests/app/res/values-zh-rCN/strings.xml b/tests/app/res/values-zh-rCN/strings.xml
deleted file mode 100644
index de1e8a8c7fe3d34c9252ad790fede11a4c79556c..0000000000000000000000000000000000000000
--- a/tests/app/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"可检测到"</string>
-    <string name="start_scan" msgid="3834980997400324437">"开始扫描"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"停止扫描"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"运营商，您好！"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"运营商"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"可用于启动所选活动的运营商引子"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"制造商，您好！"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"制造商"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"可用于启动所选 Activity 的制造商挂钩"</string>
-</resources>
diff --git a/tests/app/res/values-zh-rHK/strings.xml b/tests/app/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 55170070b6a02dabed80975e55fdbeec184c88be..0000000000000000000000000000000000000000
--- a/tests/app/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"可供偵測"</string>
-    <string name="start_scan" msgid="3834980997400324437">"開始掃描"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"停止掃描"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"流動網絡供應商您好！"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"流動網絡供應商"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"可用來啟動所選活動的流動網絡供應商勾點"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"製造商您好！"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"製造商"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"可用來啟動所選活動的製造商勾點"</string>
-</resources>
diff --git a/tests/app/res/values-zh-rTW/strings.xml b/tests/app/res/values-zh-rTW/strings.xml
deleted file mode 100644
index d3a727919ef29bcd4d82945746a90dc55088e06a..0000000000000000000000000000000000000000
--- a/tests/app/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"可供偵測"</string>
-    <string name="start_scan" msgid="3834980997400324437">"開始掃描"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"停止掃描"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"電信業者你好！"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"電信業者"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"可用來啟動所選活動的電信業者勾點"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"製造商你好！"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"製造商"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"可用來啟動所選活動的製造商勾點"</string>
-</resources>
diff --git a/tests/app/res/values-zu/strings.xml b/tests/app/res/values-zu/strings.xml
deleted file mode 100644
index 217fe9d203ec03a2b802560d3d7c8209208b317d..0000000000000000000000000000000000000000
--- a/tests/app/res/values-zu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"Iyatholakala"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Qala ukuskena"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Misa ukuskena"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Sawubona Opheretha!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Opharetha"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Ihhuku ye-opharetha ingasetshenziselwa ukuqala umsebenzi owuthandayo"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Sawubona Mkhiqizi!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Umkhiqizi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ihhuku yomkhiqizi engasetshenziselwa ukuqala umsebenzi owuthandayo"</string>
-</resources>
diff --git a/tests/app/res/values/strings.xml b/tests/app/res/values/strings.xml
deleted file mode 100644
index 9fb98f90284c28ef8e7c82be64588871aabae9fb..0000000000000000000000000000000000000000
--- a/tests/app/res/values/strings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Test only. Do not translate. -->
-    <!-- Test only. Do not translate. -->
-    <!-- Test only. Do not translate. -->
-    <string name="enable">Enable</string>
-    <string name="discoverable">Discoverable</string>
-    <string name="start_scan">Start scan</string>
-    <string name="stop_scan">Stop scan</string>
-    <string name="operator_hello">Hello Operator!</string>
-    <string name="operator_settings_title">Operator</string>
-    <string name="operator_settings_summary">Operator hook that can be used to start activity of choice</string>
-    <string name="manufacturer_hello">Hello Manufacturer!</string>
-    <string name="manufacturer_settings_title">Manufacturer</string>
-    <string name="manufacturer_settings_summary">Manufacturer hook that can be used to start activity of choice</string>
-</resources>
diff --git a/tests/app/src/com/android/settings/CreateShortcutTest.java b/tests/app/src/com/android/settings/CreateShortcutTest.java
deleted file mode 100644
index 4ae9bd7997c61676a1b2695832444bd531731390..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/CreateShortcutTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Instrumentation;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Tests for {@link CreateShortcutTest}
- *
- m SettingsTests &&
- adb install \
- -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- adb shell am instrument -e class com.android.settings.CreateShortcutTest \
- -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
- */
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class CreateShortcutTest {
-
-    private static final String SHORTCUT_ID_PREFIX = CreateShortcut.SHORTCUT_ID_PREFIX;
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-
-    @Mock ShortcutManager mShortcutManager;
-    @Captor ArgumentCaptor<List<ShortcutInfo>> mListCaptor;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void test_layoutDoesNotHaveCancelButton() {
-        mInstrumentation.startActivitySync(new Intent(Intent.ACTION_CREATE_SHORTCUT)
-                .setClassName(mContext, CreateShortcut.class.getName()));
-        onView(withText(R.string.cancel)).check(doesNotExist());
-    }
-
-    @Test
-    public void createResultIntent() {
-        CreateShortcut orgActivity = (CreateShortcut) mInstrumentation.startActivitySync(
-                new Intent(Intent.ACTION_CREATE_SHORTCUT)
-                        .setClassName(mContext, CreateShortcut.class.getName()));
-        CreateShortcut activity = spy(orgActivity);
-        doReturn(mShortcutManager).when(activity).getSystemService(eq(Context.SHORTCUT_SERVICE));
-
-        when(mShortcutManager.createShortcutResultIntent(any(ShortcutInfo.class)))
-                .thenReturn(new Intent().putExtra("d1", "d2"));
-
-        Intent intent = CreateShortcut.getBaseIntent()
-                .setClass(activity, Settings.ManageApplicationsActivity.class);
-        ResolveInfo ri = activity.getPackageManager().resolveActivity(intent, 0);
-        Intent result = activity.createResultIntent(intent, ri, "dummy");
-        assertEquals("d2", result.getStringExtra("d1"));
-        assertNotNull(result.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT));
-
-        ArgumentCaptor<ShortcutInfo> infoCaptor = ArgumentCaptor.forClass(ShortcutInfo.class);
-        verify(mShortcutManager, times(1))
-                .createShortcutResultIntent(infoCaptor.capture());
-        String expectedId = SHORTCUT_ID_PREFIX + intent.getComponent().flattenToShortString();
-        assertEquals(expectedId, infoCaptor.getValue().getId());
-    }
-
-    @Test
-    public void shortcutsUpdateTask() {
-        mContext = spy(new ContextWrapper(mInstrumentation.getTargetContext()));
-        doReturn(mShortcutManager).when(mContext).getSystemService(eq(Context.SHORTCUT_SERVICE));
-
-        List<ShortcutInfo> pinnedShortcuts = Arrays.asList(
-                makeShortcut("d1"), makeShortcut("d2"),
-                makeShortcut(Settings.ManageApplicationsActivity.class),
-                makeShortcut("d3"),
-                makeShortcut(Settings.SoundSettingsActivity.class));
-        when(mShortcutManager.getPinnedShortcuts()).thenReturn(pinnedShortcuts);
-        new CreateShortcut.ShortcutsUpdateTask(mContext).doInBackground();
-
-        verify(mShortcutManager, times(1)).updateShortcuts(mListCaptor.capture());
-
-        List<ShortcutInfo> updates = mListCaptor.getValue();
-        assertEquals(2, updates.size());
-        assertEquals(pinnedShortcuts.get(2).getId(), updates.get(0).getId());
-        assertEquals(pinnedShortcuts.get(4).getId(), updates.get(1).getId());
-    }
-
-    private ShortcutInfo makeShortcut(Class<?> className) {
-        ComponentName cn = new ComponentName(mContext, className);
-        return makeShortcut(SHORTCUT_ID_PREFIX + cn.flattenToShortString());
-    }
-
-    private ShortcutInfo makeShortcut(String id) {
-        return new ShortcutInfo.Builder(mContext, id).build();
-    }
-}
diff --git a/tests/app/src/com/android/settings/DisplaySettingsTest.java b/tests/app/src/com/android/settings/DisplaySettingsTest.java
deleted file mode 100644
index 888b7fdd2401a38d9a153697c90e9b56f74af575..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/DisplaySettingsTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DisplaySettingsTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-        mDevice = UiDevice.getInstance(mInstrumentation);
-    }
-
-    @Test
-    public void launchBrightnessLevel_shouldNotCrash() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, DisplaySettings.class));
-        onView(withText(mContext.getString(R.string.brightness))).perform(click());
-        // should not crash
-        mDevice.pressBack(); // dismiss the brightness dialog
-    }
-}
diff --git a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java b/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
deleted file mode 100644
index eb61b00958e47ff4c191ce17461a7164d8736799..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.app.Instrumentation.ActivityMonitor;
-import android.app.Instrumentation.ActivityResult;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class EncryptionInterstitialTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-    private TestActivityMonitor mActivityMonitor;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-        mActivityMonitor = new TestActivityMonitor();
-        mInstrumentation.addMonitor(mActivityMonitor);
-    }
-
-    @After
-    public void tearDown() {
-        mInstrumentation.removeMonitor(mActivityMonitor);
-    }
-
-    @Test
-    public void clickYes_shouldRequirePassword() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, EncryptionInterstitial.class)
-                        .putExtra("extra_unlock_method_intent", new Intent("test.unlock.intent")));
-        onView(withId(R.id.encrypt_require_password)).perform(click());
-
-        mActivityMonitor.waitForActivityWithTimeout(1000);
-        assertEquals(1, mActivityMonitor.getHits());
-
-        assertTrue(mActivityMonitor.mMatchedIntent.getBooleanExtra(
-                EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false));
-    }
-
-    @Test
-    public void clickNo_shouldNotRequirePassword() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, EncryptionInterstitial.class)
-                        .putExtra("extra_unlock_method_intent", new Intent("test.unlock.intent")));
-        onView(withId(R.id.encrypt_dont_require_password)).perform(click());
-
-        mActivityMonitor.waitForActivityWithTimeout(1000);
-        assertEquals(1, mActivityMonitor.getHits());
-
-        assertFalse(mActivityMonitor.mMatchedIntent.getBooleanExtra(
-                EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true));
-    }
-
-    private static class TestActivityMonitor extends ActivityMonitor {
-
-        Intent mMatchedIntent = null;
-
-        @Override
-        public ActivityResult onStartActivity(Intent intent) {
-            if ("test.unlock.intent".equals(intent.getAction())) {
-                mMatchedIntent = intent;
-                return new ActivityResult(Activity.RESULT_OK, null);
-            }
-            return null;
-        }
-    }
-}
diff --git a/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java b/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
deleted file mode 100644
index 95c1dcf8839f7fedee1da267adfefa721ee018f1..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.ActivityManager;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ManagedAccessSettingsLowRamTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mTargetContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void testManagedAccessOptionsVisibility() throws Exception {
-        mInstrumentation.startActivitySync(new Intent(mTargetContext,
-                com.android.settings.Settings.SpecialAccessSettingsActivity.class));
-
-        String[] managedServiceLabels = new String[] {"Do Not Disturb access",
-                "VR helper services", "Notification access", "Picture-in-picture"};
-        for (String label : managedServiceLabels) {
-            if (ActivityManager.isLowRamDeviceStatic()) {
-                onView(withText(label)).check(doesNotExist());
-            } else {
-                onView(withText(label)).check(matches(isDisplayed()));
-            }
-        }
-    }
-
-    @Test
-    public void launchNotificationSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-
-    @Test
-    public void launchDndSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-
-    @Test
-    public void launchVrSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_VR_LISTENER_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-
-    @Test
-    public void launchPictureInPictureSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_PICTURE_IN_PICTURE_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-}
diff --git a/tests/app/src/com/android/settings/SettingsHookTests.java b/tests/app/src/com/android/settings/SettingsHookTests.java
deleted file mode 100644
index 4dfd4846e50270c01e7fbf48ab836b6032867798..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/SettingsHookTests.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import com.android.settings.Settings;
-import com.android.settings.tests.Manufacturer;
-import com.android.settings.tests.Operator;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.test.ActivityInstrumentationTestCase2;
-
-import java.util.List;
-
-/**
- * Tests for the Settings operator/manufacturer hook.
- *
- * Running all tests:
- *
- *   make SettingsTests
- *   adb push SettingsTests.apk /system/app/SettingsTests.apk
- *   adb shell am instrument \
- *    -w com.android.settings.tests/android.test.InstrumentationTestRunner
- */
-public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings> {
-
-    private static final String PACKAGE_NAME = "com.android.settings.tests";
-
-    private static final String KEY_SETTINGS_ROOT = "parent";
-    private static final String KEY_SETTINGS_OPERATOR = "operator_settings";
-    private static final String KEY_SETTINGS_MANUFACTURER = "manufacturer_settings";
-
-    private static final String INTENT_OPERATOR_HOOK = "com.android.settings.OPERATOR_APPLICATION_SETTING";
-    private static final String INTENT_MANUFACTURER_HOOK = "com.android.settings.MANUFACTURER_APPLICATION_SETTING";
-
-    private Settings mSettings;
-
-    public SettingsHookTests() {
-        super("com.android.settings", Settings.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mSettings = getActivity();
-    }
-
-    /**
-     * Test that the operator/manufacturer settings hook test application is
-     * available and that it's installed in the device's system image.
-     */
-    public void testSettingsHookTestAppAvailable() throws Exception {
-        Context context = mSettings.getApplicationContext();
-        PackageManager pm = context.getPackageManager();
-        ApplicationInfo applicationInfo = pm.getApplicationInfo(PACKAGE_NAME, 0);
-        assertTrue((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-    }
-
-    /**
-     * Test that the operator test activity has registered an intent-filter for
-     * an action named 'android.settings.OPERATOR_APPLICATION_SETTING'.
-     */
-    public void testOperatorIntentFilter() {
-        boolean result = false;
-        Context context = mSettings.getApplicationContext();
-        PackageManager pm = context.getPackageManager();
-        Intent intent = new Intent(INTENT_OPERATOR_HOOK);
-        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
-        for (ResolveInfo resolveInfo : list) {
-            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
-                result = true;
-            }
-        }
-        assertTrue("Intent-filter not found", result);
-    }
-
-    /**
-     * Test that the manufacturer test activity has registered an intent-filter
-     * for an action named 'android.settings.MANUFACTURER_APPLICATION_SETTING'.
-     */
-    public void testManufacturerIntentFilter() {
-        boolean result = false;
-        Context context = mSettings.getApplicationContext();
-        PackageManager pm = context.getPackageManager();
-        Intent intent = new Intent(INTENT_MANUFACTURER_HOOK);
-        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
-        for (ResolveInfo resolveInfo : list) {
-            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
-                result = true;
-            }
-        }
-        assertTrue("Intent-filter not found", result);
-    }
-
-    /**
-     * Test that the operator preference is available in the Settings
-     * application.
-     */
-    public void testOperatorPreferenceAvailable() {
-// TODO: fix this test case to work with fragments
-//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
-//        Preference operatorPreference = root.findPreference(KEY_SETTINGS_OPERATOR);
-//        assertNotNull(operatorPreference);
-    }
-
-    /**
-     * Test that the manufacturer preference is available in the Settings
-     * application.
-     */
-    public void testManufacturerPreferenceAvailable() {
-// TODO: fix this test case to work with fragments
-//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
-//        Preference manufacturerHook = root.findPreference(KEY_SETTINGS_MANUFACTURER);
-//        assertNotNull(manufacturerHook);
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
deleted file mode 100644
index 30fc124dfa62e2d18ea4e99370e960d7d394a27e..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.android.settings;
-
-import android.content.Intent;
-import android.content.Context;
-
-import android.app.Instrumentation;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroupAdapter;
-import com.android.settings.accessibility.AccessibilitySettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SettingsPreferenceFragmentTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mTargetContext;
-
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void testHighlightCaptions() throws InterruptedException {
-        final String prefKey = "captioning_preference_screen";
-        Bundle args = new Bundle();
-        args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, prefKey);
-
-        Intent intent = new Intent(Intent.ACTION_MAIN);
-        intent.setClass(mTargetContext, SubSettings.class);
-        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT,
-                "com.android.settings.accessibility.AccessibilitySettings");
-        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
-
-        SettingsActivity activity  = (SettingsActivity) mInstrumentation.startActivitySync(intent);
-        AccessibilitySettings fragment = (AccessibilitySettings)
-                activity.getFragmentManager().getFragments().get(0);
-
-        // Allow time for highlight from post-delay.
-        Thread.sleep(SettingsPreferenceFragment.DELAY_HIGHLIGHT_DURATION_MILLIS);
-        if (!fragment.mPreferenceHighlighted) {
-            Thread.sleep(SettingsPreferenceFragment.DELAY_HIGHLIGHT_DURATION_MILLIS);
-        }
-
-        int prefPosition = -1;
-        PreferenceGroupAdapter adapter = (PreferenceGroupAdapter)
-                fragment.getListView().getAdapter();
-        for (int n = 0, count = adapter.getItemCount(); n < count; n++) {
-            final Preference preference = adapter.getItem(n);
-            final String preferenceKey = preference.getKey();
-            if (preferenceKey.equals(prefKey)) {
-                prefPosition = n;
-                break;
-            }
-        }
-
-        assertThat(fragment.mAdapter.initialHighlightedPosition).isEqualTo(prefPosition);
-    }
-}
diff --git a/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java
deleted file mode 100644
index bd03bc94077faeaf0066a6bf645ba815e754bfbc..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.applications;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.filters.SmallTest;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.test.InstrumentationTestCase;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import org.junit.Test;
-
-/**
- * Test for Advanced App preferences.
- */
-@SmallTest
-public class DefaultAppSettingsTest extends InstrumentationTestCase {
-
-    private UiDevice mDevice;
-    private Context mTargetContext;
-    private String mTargetPackage;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetContext = getInstrumentation().getTargetContext();
-        mTargetPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void testSelectDefaultHome_shouldLaunchHomePicker() throws Exception {
-        launchDefaultApps();
-        final String titleHomeApp = mTargetContext.getResources().getString(R.string.home_app);
-        mDevice.findObject(new UiSelector().text(titleHomeApp)).click();
-        final UiObject actionBar = mDevice.findObject(new UiSelector().resourceId(
-            "com.android.settings:id/action_bar"));
-        final UiObject title = actionBar.getChild(
-            new UiSelector().className(TextView.class.getName()));
-        assertEquals(titleHomeApp, title.getText());
-    }
-
-    private void launchDefaultApps() throws Exception  {
-        final Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
-            .addCategory(Intent.CATEGORY_LAUNCHER)
-            .setPackage(mTargetPackage)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(settingsIntent);
-        final String titleApps = mTargetContext.getResources().getString(
-            R.string.app_and_notification_dashboard_title);
-        mDevice.findObject(new UiSelector().text(titleApps)).click();
-        final String titleDefaultApps = mTargetContext.getResources().getString(
-            R.string.app_default_dashboard_title);
-        mDevice.findObject(new UiSelector().text(titleDefaultApps)).click();
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/applications/ExternalSourcesSettingsTest.java b/tests/app/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
deleted file mode 100644
index 82f0e0a8199b6e8aa77d51b7b243685d6c515d92..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static android.app.AppOpsManager.MODE_ALLOWED;
-import static android.app.AppOpsManager.MODE_DEFAULT;
-import static android.app.AppOpsManager.MODE_ERRORED;
-import static android.app.AppOpsManager.OP_REQUEST_INSTALL_PACKAGES;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.net.Uri;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Direction;
-
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-import android.widget.ListView;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ExternalSourcesSettingsTest {
-
-    private static final String TAG = ExternalSourcesSettingsTest.class.getSimpleName();
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-    private static final long START_ACTIVITY_TIMEOUT = 5000;
-
-    private Context mContext;
-    private UiDevice mUiDevice;
-    private PackageManager mPackageManager;
-    private AppOpsManager mAppOpsManager;
-    private List<UserInfo> mProfiles;
-    private String mPackageName;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mPackageName = InstrumentationRegistry.getContext().getPackageName();
-        mPackageManager = mContext.getPackageManager();
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-        mProfiles = mContext.getSystemService(UserManager.class).getProfiles(UserHandle.myUserId());
-        resetAppOpModeForAllProfiles();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-    }
-
-    private void resetAppOpModeForAllProfiles() throws Exception {
-        for (UserInfo user : mProfiles) {
-            final int uid = mPackageManager.getPackageUidAsUser(mPackageName, user.id);
-            mAppOpsManager.setMode(OP_REQUEST_INSTALL_PACKAGES, uid, mPackageName, MODE_DEFAULT);
-        }
-    }
-
-    private Intent createManageExternalSourcesListIntent() {
-        final Intent manageExternalSourcesIntent = new Intent();
-        manageExternalSourcesIntent.setAction(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES);
-        return manageExternalSourcesIntent;
-    }
-
-    private Intent createManageExternalSourcesAppIntent(String packageName) {
-        final Intent intent = createManageExternalSourcesListIntent();
-        intent.setData(Uri.parse("package:" + packageName));
-        return intent;
-    }
-
-    private String getApplicationLabel(String packageName) throws Exception {
-        final ApplicationInfo info = mPackageManager.getApplicationInfo(packageName, 0);
-        return mPackageManager.getApplicationLabel(info).toString();
-    }
-
-    private UiObject2 findAndVerifySwitchState(boolean checked) {
-        final BySelector switchSelector = By.clazz(Switch.class).res("android:id/switch_widget");
-        final UiObject2 switchPref = mUiDevice.wait(Until.findObject(switchSelector),
-                START_ACTIVITY_TIMEOUT);
-        assertNotNull("Switch not shown", switchPref);
-        assertTrue("Switch in invalid state", switchPref.isChecked() == checked);
-        return switchPref;
-    }
-
-    @Test
-    public void testManageExternalSourcesList() throws Exception {
-        final String testAppLabel = getApplicationLabel(mPackageName);
-
-        mContext.startActivity(createManageExternalSourcesListIntent());
-        final BySelector preferenceListSelector = By.clazz(ListView.class).res("android:id/list");
-        final UiObject2 preferenceList = mUiDevice.wait(Until.findObject(preferenceListSelector),
-                START_ACTIVITY_TIMEOUT);
-        assertNotNull("App list not shown", preferenceList);
-
-        final BySelector appLabelTextViewSelector = By.clazz(TextView.class)
-                .res("android:id/title")
-                .text(testAppLabel);
-        List<UiObject2> listOfMatchingTextViews;
-        do {
-            listOfMatchingTextViews = preferenceList.findObjects(appLabelTextViewSelector);
-            // assuming the number of profiles will be sufficiently small so that all the entries
-            // for the same package will fit in one screen at some time during the scroll.
-        } while (listOfMatchingTextViews.size() != mProfiles.size() &&
-                preferenceList.scroll(Direction.DOWN, 0.2f));
-        assertEquals("Test app not listed for each profile", mProfiles.size(),
-                listOfMatchingTextViews.size());
-
-        for (UiObject2 matchingObject : listOfMatchingTextViews) {
-            matchingObject.click();
-            findAndVerifySwitchState(true);
-            mUiDevice.pressBack();
-        }
-    }
-
-    private void testAppDetailScreenForAppOp(int appOpMode, int userId) throws Exception {
-        final String testAppLabel = getApplicationLabel(mPackageName);
-        final BySelector appDetailTitleSelector = By.clazz(TextView.class)
-                .res("com.android.settings:id/app_detail_title")
-                .text(testAppLabel);
-
-        mAppOpsManager.setMode(OP_REQUEST_INSTALL_PACKAGES,
-                mPackageManager.getPackageUidAsUser(mPackageName, userId), mPackageName, appOpMode);
-        mContext.startActivityAsUser(createManageExternalSourcesAppIntent(mPackageName),
-                UserHandle.of(userId));
-        mUiDevice.wait(Until.findObject(appDetailTitleSelector), START_ACTIVITY_TIMEOUT);
-        findAndVerifySwitchState(appOpMode == MODE_ALLOWED || appOpMode == MODE_DEFAULT);
-        mUiDevice.pressBack();
-    }
-
-    @Test
-    public void testManageExternalSourcesForApp() throws Exception {
-        // App op MODE_DEFAULT is already tested in #testManageExternalSourcesList
-        for (UserInfo user : mProfiles) {
-            testAppDetailScreenForAppOp(MODE_ALLOWED, user.id);
-            testAppDetailScreenForAppOp(MODE_ERRORED, user.id);
-        }
-    }
-
-    private void testSwitchToggle(int fromAppOp, int toAppOp) throws Exception {
-        final int packageUid = mPackageManager.getPackageUid(mPackageName, 0);
-        final boolean initialState = (fromAppOp == MODE_ALLOWED || fromAppOp == MODE_DEFAULT);
-
-        mAppOpsManager.setMode(OP_REQUEST_INSTALL_PACKAGES, packageUid, mPackageName, fromAppOp);
-        mContext.startActivity(createManageExternalSourcesAppIntent(mPackageName));
-        final UiObject2 switchPref = findAndVerifySwitchState(initialState);
-        switchPref.click();
-        Thread.sleep(1000);
-        assertEquals("Toggling switch did not change app op", toAppOp,
-                mAppOpsManager.checkOpNoThrow(OP_REQUEST_INSTALL_PACKAGES, packageUid,
-                        mPackageName));
-        mUiDevice.pressBack();
-    }
-
-    @Test
-    public void testIfSwitchTogglesAppOp() throws Exception {
-        testSwitchToggle(MODE_ALLOWED, MODE_ERRORED);
-        testSwitchToggle(MODE_ERRORED, MODE_ALLOWED);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        mUiDevice.pressHome();
-        resetAppOpModeForAllProfiles();
-    }
-}
diff --git a/tests/app/src/com/android/settings/applications/PackageUtilTest.java b/tests/app/src/com/android/settings/applications/PackageUtilTest.java
deleted file mode 100644
index 1c064ae88973d13d53af56eed7e85f4aa28f9b3e..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/applications/PackageUtilTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.applications;
-
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PackageUtilTest {
-    private static final String ALL_USERS_APP_NAME = "com.google.allusers.app";
-    private static final String ONE_USER_APP_NAME = "com.google.oneuser.app";
-    private static final int USER1_ID = 1;
-    private static final int USER2_ID = 11;
-
-    @Mock
-    private PackageManager mMockPackageManager;
-    @Mock
-    private UserManager mMockUserManager;
-
-    private InstalledAppDetails.PackageUtil mPackageUtil;
-    private List<UserInfo> mUserInfos;
-
-    @Before
-    public void setUp() throws PackageManager.NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-
-        mUserInfos = new ArrayList<>();
-        mUserInfos.add(new UserInfo(USER1_ID, "lei", 0));
-        mUserInfos.add(new UserInfo(USER2_ID, "yue", 0));
-        when(mMockUserManager.getUsers(true)).thenReturn(mUserInfos);
-
-        ApplicationInfo usersApp = new ApplicationInfo();
-        usersApp.flags = ApplicationInfo.FLAG_INSTALLED;
-
-        when(mMockPackageManager.getApplicationInfoAsUser(
-                ALL_USERS_APP_NAME, PackageManager.GET_META_DATA, USER1_ID))
-                .thenReturn(usersApp);
-        when(mMockPackageManager.getApplicationInfoAsUser(
-                ALL_USERS_APP_NAME, PackageManager.GET_META_DATA, USER2_ID))
-                .thenReturn(usersApp);
-
-        when(mMockPackageManager.getApplicationInfoAsUser(
-                ONE_USER_APP_NAME, PackageManager.GET_META_DATA, USER1_ID))
-                .thenReturn(usersApp);
-
-        when(mMockPackageManager.getApplicationInfoAsUser(
-                ONE_USER_APP_NAME, PackageManager.GET_META_DATA, USER2_ID))
-                .thenThrow(new PackageManager.NameNotFoundException());
-
-        mPackageUtil = new InstalledAppDetails.PackageUtil();
-    }
-
-    @Test
-    public void testCountPackageInUsers_twoUsersInstalled_returnTwo() {
-        assertEquals(2, mPackageUtil.countPackageInUsers(
-                mMockPackageManager, mMockUserManager, ALL_USERS_APP_NAME));
-    }
-
-    @Test
-    public void testCountPackageInUsers_oneUsersInstalled_returnOne() {
-        assertEquals(1, mPackageUtil.countPackageInUsers(
-                mMockPackageManager, mMockUserManager, ONE_USER_APP_NAME));
-    }
-}
diff --git a/tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java b/tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
deleted file mode 100644
index 5b372ad4b1bc0e4a57073cfd0ba7423a109bddd1..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static org.mockito.Mockito.when;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-
-import com.android.settings.SettingsActivity;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class BluetoothDeviceDetailsRotationTest {
-    private Context mContext;
-    private UiDevice mUiDevice;
-    private Instrumentation mInstrumentation;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private CachedBluetoothDevice mCachedDevice;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LocalBluetoothManager mBluetoothManager;
-
-    private String mDeviceAddress;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = InstrumentationRegistry.getTargetContext();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-
-        mDeviceAddress = "AA:BB:CC:DD:EE:FF";
-        when(mCachedDevice.getAddress()).thenReturn(mDeviceAddress);
-        when(mCachedDevice.getName()).thenReturn("Mock Device");
-
-        BluetoothDeviceDetailsFragment.sTestDataFactory =
-                new BluetoothDeviceDetailsFragment.TestDataFactory() {
-            @Override
-            public CachedBluetoothDevice getDevice(String deviceAddress) {
-                return mCachedDevice;
-            }
-
-            @Override
-            public LocalBluetoothManager getManager(Context context) {
-                return mBluetoothManager;
-            }
-        };
-    }
-
-    @Test
-    public void rotation() {
-        Intent intent = new Intent("android.settings.BLUETOOTH_SETTINGS");
-        SettingsActivity activity = (SettingsActivity) mInstrumentation.startActivitySync(intent);
-        Bundle args = new Bundle(1);
-        args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, mDeviceAddress);
-        activity.startPreferencePanel(null, BluetoothDeviceDetailsFragment.class.getName(), args,
-               0, null, null, 0);
-        try {
-            mUiDevice.setOrientationLeft();
-            mUiDevice.setOrientationNatural();
-            mUiDevice.setOrientationRight();
-            mUiDevice.setOrientationNatural();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java b/tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
deleted file mode 100644
index 1b855c93b62f1e19848dc317bf030c3ce8507ed6..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DevicePickerActivityTest {
-
-    private Instrumentation mInstrumentation;
-
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-    }
-
-    @Test
-    public void startActivityNoCrash() {
-        mInstrumentation.startActivitySync(
-                new Intent("android.bluetooth.devicepicker.action.LAUNCH"));
-        // No crash
-    }
-}
diff --git a/tests/app/src/com/android/settings/deviceinfo/StorageDashboardFragmentEspressoTest.java b/tests/app/src/com/android/settings/deviceinfo/StorageDashboardFragmentEspressoTest.java
deleted file mode 100644
index b43a5ba882d1163de0853650149ea77c1bdd94c1..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/deviceinfo/StorageDashboardFragmentEspressoTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.android.settings.deviceinfo;
-
-import android.support.test.espresso.intent.rule.IntentsTestRule;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnitRunner;
-import com.android.settings.R;
-import com.android.settings.Settings.StorageDashboardActivity;
-import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.intent.Intents.intended;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-@SmallTest
-public class StorageDashboardFragmentEspressoTest {
-
-    public static final String EXTRA_KEY = ":settings:show_fragment";
-
-    @Rule
-    public IntentsTestRule<StorageDashboardActivity> mActivityRule =
-            new IntentsTestRule<>(StorageDashboardActivity.class, true, true);
-
-    @Test
-    public void testStorageManagePreference_canClickTextView() throws InterruptedException {
-        // Click on the actual textbox instead of just somewhere in the preference
-        onView(withText(R.string.storage_menu_manage)).perform(click());
-
-        // Check that it worked by seeing if we switched screens
-        intended(hasExtra(equalTo(EXTRA_KEY),
-                containsString(AutomaticStorageManagerSettings.class.getName())));
-
-    }
-}
diff --git a/tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java b/tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
deleted file mode 100644
index b09d1bf116ee8627170b6b820b895115f49397fa..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fingerprint;
-
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.intent.Intents.intended;
-import static android.support.test.espresso.intent.Intents.intending;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.Instrumentation.ActivityResult;
-import android.content.ComponentName;
-import android.support.test.espresso.intent.rule.IntentsTestRule;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class FingerprintEnrollFinishTest {
-
-    @Rule
-    public IntentsTestRule<FingerprintEnrollFinish> mActivityRule =
-            new IntentsTestRule<>(FingerprintEnrollFinish.class);
-
-    @Test
-    public void clickAddAnother_shouldLaunchEnrolling() {
-        final ComponentName enrollingComponent = new ComponentName(
-                getTargetContext(),
-                FingerprintEnrollEnrolling.class);
-
-        intending(hasComponent(enrollingComponent))
-                .respondWith(new ActivityResult(Activity.RESULT_CANCELED, null));
-
-        onView(withId(R.id.add_another_button)).perform(click());
-
-        intended(hasComponent(enrollingComponent));
-        assertFalse(mActivityRule.getActivity().isFinishing());
-    }
-
-    @Test
-    public void clickAddAnother_shouldPropagateResults() {
-        final ComponentName enrollingComponent = new ComponentName(
-                getTargetContext(),
-                FingerprintEnrollEnrolling.class);
-
-        intending(hasComponent(enrollingComponent))
-                .respondWith(new ActivityResult(Activity.RESULT_OK, null));
-
-        onView(withId(R.id.add_another_button)).perform(click());
-
-        intended(hasComponent(enrollingComponent));
-        assertTrue(mActivityRule.getActivity().isFinishing());
-    }
-
-    @Test
-    public void clickNext_shouldFinish() {
-        onView(withId(R.id.next_button)).perform(click());
-        assertTrue(mActivityRule.getActivity().isFinishing());
-    }
-}
\ No newline at end of file
diff --git a/tests/app/src/com/android/settings/fuelgauge/PowerUsageSummaryUiTest.java b/tests/app/src/com/android/settings/fuelgauge/PowerUsageSummaryUiTest.java
deleted file mode 100644
index 6c372c5f5f175070a6cc2cea2ff68370644808f0..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/fuelgauge/PowerUsageSummaryUiTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PowerUsageSummaryUiTest {
-    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
-
-    @Before
-    public void SetUp() {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
-    }
-
-    @Test
-    public void testClickLastFullCharge_shouldNotCrash() {
-        onView(withText(R.string.battery_last_full_charge)).perform(click());
-    }
-
-    @Test
-    public void testClickScreenUsage_shouldNotCrash() {
-        onView(withText(R.string.device_screen_usage)).perform(click());
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
deleted file mode 100644
index 22e98c71e5e0db8067d610779528688fc3e3d6f9..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.Matchers.allOf;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class AppNotificationSettingsTest {
-
-    private Context mTargetContext;
-    private Instrumentation mInstrumentation;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void launchNotificationSetting_shouldNotHaveAppInfoLink() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName());
-
-        mInstrumentation.startActivitySync(intent);
-
-        onView(allOf(withId(android.R.id.button1),
-                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-                .check(doesNotExist());
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/notification/SoundSettingsIntegrationTest.java b/tests/app/src/com/android/settings/notification/SoundSettingsIntegrationTest.java
deleted file mode 100644
index dff7e611bee9aa61dbb883a29ac1944b6cd8c2e5..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/notification/SoundSettingsIntegrationTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.notification;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.support.test.espresso.contrib.RecyclerViewActions;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.R;
-import com.android.settings.Settings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SoundSettingsIntegrationTest {
-
-    private AudioManager mAudioManager;
-    private final String TRUNCATED_SUMMARY = "Ring volume at";
-
-    @Rule
-    public ActivityTestRule<Settings> mActivityRule =
-            new ActivityTestRule<>(Settings.class, true);
-
-    @Test
-    public void soundPreferenceShowsCorrectSummaryOnSilentMode() {
-        mAudioManager = (AudioManager) mActivityRule.getActivity().getApplicationContext()
-                .getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
-        onView(withId(R.id.dashboard_container))
-                .perform(RecyclerViewActions.scrollTo(
-                        hasDescendant(withText(R.string.sound_settings))));
-        onView(withText(R.string.sound_settings_summary_silent)).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void soundPreferenceShowsCorrectSummaryOnVibrateMode() {
-        mAudioManager = (AudioManager) mActivityRule.getActivity().getApplicationContext()
-                .getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_VIBRATE);
-        onView(withId(R.id.dashboard_container)).perform(RecyclerViewActions
-                .scrollTo(hasDescendant(withText(R.string.sound_settings))));
-        onView(withText(R.string.sound_settings_summary_vibrate)).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void soundPreferenceShowsCorrectSummaryOnMaxVolume() {
-        mAudioManager = (AudioManager) mActivityRule.getActivity().getApplicationContext()
-                .getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
-        mAudioManager.setStreamVolume(AudioManager.STREAM_RING,
-                mAudioManager.getStreamMaxVolume(AudioManager.STREAM_RING), 0);
-        onView(withId(R.id.dashboard_container))
-                .perform(RecyclerViewActions.scrollTo(
-                        hasDescendant(withText(R.string.sound_settings))));
-        onView(withText(containsString(TRUNCATED_SUMMARY))).check(matches(isDisplayed()));
-    }
-}
\ No newline at end of file
diff --git a/tests/app/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java b/tests/app/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
deleted file mode 100644
index e7e5e199cbfe33f119cbd8399b14b607090f050d..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.android.settings.notification;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ZenModeSettingsIntegrationTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-
-    private Context mContext;
-    private UiDevice mUiDevice;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-    }
-
-    @Test
-    public void testAutomaticRulesAppear() {
-        launchZenSettings();
-        onView(withText("Automatic rules")).check(matches(isDisplayed()));
-        onView(withText("Weekend")).check(matches(isDisplayed()));
-        onView(withText("Add more")).check(matches(isDisplayed())).perform(click());
-        onView(withText("Choose rule type")).check(matches(isDisplayed()));
-    }
-
-    private void launchZenSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-}
diff --git a/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
deleted file mode 100644
index 40b69a400a00a833608b475e24128d94c388c703..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManager.AppTask;
-import android.app.KeyguardManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import android.support.test.runner.lifecycle.Stage;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.text.format.DateUtils;
-import android.view.WindowManager;
-
-import com.android.internal.widget.LockPatternUtils;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Tests for {@link ChooseLockGenericTest}
- *
- * m SettingsTests &&
- * adb install \
- * -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- * adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
- * -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
- */
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class ChooseLockGenericTest {
-    private static final long TIMEOUT = 5 * DateUtils.SECOND_IN_MILLIS;
-    private static final Intent PHISHING_ATTACK_INTENT = new Intent()
-            .putExtra("confirm_credentials", false)
-            .putExtra("password_confirmed", true);
-
-    private UiDevice mDevice;
-    private Context mTargetContext;
-    private String mSettingPackage;
-
-    @Rule
-    public ActivityTestRule<ChooseLockGeneric> mChooseLockGenericActivityRule =
-            new ActivityTestRule<>(
-                    ChooseLockGeneric.class,
-                    true /* enable touch at launch */,
-                    false /* don't launch at every test */);
-
-    @Before
-    public void setUp() throws Exception {
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetContext = getInstrumentation().getTargetContext();
-        mSettingPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with no extras.
-            mChooseLockGenericActivityRule.launchActivity(null /* No extras */);
-            // THEN ConfirmLockPassword.InternalActivity is shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword_phishingAttack() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with extras to by-pass lock password confirmation.
-            mChooseLockGenericActivityRule.launchActivity(PHISHING_ATTACK_INTENT);
-            // THEN ConfirmLockPassword.InternalActivity is still shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testForFingerprint_inflateLayout() {
-        mChooseLockGenericActivityRule.launchActivity(new Intent()
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true));
-
-        assertThat(mChooseLockGenericActivityRule.getActivity().isResumed()).isTrue();
-    }
-
-    private Activity getCurrentActivity() throws Throwable {
-        getInstrumentation().waitForIdleSync();
-        final Activity[] activity = new Activity[1];
-        getInstrumentation().runOnMainSync(() -> {
-            Collection<Activity> activities = ActivityLifecycleMonitorRegistry.getInstance()
-                    .getActivitiesInStage(Stage.RESUMED);
-            activity[0] = activities.iterator().next();
-        });
-        return activity[0];
-    }
-
-    /** Sets a PIN password, 12345, for testing. */
-    private void setPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC)
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
-                        "12345")
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-
-        // Ignore any interstitial options
-        UiObject view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/encrypt_dont_require_password"));
-        if (view.waitForExists(TIMEOUT)) {
-            view.click();
-            mDevice.waitForIdle();
-        }
-
-        // Set our PIN
-        view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/password_entry"));
-        assertTrue("password_entry", view.waitForExists(TIMEOUT));
-
-        // Enter it twice to confirm
-        enterTestPin(view);
-        enterTestPin(view);
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isTrue();
-    }
-
-    /** Clears the previous set PIN password. */
-    private void clearPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-        // Enter current PIN
-        UiObject view = new UiObject(
-                new UiSelector().resourceId(mSettingPackage + ":id/password_entry"));
-        if (!view.waitForExists(TIMEOUT)) {
-            // Odd, maybe there is a crash dialog showing; try dismissing it
-            mDevice.pressBack();
-            mDevice.waitForIdle();
-
-            assertTrue("password_entry", view.waitForExists(TIMEOUT));
-        }
-
-        enterTestPin(view);
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isFalse();
-    }
-
-    private void finishAllAppTasks() {
-        final ActivityManager activityManager =
-                getTargetContext().getSystemService(ActivityManager.class);
-        final List<AppTask> appTasks = activityManager.getAppTasks();
-        for (ActivityManager.AppTask task : appTasks) {
-            task.finishAndRemoveTask();
-        }
-    }
-
-    private void enterTestPin(UiObject view) throws Exception {
-        mDevice.waitForIdle();
-        view.setText("12345");
-        mDevice.pressEnter();
-        mDevice.waitForIdle();
-    }
-
-    private boolean isSecureWindow(Activity activity) {
-        return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_SECURE)
-                != 0;
-    }
-}
diff --git a/tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java
deleted file mode 100644
index 36611cf50bf6eaef8eb0ac38a874784c9ae7542f..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.pressKey;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.hamcrest.CoreMatchers.not;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.action.ViewActions;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.runner.AndroidJUnit4;
-import android.view.KeyEvent;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ChooseLockPasswordTest {
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void clearNotVisible_when_activityLaunchedInitially() {
-        mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
-        onView(withId(R.id.clear_button)).check(matches(
-                withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
-    }
-
-    @Test
-    public void clearNotEnabled_when_nothingEntered() {
-        mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.clear_button)).check(matches(isDisplayed()))
-            .check(matches(not(isEnabled())));
-    }
-
-    @Test
-    public void clearEnabled_when_somethingEnteredToConfirm() {
-        mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
-                .perform(ViewActions.typeText("1"));
-        // clear should be present if text field contains content
-        onView(withId(R.id.clear_button)).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java b/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
deleted file mode 100644
index 25e7da05edc330d3c9c4a812a536dcd6025f02a2..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.pressKey;
-import static android.support.test.espresso.action.ViewActions.typeText;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.view.KeyEvent;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ConfirmLockPasswordTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void enterWrongPin_shouldShowErrorMessage() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, ConfirmLockPassword.class));
-        onView(withId(R.id.password_entry)).perform(typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.errorText)).check(matches(withText(R.string.lockpassword_invalid_pin)));
-    }
-
-    @Test
-    public void enterWrongPin_darkTheme_shouldShowErrorMessage() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, ConfirmLockPassword.class)
-                        .putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, true));
-        onView(withId(R.id.password_entry)).perform(typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.errorText)).check(matches(withText(R.string.lockpassword_invalid_pin)));
-    }
-}
diff --git a/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
deleted file mode 100644
index 3a6c39c5c68ca764b67b016864a7b0f8696037a5..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.pressKey;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.hamcrest.CoreMatchers.not;
-
-import android.support.test.espresso.action.ViewActions;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.view.KeyEvent;
-
-import com.android.settings.R;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class SetupChooseLockPasswordAppTest {
-
-    @Rule
-    public ActivityTestRule<SetupChooseLockPassword> mActivityTestRule =
-            new ActivityTestRule<>(
-                    SetupChooseLockPassword.class,
-                    true /* enable touch at launch */,
-                    false /* don't launch at every test */);
-
-    @Test
-    public void testSkipDialogIsShown() throws Throwable {
-        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
-
-        onView(withId(R.id.cancel_button))
-                .check(matches(withText(R.string.skip_label)))
-                .check(matches(isDisplayed()))
-                .perform(click());
-        onView(withId(android.R.id.button1)).check(matches(isDisplayed())).perform(click());
-
-        assertThat(activity.isFinishing()).named("Is finishing").isTrue();
-    }
-
-    @Test
-    public void clearNotVisible_when_activityLaunchedInitially() {
-        mActivityTestRule.launchActivity(null);
-        onView(withId(R.id.clear_button)).check(matches(
-                withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
-    }
-
-    @Test
-    public void clearNotEnabled_when_nothingEntered() throws Throwable {
-        mActivityTestRule.launchActivity(null);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.clear_button)).check(matches(isDisplayed()))
-                .check(matches(not(isEnabled())));
-    }
-
-    @Test
-    public void clearEnabled_when_somethingEnteredToConfirm() {
-        mActivityTestRule.launchActivity(null);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
-                .perform(ViewActions.typeText("1"));
-        // clear should be present if text field contains content
-        onView(withId(R.id.clear_button)).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
deleted file mode 100644
index d342881915579ddbd66d787f6e966d180767f896..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.widget.SearchView;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.AllOf.allOf;
-
-import com.android.settings.R;
-
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SearchFragmentEspressoTest {
-    @Rule
-    public ActivityTestRule<SearchActivity> mActivityRule =
-            new ActivityTestRule<>(SearchActivity.class, true, true);
-
-    @Test
-    public void test_OpenKeyboardOnSearchLaunch() {
-        onView(allOf(hasFocus(), withId(R.id.search_view)))
-                .check(matches(withClassName(containsString(SearchView.class.getName()))));
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/app/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
deleted file mode 100644
index a2cdafe8aa4c46bd59c26ce36e5d799335b53bb5..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Activity;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-
-public class BluetoothRequestPermissionTest extends Activity {
-    private static final String TAG = "BluetoothRequestPermissionTest";
-    BluetoothAdapter mAdapter;
-    private ArrayAdapter<String> mMsgAdapter;
-
-    // Discoverable button alternates between 20 second timeout and no timeout.
-    private boolean mDiscoveryWithTimeout = true;
-
-    private class BtOnClickListener implements OnClickListener {
-        final boolean mEnableOnly; // enable or enable + discoverable
-
-        public BtOnClickListener(boolean enableOnly) {
-            mEnableOnly = enableOnly;
-        }
-
-        public void onClick(View v) {
-            requestPermission(mEnableOnly);
-        }
-    }
-
-    private class BtScanOnClickListener implements OnClickListener {
-        public void onClick(View v) {
-            Button scanButton = (Button) v;
-            if (mAdapter.isDiscovering()) {
-                mAdapter.cancelDiscovery();
-                scanButton.setText(R.string.start_scan);
-            } else {
-                mAdapter.startDiscovery();
-                scanButton.setText(R.string.stop_scan);
-            }
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.bluetooth_request_permission_test);
-        mAdapter = BluetoothAdapter.getDefaultAdapter();
-
-        Button enable = (Button) findViewById(R.id.enable);
-        enable.setOnClickListener(new BtOnClickListener(true /* enable */));
-
-        Button discoverable = (Button) findViewById(R.id.discoverable);
-        discoverable.setOnClickListener(new BtOnClickListener(false /* enable & discoverable */));
-
-        Button scanButton = (Button) findViewById(R.id.scan);
-        scanButton.setOnClickListener(new BtScanOnClickListener());
-        if (mAdapter.isDiscovering()) {
-            scanButton.setText(R.string.stop_scan);
-        } else {
-            scanButton.setText(R.string.start_scan);
-        }
-
-        mMsgAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
-
-        ListView listView = (ListView) findViewById(R.id.msg_container);
-        listView.setAdapter(mMsgAdapter);
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        filter.addAction(BluetoothDevice.ACTION_FOUND);
-        registerReceiver(mReceiver, filter);
-        addMsg("Initialized");
-    }
-
-    void requestPermission(boolean enableOnly) {
-        Intent i = new Intent();
-        if (enableOnly) {
-            addMsg("Starting activity to enable bt");
-            i.setAction(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-        } else {
-            addMsg("Starting activity to enable bt + discovery");
-            i.setAction(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
-            // Discoverability duration toggles between 20 seconds and no timeout.
-            int timeout = (mDiscoveryWithTimeout ? 20 : 0);
-            i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, timeout);
-            mDiscoveryWithTimeout = !mDiscoveryWithTimeout;
-        }
-        startActivityForResult(i, 1);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode != 1) {
-            Log.e(TAG, "Unexpected onActivityResult " + requestCode + " " + resultCode);
-            return;
-        }
-
-        if (resultCode == Activity.RESULT_CANCELED) {
-            addMsg("Result = RESULT_CANCELED");
-        } else if (resultCode == Activity.RESULT_OK) {
-            addMsg("Result = RESULT_OK (not expected for discovery)");
-        } else {
-            addMsg("Result = " + resultCode);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unregisterReceiver(mReceiver);
-    }
-
-    private void addMsg(String msg) {
-        mMsgAdapter.add(msg);
-        Log.d(TAG, "msg");
-    }
-
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent == null)
-                return;
-            String action = intent.getAction();
-            if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
-                String stateStr = "???";
-                switch (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothDevice.ERROR)) {
-                    case BluetoothAdapter.STATE_OFF:
-                        stateStr = "off";
-                        break;
-                    case BluetoothAdapter.STATE_TURNING_ON:
-                        stateStr = "turning on";
-                        break;
-                    case BluetoothAdapter.STATE_ON:
-                        stateStr = "on";
-                        break;
-                    case BluetoothAdapter.STATE_TURNING_OFF:
-                        stateStr = "turning off";
-                        break;
-                }
-                addMsg("Bluetooth status = " + stateStr);
-            } else if (action.equals(BluetoothDevice.ACTION_FOUND)) {
-                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
-                addMsg("Found: " + name);
-            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_STARTED)) {
-                addMsg("Scan started...");
-            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
-                addMsg("Scan ended");
-            }
-        }
-    };
-}
diff --git a/tests/app/src/com/android/settings/tests/DashboardAdapterTest.java b/tests/app/src/com/android/settings/tests/DashboardAdapterTest.java
deleted file mode 100644
index 4b8e6cf4bc482b3234a1eea846ab121a34b83919..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/DashboardAdapterTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.tests;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import com.android.settings.R;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.*;
-import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
-import static org.hamcrest.core.AllOf.allOf;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DashboardAdapterTest {
-    @Before
-    public void SetUp() {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(Settings
-                .ACTION_SETTINGS));
-    }
-
-    @Test
-    public void testTileConsistency_ToggleSuggestionsAndOpenBluetooth_shouldInBluetooth()
-            throws Exception{
-        final Context context = InstrumentationRegistry.getTargetContext();
-
-        onView(allOf(withText(context.getString(R.string.suggestions_title)),
-                withEffectiveVisibility(VISIBLE))).perform(click());
-        onView(allOf(withText(context.getString(R.string.bluetooth_settings)),
-                withEffectiveVisibility(VISIBLE))).perform(click());
-
-        // It should go to Bluetooth sub page, not other page or crash
-        onView(allOf(withText(context.getString(R.string.bluetooth_settings)),
-                withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
-
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java b/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java
deleted file mode 100644
index 234f8e6b1513303cc54c9dde061a547506d09f62..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
-import org.junit.runner.RunWith;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Test;
-import com.android.settings.R;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.core.IsNot.not;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DrawOverlayDetailsTest {
-    private final static String PACKAGE_SYSTEM_UI = "com.android.systemui";
-
-    @Test
-    public void testSystemUiDrawOverlayDetails_Disabled() throws Exception{
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(android.provider.Settings
-                .ACTION_MANAGE_OVERLAY_PERMISSION));
-
-        final Context targetContext = instrumentation.getTargetContext();
-
-        final PackageManager packageManager = targetContext.getPackageManager();
-        final String appName = (String) packageManager.getApplicationLabel(packageManager
-                .getApplicationInfo(PACKAGE_SYSTEM_UI, PackageManager.GET_META_DATA));
-
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(targetContext.getString(R.string.menu_show_system))).perform(click());
-        onView(withText(appName)).perform(click());
-        onView(withText(targetContext.getString(R.string.permit_draw_overlay))).check(matches
-                (not(isEnabled())));
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/tests/KeepOnScreenTest.java b/tests/app/src/com/android/settings/tests/KeepOnScreenTest.java
deleted file mode 100644
index 0b1308e6d03055df2e9af49a94fe8238f8566985..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/KeepOnScreenTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Test;
-import com.android.settings.R;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.*;
-import static junit.framework.Assert.assertEquals;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class KeepOnScreenTest {
-    private static int EXPECTED_FLAG = BatteryManager.BATTERY_PLUGGED_AC
-            | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
-
-    @Test
-    public void testStayAwake_turnOn_StayAwakeWhileWirelessCharging() throws Exception{
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(android.provider.Settings
-                .ACTION_APPLICATION_DEVELOPMENT_SETTINGS));
-
-        final Context targetContext = instrumentation.getTargetContext();
-        final int prevFlag = Settings.Global.getInt(targetContext.getContentResolver(), Settings
-                .Global.STAY_ON_WHILE_PLUGGED_IN);
-
-        // Turn on "Stay Awake" if needed
-        if (prevFlag == 0) {
-            onView(withText(R.string.keep_screen_on)).perform(click());
-        }
-
-        final int currentFlag = Settings.Global.getInt(targetContext.getContentResolver(), Settings
-                .Global.STAY_ON_WHILE_PLUGGED_IN);
-
-        assertEquals(EXPECTED_FLAG, currentFlag);
-
-        // Since this app doesn't have permission(and shouldn't have) to change global setting, we
-        // can only tearDown in this way
-        if (prevFlag != currentFlag) {
-            onView(withText(R.string.keep_screen_on)).perform(click());
-        }
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/Manufacturer.java b/tests/app/src/com/android/settings/tests/Manufacturer.java
deleted file mode 100644
index 692e6a8c287594d37b8c85b56aee0ed73ffb1ad4..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/Manufacturer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Manufacturer extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.manufacturer_main);
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/Operator.java b/tests/app/src/com/android/settings/tests/Operator.java
deleted file mode 100644
index 8a34363da2a9593b65c565c8c7a6921f44f92ffd..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/Operator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Operator extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.operator_main);
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java b/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
deleted file mode 100644
index 6289f1b449af95ccbfc33d49a913d845db17e652..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.tests;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.Settings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PrivateVolumeSettingsTest {
-    @Test
-    public void test_ManageStorageNotShown() {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(
-                new Intent(android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS));
-        onView(withText(com.android.settings.R.string.storage_menu_manage)).check(doesNotExist());
-    }
-}
\ No newline at end of file
diff --git a/tests/app/src/com/android/settings/tests/SettingsLaunchPerformance.java b/tests/app/src/com/android/settings/tests/SettingsLaunchPerformance.java
deleted file mode 100644
index 225a60b6309ed6b1ad281ae78ef9e57e7cb1303c..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/SettingsLaunchPerformance.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Activity;
-import android.test.LaunchPerformanceBase;
-import android.os.Bundle;
-
-import java.util.Map;
-
-/**
- * Instrumentation class for Settings launch performance testing.
- */
-public class SettingsLaunchPerformance extends LaunchPerformanceBase {
-
-    public static final String LOG_TAG = "SettingsLaunchPerformance";
-
-    public SettingsLaunchPerformance() {
-        super();
-    }
-
-    @Override
-    public void onCreate(Bundle arguments) {
-        super.onCreate(arguments);
-
-        mIntent.setClassName(getTargetContext(), "com.android.settings.Settings");
-        start();
-    }
-
-    /**
-     * Calls LaunchApp and finish.
-     */
-    @Override
-    public void onStart() {
-        super.onStart();
-        LaunchApp();
-        finish(Activity.RESULT_OK, mResults);
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java b/tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
deleted file mode 100644
index 96bc78c9f00b79994a5acfa9d00a879452c09d63..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.tests;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SettingsRestoreAfterCloseTest {
-    private static final String PACKAGE_SETTINGS = "com.android.settings";
-    private static final int TIME_OUT = 2000;
-
-    private boolean mAlwaysFinish;
-
-    @Before
-    public void setUp() throws Exception {
-        // To make sure when we press home button, the activity will be destroyed by OS
-        Context context = InstrumentationRegistry.getContext();
-        mAlwaysFinish = Settings.Global.getInt(
-                context.getContentResolver(), Settings.Global
-                .ALWAYS_FINISH_ACTIVITIES, 0)
-                != 0;
-
-        ActivityManager.getService().setAlwaysFinish(true);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        ActivityManager.getService().setAlwaysFinish(mAlwaysFinish);
-    }
-
-    @Test
-    public void testRtlStability_AppCloseAndReOpen_shouldNotCrash() throws Exception {
-
-        final UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation
-                ());
-        uiDevice.pressHome();
-
-        // Open the settings app
-        startSettingsMainActivity(uiDevice);
-
-        // Press home button
-        uiDevice.pressHome();
-        final String launcherPackage = uiDevice.getLauncherPackageName();
-        uiDevice.wait(Until.hasObject(By.pkg(launcherPackage).depth(0)), TIME_OUT);
-
-        // Open the settings again
-        startSettingsMainActivity(uiDevice);
-    }
-
-    private void startSettingsMainActivity(UiDevice uiDevice) {
-        Context context = InstrumentationRegistry.getContext();
-        context.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS));
-        uiDevice.wait(Until.hasObject(By.pkg(PACKAGE_SETTINGS).depth(0)), TIME_OUT);
-    }
-}
diff --git a/tests/app/src/com/android/settings/users/UserSettingsTest.java b/tests/app/src/com/android/settings/users/UserSettingsTest.java
deleted file mode 100644
index 06e2bdde3f1ac4198c982145beda6824e2bbe133..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/users/UserSettingsTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.users;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.filters.SmallTest;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.UiScrollable;
-import android.test.InstrumentationTestCase;
-
-import com.android.settings.R;
-
-import org.junit.Test;
-
-@SmallTest
-public class UserSettingsTest extends InstrumentationTestCase {
-
-    private static final String USER_AND_ACCOUNTS = "Users & accounts";
-    private static final String USERS = "Users";
-    private static final String EMERGNENCY_INFO = "Emergency information";
-    private static final String ADD_USERS_WHEN_LOCKED = "Add users";
-
-    private UiDevice mDevice;
-    private Context mContext;
-    private String mTargetPackage;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mContext = getInstrumentation().getTargetContext();
-        mTargetPackage = mContext.getPackageName();
-    }
-
-    @Test
-    public void testEmergencyInfoNotExists() throws Exception {
-        launchUserSettings();
-        UiObject emergencyInfoPreference =
-            mDevice.findObject(new UiSelector().text(EMERGNENCY_INFO));
-        assertFalse(emergencyInfoPreference.exists());
-    }
-
-    @Test
-    public void testAddUsersWhenLockedNotExists() throws Exception {
-        launchUserSettings();
-        UiObject addUsersPreference =
-            mDevice.findObject(new UiSelector().text(ADD_USERS_WHEN_LOCKED));
-        assertFalse(addUsersPreference.exists());
-    }
-
-    private void launchSettings() {
-        Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_LAUNCHER)
-                .setPackage(mTargetPackage)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(settingsIntent);
-    }
-
-    private void launchUserSettings() throws Exception  {
-        launchSettings();
-        final UiScrollable settings = new UiScrollable(
-                new UiSelector().packageName(mTargetPackage).scrollable(true));
-        final String titleUsersAndAccounts = USER_AND_ACCOUNTS;
-        settings.scrollTextIntoView(titleUsersAndAccounts);
-        mDevice.findObject(new UiSelector().text(titleUsersAndAccounts)).click();
-        mDevice.findObject(new UiSelector().text(USERS)).click();
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/vpn2/CertInstallerHelper.java b/tests/app/src/com/android/settings/vpn2/CertInstallerHelper.java
deleted file mode 100644
index fa2638ff9951f0ae3cd72b4900a5aba17adfdcdb..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/vpn2/CertInstallerHelper.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import android.os.Environment;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.util.Log;
-
-import com.android.internal.net.VpnProfile;
-import com.android.org.bouncycastle.asn1.ASN1InputStream;
-import com.android.org.bouncycastle.asn1.ASN1Sequence;
-import com.android.org.bouncycastle.asn1.DEROctetString;
-import com.android.org.bouncycastle.asn1.x509.BasicConstraints;
-
-import junit.framework.Assert;
-
-import libcore.io.Streams;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.KeyStore.PasswordProtection;
-import java.security.KeyStore.PrivateKeyEntry;
-import java.security.PrivateKey;
-import java.security.UnrecoverableEntryException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-
-/**
- * Certificate installer helper to extract information from a provided file
- * and install certificates to keystore.
- */
-public class CertInstallerHelper {
-    private static final String TAG = "CertInstallerHelper";
-    /* Define a password to unlock keystore after it is reset */
-    private static final String CERT_STORE_PASSWORD = "password";
-    private final int mUid = KeyStore.UID_SELF;
-    private PrivateKey mUserKey;  // private key
-    private X509Certificate mUserCert;  // user certificate
-    private List<X509Certificate> mCaCerts = new ArrayList<X509Certificate>();
-    private KeyStore mKeyStore = KeyStore.getInstance();
-
-    /**
-     * Unlock keystore and set password
-     */
-    public CertInstallerHelper() {
-        mKeyStore.reset();
-        mKeyStore.onUserPasswordChanged(CERT_STORE_PASSWORD);
-    }
-
-    private void extractCertificate(String certFile, String password) {
-        InputStream in = null;
-        final byte[] raw;
-        java.security.KeyStore keystore = null;
-        try {
-            // Read .p12 file from SDCARD and extract with password
-            in = new FileInputStream(new File(
-                    Environment.getExternalStorageDirectory(), certFile));
-            raw = Streams.readFully(in);
-
-            keystore = java.security.KeyStore.getInstance("PKCS12");
-            PasswordProtection passwordProtection = new PasswordProtection(password.toCharArray());
-            keystore.load(new ByteArrayInputStream(raw), passwordProtection.getPassword());
-
-            // Install certificates and private keys
-            Enumeration<String> aliases = keystore.aliases();
-            if (!aliases.hasMoreElements()) {
-                Assert.fail("key store failed to put in keychain");
-            }
-            ArrayList<String> aliasesList = Collections.list(aliases);
-            // The keystore is initialized for each test case, there will
-            // be only one alias in the keystore
-            Assert.assertEquals(1, aliasesList.size());
-            String alias = aliasesList.get(0);
-            java.security.KeyStore.Entry entry = keystore.getEntry(alias, passwordProtection);
-            Log.d(TAG, "extracted alias = " + alias + ", entry=" + entry.getClass());
-
-            if (entry instanceof PrivateKeyEntry) {
-                Assert.assertTrue(installFrom((PrivateKeyEntry) entry));
-            }
-        } catch (IOException e) {
-            Assert.fail("Failed to read certficate: " + e);
-        } catch (KeyStoreException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        } catch (NoSuchAlgorithmException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        } catch (CertificateException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        } catch (UnrecoverableEntryException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        }
-        finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    Log.e(TAG, "close FileInputStream error: " + e);
-                }
-            }
-        }
-    }
-
-    /**
-     * Extract private keys, user certificates and ca certificates
-     */
-    private synchronized boolean installFrom(PrivateKeyEntry entry) {
-        mUserKey = entry.getPrivateKey();
-        mUserCert = (X509Certificate) entry.getCertificate();
-
-        Certificate[] certs = entry.getCertificateChain();
-        Log.d(TAG, "# certs extracted = " + certs.length);
-        mCaCerts = new ArrayList<X509Certificate>(certs.length);
-        for (Certificate c : certs) {
-            X509Certificate cert = (X509Certificate) c;
-            if (isCa(cert)) {
-                mCaCerts.add(cert);
-            }
-        }
-        Log.d(TAG, "# ca certs extracted = " + mCaCerts.size());
-        return true;
-    }
-
-    private boolean isCa(X509Certificate cert) {
-        try {
-            byte[] asn1EncodedBytes = cert.getExtensionValue("2.5.29.19");
-            if (asn1EncodedBytes == null) {
-                return false;
-            }
-            DEROctetString derOctetString = (DEROctetString)
-                    new ASN1InputStream(asn1EncodedBytes).readObject();
-            byte[] octets = derOctetString.getOctets();
-            ASN1Sequence sequence = (ASN1Sequence)
-                    new ASN1InputStream(octets).readObject();
-            return BasicConstraints.getInstance(sequence).isCA();
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Extract certificate from the given file, and install it to keystore
-     * @param name certificate name
-     * @param certFile .p12 file which includes certificates
-     * @param password password to extract the .p12 file
-     */
-    public void installCertificate(VpnProfile profile, String certFile, String password) {
-        // extract private keys, certificates from the provided file
-        extractCertificate(certFile, password);
-        // install certificate to the keystore
-        int flags = KeyStore.FLAG_ENCRYPTED;
-        try {
-            if (mUserKey != null) {
-                Log.v(TAG, "has private key");
-                String key = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
-                byte[] value = mUserKey.getEncoded();
-
-                if (!mKeyStore.importKey(key, value, mUid, flags)) {
-                    Log.e(TAG, "Failed to install " + key + " as user " + mUid);
-                    return;
-                }
-                Log.v(TAG, "install " + key + " as user " + mUid + " is successful");
-            }
-
-            if (mUserCert != null) {
-                String certName = Credentials.USER_CERTIFICATE + profile.ipsecUserCert;
-                byte[] certData = Credentials.convertToPem(mUserCert);
-
-                if (!mKeyStore.put(certName, certData, mUid, flags)) {
-                    Log.e(TAG, "Failed to install " + certName + " as user " + mUid);
-                    return;
-                }
-                Log.v(TAG, "install " + certName + " as user" + mUid + " is successful.");
-            }
-
-            if (!mCaCerts.isEmpty()) {
-                String caListName = Credentials.CA_CERTIFICATE + profile.ipsecCaCert;
-                X509Certificate[] caCerts = mCaCerts.toArray(new X509Certificate[mCaCerts.size()]);
-                byte[] caListData = Credentials.convertToPem(caCerts);
-
-                if (!mKeyStore.put(caListName, caListData, mUid, flags)) {
-                    Log.e(TAG, "Failed to install " + caListName + " as user " + mUid);
-                    return;
-                }
-                Log.v(TAG, " install " + caListName + " as user " + mUid + " is successful");
-            }
-        } catch (CertificateEncodingException e) {
-            Log.e(TAG, "Exception while convert certificates to pem " + e);
-            throw new AssertionError(e);
-        } catch (IOException e) {
-            Log.e(TAG, "IOException while convert to pem: " + e);
-        }
-    }
-
-    public int getUid() {
-        return mUid;
-    }
-}
diff --git a/tests/app/src/com/android/settings/vpn2/VpnInfo.java b/tests/app/src/com/android/settings/vpn2/VpnInfo.java
deleted file mode 100644
index ab7fb0f3d07b82fd92ca7d53fa9441d5261fb139..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/vpn2/VpnInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import com.android.internal.net.VpnProfile;
-
-/**
- * Wrapper for VPN Profile and associated certificate files
- */
-public class VpnInfo {
-    // VPN Profile
-    private VpnProfile mVpnProfile;
-    // Certificate file in PC12 format for user certificates and private keys
-    private String mCertificateFile = null;
-    // Password to extract certificates from the file
-    private String mPassword = null;
-
-    public VpnInfo(VpnProfile vpnProfile, String certFile, String password) {
-        mVpnProfile = vpnProfile;
-        mCertificateFile = certFile;
-        mPassword = password;
-    }
-
-    public VpnInfo(VpnProfile vpnProfile) {
-        mVpnProfile = vpnProfile;
-    }
-
-    public void setVpnProfile(VpnProfile vpnProfile) {
-        mVpnProfile = vpnProfile;
-    }
-
-    public void setCertificateFile(String certFile) {
-        mCertificateFile = certFile;
-    }
-
-    public void setPassword(String password) {
-        mPassword = password;
-    }
-
-    public VpnProfile getVpnProfile() {
-        return mVpnProfile;
-    }
-
-    public String getCertificateFile() {
-        return mCertificateFile;
-    }
-
-    public String getPassword() {
-        return mPassword;
-    }
-}
diff --git a/tests/app/src/com/android/settings/vpn2/VpnProfileParser.java b/tests/app/src/com/android/settings/vpn2/VpnProfileParser.java
deleted file mode 100644
index 51c2550eb1d7552e2c182a253d04a90607da2b16..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/vpn2/VpnProfileParser.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import android.util.Log;
-
-import com.android.internal.net.VpnProfile;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-/**
- * Parse VPN profiles from an XML file
- */
-public class VpnProfileParser {
-    private final static String TAG = "VpnProfileParser";
-    private static Map<Integer, VpnInfo> mVpnPool = new HashMap<Integer, VpnInfo>();
-
-    static DefaultHandler mHandler = new DefaultHandler() {
-        boolean name;
-        boolean type;
-        boolean server;
-        boolean username;
-        boolean password;
-        boolean dnsServers;
-        boolean searchDomains;
-        boolean routes;
-        boolean mppe;
-        boolean l2tpSecret;
-        boolean ipsecIdentifier;
-        boolean ipsecSecret;
-        boolean ipsecUserCert;
-        boolean ipsecCaCert;
-        boolean ipsecServerCert;
-        boolean certFile;
-        boolean certFilePassword;
-        VpnProfile profile = null;
-        VpnInfo vpnInfo = null;
-
-
-        @Override
-        public void startElement(String uri, String localName, String tagName,
-                Attributes attributes) throws SAXException {
-            if (tagName.equalsIgnoreCase("vpn")) {
-                //create a new VPN profile
-                profile = new VpnProfile(Long.toHexString(System.currentTimeMillis()));
-                vpnInfo = new VpnInfo(profile);
-            }
-            if (tagName.equalsIgnoreCase("name")) {
-                name = true;
-            }
-            if (tagName.equalsIgnoreCase("type")) {
-                type = true;
-            }
-            if (tagName.equalsIgnoreCase("server")) {
-                server = true;
-            }
-            if (tagName.equalsIgnoreCase("username")) {
-                username = true;
-            }
-            if (tagName.equalsIgnoreCase("password")) {
-                password = true;
-            }
-            if (tagName.equalsIgnoreCase("dnsServers")) {
-                dnsServers = true;
-            }
-            if (tagName.equalsIgnoreCase("searchDomains")) {
-                searchDomains = true;
-            }
-            if (tagName.equalsIgnoreCase("mppe")) {
-                mppe = true;
-            }
-            if (tagName.equalsIgnoreCase("l2tpSecret")) {
-                l2tpSecret = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecIdentifier")) {
-                ipsecIdentifier = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecSecret")) {
-                ipsecSecret = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecUserCert")) {
-                ipsecUserCert = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecCaCert")) {
-                ipsecCaCert = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecServerCert")) {
-                ipsecServerCert = true;
-            }
-            if (tagName.equalsIgnoreCase("routes")) {
-                routes = true;
-            }
-            if (tagName.equalsIgnoreCase("cert-file")) {
-                certFile = true;
-            }
-            if (tagName.equalsIgnoreCase("cert-file-password")) {
-                certFilePassword = true;
-            }
-        }
-
-        @Override
-        public void endElement(String uri, String localName, String tagName) throws SAXException {
-            if (tagName.equalsIgnoreCase("vpn")) {
-                mVpnPool.put(profile.type, vpnInfo);
-            }
-        }
-
-        @Override
-        public void characters(char ch[], int start, int length) throws SAXException {
-            String strValue = new String(ch, start, length);
-            if (name) {
-                profile.name = strValue;
-                name = false;
-            }
-            if (type) {
-                int t = getVpnProfileType(strValue);
-                if (t < 0) {
-                    throw new SAXException("not a valid VPN type");
-                } else {
-                    profile.type = t;
-                }
-                type = false;
-            }
-            if (server) {
-                profile.server = strValue;
-                server = false;
-            }
-            if (username) {
-                profile.username = strValue;
-                username = false;
-            }
-            if (password) {
-                profile.password = strValue;
-                password = false;
-            }
-            if (dnsServers) {
-                profile.dnsServers = strValue;
-                dnsServers = false;
-            }
-            if (searchDomains) {
-                profile.searchDomains = strValue;
-                searchDomains = false;
-            }
-            if (mppe) {
-                profile.mppe = Boolean.valueOf(strValue);
-                mppe = false;
-            }
-            if (l2tpSecret) {
-                profile.l2tpSecret = strValue;
-                l2tpSecret = false;
-            }
-            if (ipsecIdentifier) {
-                profile.ipsecIdentifier = strValue;
-                ipsecIdentifier = false;
-            }
-            if (ipsecSecret) {
-                profile.ipsecSecret = strValue;
-                ipsecSecret = false;
-            }
-            if (ipsecUserCert) {
-                profile.ipsecUserCert = strValue;
-                ipsecUserCert = false;
-            }
-            if (ipsecCaCert) {
-                profile.ipsecCaCert = strValue;
-                ipsecCaCert = false;
-            }
-            if (ipsecServerCert) {
-                profile.ipsecServerCert = strValue;
-                ipsecServerCert = false;
-            }
-            if (routes) {
-                profile.routes = strValue;
-                routes = false;
-            }
-            if (certFile) {
-                vpnInfo.setCertificateFile(strValue);
-                certFile = false;
-            }
-            if (certFilePassword) {
-                vpnInfo.setPassword(strValue);
-                certFilePassword = false;
-            }
-        }
-
-        private int getVpnProfileType(String type) {
-            if (type.equalsIgnoreCase("TYPE_PPTP")) {
-                return VpnProfile.TYPE_PPTP;
-            } else if (type.equalsIgnoreCase("TYPE_L2TP_IPSEC_PSK")) {
-                return VpnProfile.TYPE_L2TP_IPSEC_PSK;
-            } else if (type.equalsIgnoreCase("TYPE_L2TP_IPSEC_RSA")) {
-                return VpnProfile.TYPE_L2TP_IPSEC_RSA;
-            } else if (type.equalsIgnoreCase("TYPE_IPSEC_XAUTH_PSK")) {
-                return VpnProfile.TYPE_IPSEC_XAUTH_PSK;
-            } else if (type.equalsIgnoreCase("TYPE_IPSEC_XAUTH_RSA")) {
-                return VpnProfile.TYPE_IPSEC_XAUTH_RSA;
-            } else if (type.equalsIgnoreCase("TYPE_IPSEC_HYBRID_RSA")) {
-                return VpnProfile.TYPE_IPSEC_HYBRID_RSA;
-            } else {
-                Log.v(TAG, "Invalid VPN type: " + type);
-                return -1;
-            }
-        }
-    };
-
-    public static Map<Integer, VpnInfo> parse(InputStream in) {
-        try {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            SAXParser saxParser = factory.newSAXParser();
-            saxParser.parse(in, mHandler);
-        } catch (SAXException e) {
-            Log.e(TAG, "Parse vpn profile exception: " + e.toString());
-        } catch (IOException e) {
-            Log.e(TAG, "Parse vpn profile exception: " + e.toString());
-        } catch (ParserConfigurationException e) {
-            Log.e(TAG, "Parse vpn profile exception: " + e.toString());
-        } finally {
-            return mVpnPool;
-        }
-    }
-}
diff --git a/tests/app/src/com/android/settings/vpn2/VpnTests.java b/tests/app/src/com/android/settings/vpn2/VpnTests.java
deleted file mode 100644
index 11e82655c69e9cb2561129a064fdea305a229ec1..0000000000000000000000000000000000000000
--- a/tests/app/src/com/android/settings/vpn2/VpnTests.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import android.content.Context;
-import android.net.IConnectivityManager;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.security.NetworkSecurityPolicy;
-import android.test.InstrumentationTestCase;
-import android.test.InstrumentationTestRunner;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-
-import com.android.internal.net.LegacyVpnInfo;
-import com.android.internal.net.VpnConfig;
-import com.android.internal.net.VpnProfile;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-import junit.framework.Assert;
-
-import libcore.io.Streams;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Legacy VPN connection tests
- *
- * To run the test, use command:
- * adb shell am instrument -e class com.android.settings.vpn2.VpnTests -e profile foo.xml
- * -w com.android.settings.tests/android.test.InstrumentationTestRunner
- *
- * VPN profiles are saved in an xml file and will be loaded through {@link VpnProfileParser}.
- * Push the profile (foo.xml) to the external storage, e.g adb push foo.xml /sdcard/ before running
- * the above command.
- *
- * A typical profile looks like the following:
- * <vpn>
- *   <name></name>
- *   <type></type>
- *   <server></server>
- *   <username></username>
- *   <password></password>
- *   <dnsServers></dnsServers>
- *   <searchDomains></searchDomains>
- *   <routes></routes>
- *   <l2tpSecret></l2tpSecret>
- *   <ipsecIdentifier></ipsecIdentifier>
- *   <ipsecSecret></ipsecSecret>
- *   <ipsecUserCert></ipsecUserCert>
- *   <ipsecCaCert></ipsecCaCert>
- *   <ipsecServerCert></ipsecServerCert>
- * </vpn>
- * VPN types include: TYPE_PPTP, TYPE_L2TP_IPSEC_PSK, TYPE_L2TP_IPSEC_RSA,
- * TYPE_IPSEC_XAUTH_PSK, TYPE_IPSEC_XAUTH_RSA, TYPE_IPSEC_HYBRID_RSA
- */
-public class VpnTests extends InstrumentationTestCase {
-    private static final String TAG = "VpnTests";
-    /* Maximum time to wait for VPN connection */
-    private static final long MAX_CONNECTION_TIME = 5 * 60 * 1000;
-    private static final long VPN_STAY_TIME = 60 * 1000;
-    private static final int MAX_DISCONNECTION_TRIES = 3;
-    private static final String EXTERNAL_SERVER =
-            "http://ip2country.sourceforge.net/ip2c.php?format=JSON";
-    private static final String VPN_INTERFACE = "ppp0";
-    private final IConnectivityManager mService = IConnectivityManager.Stub
-        .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
-    private Map<Integer, VpnInfo> mVpnInfoPool = null;
-    private Context mContext;
-    private CertInstallerHelper mCertHelper = null;
-    private KeyStore mKeyStore = KeyStore.getInstance();
-    private String mPreviousIpAddress = null;
-    private boolean DEBUG = false;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        InputStream in = null;
-        InstrumentationTestRunner mRunner = (InstrumentationTestRunner)getInstrumentation();
-        mContext = mRunner.getContext();
-        Bundle arguments = mRunner.getArguments();
-        String PROFILE_NAME = arguments.getString("profile");
-        Assert.assertNotNull("Push profile to external storage and load with"
-                + "'-e profile <filename>'", PROFILE_NAME);
-        File profileFile = new File(Environment.getExternalStorageDirectory(), PROFILE_NAME);
-        in = new FileInputStream(profileFile);
-        mVpnInfoPool = VpnProfileParser.parse(in);
-        Assert.assertNotNull("no VPN profiles are parsed", mVpnInfoPool);
-        if (DEBUG) {
-            Log.v(TAG, "print out the vpn profiles");
-            for (Map.Entry<Integer, VpnInfo> profileEntrySet: mVpnInfoPool.entrySet()) {
-                VpnInfo vpnInfo = profileEntrySet.getValue();
-                printVpnProfile(vpnInfo.getVpnProfile());
-                if (vpnInfo.getCertificateFile() != null) {
-                    Log.d(TAG, "certificate file for this vpn is " + vpnInfo.getCertificateFile());
-                }
-                if (vpnInfo.getPassword() != null) {
-                    Log.d(TAG, "password for the certificate file is: " + vpnInfo.getPassword());
-                }
-            }
-        }
-        // disconnect existing vpn if there is any
-        LegacyVpnInfo oldVpn = mService.getLegacyVpnInfo(UserHandle.myUserId());
-        if (oldVpn != null) {
-            Log.v(TAG, "disconnect legacy VPN");
-            disconnect();
-            // wait till the legacy VPN is disconnected.
-            int tries = 0;
-            while (tries < MAX_DISCONNECTION_TRIES &&
-                    mService.getLegacyVpnInfo(UserHandle.myUserId()) != null) {
-                tries++;
-                Thread.sleep(10 * 1000);
-                Log.v(TAG, "Wait for legacy VPN to be disconnected.");
-            }
-            Assert.assertNull("Failed to disconect VPN",
-                    mService.getLegacyVpnInfo(UserHandle.myUserId()));
-            // wait for 30 seconds after the previous VPN is disconnected.
-            sleep(30 * 1000);
-        }
-        // Create CertInstallerHelper to initialize the keystore
-        mCertHelper = new CertInstallerHelper();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        sleep(VPN_STAY_TIME);
-        super.tearDown();
-    }
-
-    private void printVpnProfile(VpnProfile profile) {
-        Log.v(TAG, "profile: ");
-        Log.v(TAG, "key: " + profile.key);
-        Log.v(TAG, "name: " + profile.name);
-        Log.v(TAG, "type: " + profile.type);
-        Log.v(TAG, "server: " + profile.server);
-        Log.v(TAG, "username: " + profile.username);
-        Log.v(TAG, "password: " + profile.password);
-        Log.v(TAG, "dnsServers: " + profile.dnsServers);
-        Log.v(TAG, "searchDomains: " + profile.searchDomains);
-        Log.v(TAG, "routes: " + profile.routes);
-        Log.v(TAG, "mppe: " + profile.mppe);
-        Log.v(TAG, "l2tpSecret: " + profile.l2tpSecret);
-        Log.v(TAG, "ipsecIdentifier: " + profile.ipsecIdentifier);
-        Log.v(TAG, "ipsecSecret: " + profile.ipsecSecret);
-        Log.v(TAG, "ipsecUserCert: " + profile.ipsecUserCert);
-        Log.v(TAG, "ipsecCaCert: " + profile.ipsecCaCert);
-        Log.v(TAG, "ipsecServerCert: " + profile.ipsecServerCert);
-    }
-
-    private void printKeyStore(VpnProfile profile) {
-        // print out the information from keystore
-        String privateKey = "";
-        String userCert = "";
-        String caCert = "";
-        String serverCert = "";
-        if (!profile.ipsecUserCert.isEmpty()) {
-            privateKey = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
-            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
-            userCert = (value == null) ? null : new String(value, StandardCharsets.UTF_8);
-        }
-        if (!profile.ipsecCaCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.CA_CERTIFICATE + profile.ipsecCaCert);
-            caCert = (value == null) ? null : new String(value, StandardCharsets.UTF_8);
-        }
-        if (!profile.ipsecServerCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecServerCert);
-            serverCert = (value == null) ? null : new String(value, StandardCharsets.UTF_8);
-        }
-        Log.v(TAG, "privateKey: \n" + ((privateKey == null) ? "" : privateKey));
-        Log.v(TAG, "userCert: \n" + ((userCert == null) ? "" : userCert));
-        Log.v(TAG, "caCert: \n" + ((caCert == null) ? "" : caCert));
-        Log.v(TAG, "serverCert: \n" + ((serverCert == null) ? "" : serverCert));
-    }
-
-    /**
-     * Connect legacy VPN
-     */
-    private void connect(VpnProfile profile) throws Exception {
-        try {
-            mService.startLegacyVpn(profile);
-        } catch (IllegalStateException e) {
-            fail(String.format("start legacy vpn: %s failed: %s", profile.name, e.toString()));
-        }
-    }
-
-    /**
-     * Disconnect legacy VPN
-     */
-    private void disconnect() throws Exception {
-        try {
-            mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN, UserHandle.myUserId());
-        } catch (RemoteException e) {
-            Log.e(TAG, String.format("disconnect VPN exception: %s", e.toString()));
-        }
-    }
-
-    /**
-     * Get external IP address
-     */
-    private String getIpAddress() {
-        String ip = null;
-        HttpURLConnection urlConnection = null;
-        // TODO: Rewrite this test to use an HTTPS URL.
-        // Because this test uses cleartext HTTP, the network security policy of this app needs to
-        // be temporarily relaxed to permit such traffic.
-        NetworkSecurityPolicy networkSecurityPolicy = NetworkSecurityPolicy.getInstance();
-        boolean cleartextTrafficPermittedBeforeTest =
-                networkSecurityPolicy.isCleartextTrafficPermitted();
-        networkSecurityPolicy.setCleartextTrafficPermitted(true);
-        try {
-            URL url = new URL(EXTERNAL_SERVER);
-            urlConnection = (HttpURLConnection) url.openConnection();
-            Log.i(TAG, "Response from httpget: " + urlConnection.getResponseCode());
-
-            InputStream is = urlConnection.getInputStream();
-            String response;
-            try {
-                response = new String(Streams.readFully(is), StandardCharsets.UTF_8);
-            } finally {
-                is.close();
-            }
-
-            JSONObject json_data = new JSONObject(response);
-            ip = json_data.getString("ip");
-            Log.v(TAG, "json_data: " + ip);
-        } catch (IllegalArgumentException e) {
-            Log.e(TAG, "exception while getting external IP: " + e.toString());
-        } catch (IOException e) {
-            Log.e(TAG, "IOException while getting IP: " + e.toString());
-        } catch (JSONException e) {
-            Log.e(TAG, "exception while creating JSONObject: " + e.toString());
-        } finally {
-            networkSecurityPolicy.setCleartextTrafficPermitted(cleartextTrafficPermittedBeforeTest);
-            if (urlConnection != null) {
-                urlConnection.disconnect();
-            }
-        }
-        return ip;
-    }
-
-    /**
-     * Verify the vpn connection by checking the VPN state and external IP
-     */
-    private void validateVpnConnection(VpnProfile profile) throws Exception {
-        validateVpnConnection(profile, false);
-    }
-
-    /**
-     * Verify the vpn connection by checking the VPN state, external IP or ping test
-     */
-    private void validateVpnConnection(VpnProfile profile, boolean pingTestFlag) throws Exception {
-        LegacyVpnInfo legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId());
-        Assert.assertTrue(legacyVpnInfo != null);
-
-        long start = System.currentTimeMillis();
-        while (((System.currentTimeMillis() - start)  < MAX_CONNECTION_TIME) &&
-                (legacyVpnInfo.state != LegacyVpnInfo.STATE_CONNECTED)) {
-            Log.v(TAG, "vpn state: " + legacyVpnInfo.state);
-            sleep(10 * 1000);
-            legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId());
-        }
-
-        // the vpn state should be CONNECTED
-        Assert.assertTrue(legacyVpnInfo.state == LegacyVpnInfo.STATE_CONNECTED);
-        if (pingTestFlag) {
-            Assert.assertTrue(pingTest(profile.server));
-        } else {
-            String curIpAddress = getIpAddress();
-            // the outgoing IP address should be the same as the VPN server address
-            Assert.assertEquals(profile.server, curIpAddress);
-        }
-    }
-
-    private boolean pingTest(String server) {
-        final long PING_TIMER = 3 * 60 * 1000; // 3 minutes
-        if (server == null || server.isEmpty()) {
-            return false;
-        }
-        long startTime = System.currentTimeMillis();
-        while ((System.currentTimeMillis() - startTime) < PING_TIMER) {
-            try {
-                Log.v(TAG, "Start ping test, ping " + server);
-                Process p = Runtime.getRuntime().exec("ping -c 10 -w 100 " + server);
-                int status = p.waitFor();
-                if (status == 0) {
-                    // if any of the ping test is successful, return true
-                    return true;
-                }
-            } catch (UnknownHostException e) {
-                Log.e(TAG, "Ping test Fail: Unknown Host");
-            } catch (IOException e) {
-                Log.e(TAG, "Ping test Fail:  IOException");
-            } catch (InterruptedException e) {
-                Log.e(TAG, "Ping test Fail: InterruptedException");
-            }
-        }
-        // ping test timeout
-        return false;
-    }
-
-    /**
-     * Install certificates from a file loaded in external stroage on the device
-     * @param profile vpn profile
-     * @param fileName certificate file name
-     * @param password password to extract certificate file
-     */
-    private void installCertificatesFromFile(VpnProfile profile, String fileName, String password)
-            throws Exception {
-        if (profile == null || fileName == null || password == null) {
-            throw new Exception ("vpn profile, certificate file name and password can not be null");
-        }
-
-        int curUid = mContext.getUserId();
-        mCertHelper.installCertificate(profile, fileName, password);
-
-        if (DEBUG) {
-            printKeyStore(profile);
-        }
-    }
-
-    private void sleep(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            Log.e(TAG, "interrupted: " + e.toString());
-        }
-    }
-
-    /**
-     * Test PPTP VPN connection
-     */
-    @LargeTest
-    public void testPPTPConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_PPTP);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test L2TP/IPSec PSK VPN connection
-     */
-    @LargeTest
-    public void testL2tpIpsecPskConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_L2TP_IPSEC_PSK);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test L2TP/IPSec RSA VPN connection
-     */
-    @LargeTest
-    public void testL2tpIpsecRsaConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_L2TP_IPSEC_RSA);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        String certFile = curVpnInfo.getCertificateFile();
-        String password = curVpnInfo.getPassword();
-        installCertificatesFromFile(vpnProfile, certFile, password);
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test IPSec Xauth RSA VPN connection
-     */
-    @LargeTest
-    public void testIpsecXauthRsaConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_IPSEC_XAUTH_RSA);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        String certFile = curVpnInfo.getCertificateFile();
-        String password = curVpnInfo.getPassword();
-        installCertificatesFromFile(vpnProfile, certFile, password);
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test IPSec Xauth PSK VPN connection
-     */
-    @LargeTest
-    public void testIpsecXauthPskConnection() throws Exception {
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_IPSEC_XAUTH_PSK);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile, true);
-    }
-
-    /**
-     * Test IPSec Hybrid RSA VPN connection
-     */
-    @LargeTest
-    public void testIpsecHybridRsaConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_IPSEC_HYBRID_RSA);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-}
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
deleted file mode 100644
index ae0102feaab97b82a0d22a798afb5d1f573dd91e..0000000000000000000000000000000000000000
--- a/tests/robotests/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#############################################
-# Settings Robolectric test target. #
-#############################################
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# Include the testing libraries (JUnit4 + Robolectric libs).
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt
-
-LOCAL_JAVA_LIBRARIES := \
-    junit \
-    platform-robolectric-prebuilt \
-    sdk_vcurrent \
-    telephony-common
-
-LOCAL_INSTRUMENTATION_FOR := Settings
-LOCAL_MODULE := SettingsRoboTests
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#############################################################
-# Settings runner target to run the previous target. #
-#############################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := RunSettingsRoboTests
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    SettingsRoboTests
-
-LOCAL_TEST_PACKAGE := Settings
-
-LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
-
-include prebuilts/misc/common/robolectric/run_robotests.mk
\ No newline at end of file
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
deleted file mode 100644
index 462388941c86fe00f6b1c2dd4f1c92bc1efa6d58..0000000000000000000000000000000000000000
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ /dev/null
@@ -1,15 +0,0 @@
-com.android.settings.bluetooth.DevicePickerFragment
-com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
-com.android.settings.bluetooth.BluetoothPairingDetail
-com.android.settings.accounts.AccountDetailDashboardFragment
-com.android.settings.fuelgauge.PowerUsageAnomalyDetails
-com.android.settings.fuelgauge.AdvancedPowerUsageDetail
-com.android.settings.deviceinfo.StorageProfileFragment
-com.android.settings.wifi.details.WifiNetworkDetailsFragment
-com.android.settings.wifi.p2p.WifiP2pSettings
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
-com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
-com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
-com.android.settings.wifi.tether.WifiTetherSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
deleted file mode 100644
index 1a978cdb421f1601587a10a8edb97574694617b9..0000000000000000000000000000000000000000
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ /dev/null
@@ -1,93 +0,0 @@
-com.android.settings.location.LocationMode
-com.android.settings.notification.ZenModePrioritySettings
-com.android.settings.notification.ZenModeVisualInterruptionSettings
-com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
-com.android.settings.deviceinfo.SimStatus
-com.android.settings.deviceinfo.PrivateVolumeForget
-com.android.settings.inputmethod.SpellCheckersSettings
-com.android.settings.inputmethod.KeyboardLayoutPickerFragment
-com.android.settings.notification.ZenModeEventRuleSettings
-com.android.settings.fuelgauge.InactiveApps
-com.android.settings.accessibility.CaptionPropertiesFragment
-com.android.settings.accessibility.AccessibilitySettingsForSetupWizard
-com.android.settings.deviceinfo.ImeiInformation
-com.android.settings.datausage.DataUsageList
-com.android.settings.vpn2.AppManagementFragment
-com.android.settings.display.NightDisplaySettings
-com.android.settings.vpn2.VpnSettings
-com.android.settings.fingerprint.FingerprintSettings$FingerprintSettingsFragment
-com.android.settings.applications.ProcessStatsDetail
-com.android.settings.wifi.WifiInfo
-com.android.settings.applications.VrListenerSettings
-com.android.settings.inputmethod.UserDictionaryList
-com.android.settings.datausage.DataSaverSummary
-com.android.settings.notification.ChannelNotificationSettings
-com.android.settings.datausage.AppDataUsage
-com.android.settings.datausage.DataPlanUsageSummary
-com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
-com.android.settings.applications.ManageDomainUrls
-com.android.settings.applications.WriteSettingsDetails
-com.android.settings.location.LocationSettings
-com.android.settings.applications.ProcessStatsSummary
-com.android.settings.users.RestrictedProfileSettings
-com.android.settings.accounts.ChooseAccountActivity
-com.android.settings.accounts.ManagedProfileSettings
-com.android.settings.accessibility.ToggleAutoclickPreferenceFragment
-com.android.settings.applications.AppLaunchSettings
-com.android.settings.fuelgauge.BatterySaverSettings
-com.android.settings.location.ScanningSettings
-com.android.settings.tts.TextToSpeechSettings
-com.android.settings.applications.ProcessStatsUi
-com.android.settings.notification.ZenModeScheduleRuleSettings
-com.android.settings.datausage.BillingCycleSettings
-com.android.settings.notification.NotificationStation
-com.android.settings.print.PrintJobSettingsFragment
-com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard
-com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard
-com.android.settings.accounts.AccountSyncSettings
-com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
-com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
-com.android.settings.applications.DrawOverlayDetails
-com.android.settings.backup.ToggleBackupSettingFragment
-com.android.settings.users.UserDetailsSettings
-com.android.settings.datausage.UnrestrictedDataAccess
-com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard
-com.android.settings.fuelgauge.BatteryHistoryDetail
-com.android.settings.applications.RunningServices
-com.android.settings.applications.ConfirmConvertToFbe
-com.android.settings.deviceinfo.PublicVolumeSettings
-com.android.settings.applications.InstalledAppDetails
-com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment
-com.android.settings.print.PrintServiceSettingsFragment
-com.android.settings.wfd.WifiDisplaySettings
-com.android.settings.notification.AppNotificationSettings
-com.android.settings.deviceinfo.PrivateVolumeSettings
-com.android.settings.users.AppRestrictionsFragment
-com.android.settings.deviceinfo.PrivateVolumeUnmount
-com.android.settings.notification.ZenAccessSettings
-com.android.settings.accessibility.ToggleFontSizePreferenceFragment
-com.android.settings.applications.PremiumSmsAccess
-com.android.settings.applications.UsageAccessDetails
-com.android.settings.applications.AppStorageSettings
-com.android.settings.notification.NotificationAccessSettings
-com.android.settings.notification.ZenModeSettings
-com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment
-com.android.settings.localepicker.LocaleListEditor
-com.android.settings.qstile.DevelopmentTileConfigActivity$DevelopmentTileConfigFragment
-com.android.settings.applications.ExternalSourcesDetails
-com.android.settings.applications.PictureInPictureSettings
-com.android.settings.applications.PictureInPictureDetails
-com.android.settings.ApnSettings
-com.android.settings.SecuritySettings$SecuritySubSettings
-com.android.settings.PrivacySettings
-com.android.settings.WifiCallingSettings
-com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
-com.android.settings.SetupRedactionInterstitial$SetupRedactionInterstitialFragment
-com.android.settings.TrustAgentSettings
-com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
-com.android.settings.IccLockSettings
-com.android.settings.TetherSettings
-com.android.settings.ApplicationSettings
-com.android.settings.ApnEditor
-com.android.settings.UserCredentialsSettings
-com.android.settings.TestingSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable
deleted file mode 100644
index 64b5c83bd05d13251308a97904d7bcfa93cdd88b..0000000000000000000000000000000000000000
--- a/tests/robotests/assets/grandfather_not_implementing_instrumentable
+++ /dev/null
@@ -1,9 +0,0 @@
-com.android.settings.deletionhelper.ActivationWarningFragment
-com.android.settings.applications.AppOpsCategory
-com.android.settings.inputmethod.UserDictionaryLocalePicker
-com.android.settings.CustomListPreference$CustomListPreferenceDialogFragment
-com.android.settings.password.ChooseLockPassword$SaveAndFinishWorker
-com.android.settings.password.ChooseLockPattern$SaveAndFinishWorker
-com.android.settings.RestrictedListPreference$RestrictedListPreferenceDialogFragment
-com.android.settings.password.ConfirmDeviceCredentialBaseFragment$LastTryDialog
-com.android.settings.password.CredentialCheckResultTracker
diff --git a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
deleted file mode 100644
index 948b14ad70c99d0906d90faed1bb1bf0f25ece19..0000000000000000000000000000000000000000
--- a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
+++ /dev/null
@@ -1 +0,0 @@
-com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard
diff --git a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
deleted file mode 100644
index b3290725c98cf53a1746fac525413fd0e0704f13..0000000000000000000000000000000000000000
--- a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
+++ /dev/null
@@ -1 +0,0 @@
-com.android.settings.fuelgauge.PowerUsageSummary
diff --git a/tests/robotests/assets/whitelist_duplicate_index_key b/tests/robotests/assets/whitelist_duplicate_index_key
deleted file mode 100644
index a761f35408663e20e3cc90b32612eba6143ed714..0000000000000000000000000000000000000000
--- a/tests/robotests/assets/whitelist_duplicate_index_key
+++ /dev/null
@@ -1,5 +0,0 @@
-add_users_when_locked
-additional_system_update_settings
-dashboard_tile_placeholder
-screen_zoom
-usage_access
diff --git a/tests/robotests/res/drawable/selectable_card.xml b/tests/robotests/res/drawable/selectable_card.xml
deleted file mode 100644
index 8d1274a86ca25854791b0d217488f714879c7bd6..0000000000000000000000000000000000000000
--- a/tests/robotests/res/drawable/selectable_card.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <!-- Overlay this since Robolectric has trouble inflating ?android:attr/colorBackground -->
-    <item android:drawable="@android:color/transparent"/>
-</ripple>
\ No newline at end of file
diff --git a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml
deleted file mode 100644
index cedf5b9eb624a62923e5f78337165cb51efee3c1..0000000000000000000000000000000000000000
--- a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<com.android.setupwizardlib.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/setup_wizard_layout"
-    style="?attr/fingerprint_layout_theme"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:clipToPadding="false"
-        android:clipChildren="false">
-
-        <FrameLayout
-            android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
-            android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
-            android:layout_gravity="center_horizontal|bottom">
-
-            <ImageView
-                android:id="@+id/fingerprint_sensor_location_animation"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
-                android:src="@drawable/fingerprint_sensor_location"
-                android:scaleType="centerInside"/>
-
-        </FrameLayout>
-
-        <LinearLayout
-            style="@style/SuwContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:clipToPadding="false"
-            android:clipChildren="false">
-
-            <TextView
-                style="@style/SuwDescription.Glif"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/suw_description_glif_margin_top"
-                android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-            <View
-                android:layout_height="0dp"
-                android:layout_width="match_parent"
-                android:layout_weight="1"/>
-
-            <Button
-                style="@style/SuwGlifButton.Secondary"
-                android:id="@+id/next_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_gravity="end"
-                android:text="@string/fingerprint_enroll_button_next" />
-
-        </LinearLayout>
-    </FrameLayout>
-</com.android.setupwizardlib.GlifLayout>
diff --git a/tests/robotests/res/layout/preference.xml b/tests/robotests/res/layout/preference.xml
deleted file mode 100644
index 3f73161ba416727900b95f00cf9dbe9ce133642e..0000000000000000000000000000000000000000
--- a/tests/robotests/res/layout/preference.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- A test preference layout containing all required widgets -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textColor="?android:attr/textColorPrimary"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal" />
-
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@android:id/title"
-        android:layout_alignStart="@android:id/title"
-        android:visibility="gone"
-        android:textAlignment="viewStart"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        android:textColor="?android:attr/textColorSecondary"
-        android:maxLines="10" />
-
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:minWidth="58dip"
-        android:gravity="end|center_vertical"
-        android:orientation="vertical" />
-
-</LinearLayout>
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
deleted file mode 100644
index 156e20aef83cb37ae8661f59f644712d2be3eaea..0000000000000000000000000000000000000000
--- a/tests/robotests/res/values/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Copyright (C) 2017 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-    <!-- Whether or not new device intro suggestion is supported for this device -->
-    <bool name="config_new_device_intro_suggestion_supported">true</bool>
-</resources>
\ No newline at end of file
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
deleted file mode 100644
index b91df657ce02d75d0b769ac96316271a8be62a6f..0000000000000000000000000000000000000000
--- a/tests/robotests/res/values/themes.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings"/>
-</resources>
diff --git a/tests/robotests/src/android/app/admin/PasswordMetrics.java b/tests/robotests/src/android/app/admin/PasswordMetrics.java
deleted file mode 100644
index a46130661b0cc51a92c3fc8abc3dece937df1508..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/app/admin/PasswordMetrics.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.app.admin;
-
-import android.annotation.NonNull;
-
-/**
- * Stub implementation of framework's PasswordMetrics for Robolectric tests. Otherwise Robolectric
- * is throwing ClassNotFoundError.
- *
- * TODO: Remove this class when Robolectric supports O
- */
-public class PasswordMetrics {
-
-    // Maximum allowed number of repeated or ordered characters in a sequence before we'll
-    // consider it a complex PIN/password.
-    public static final int MAX_ALLOWED_SEQUENCE = 3;
-
-    public int length = 0;
-    public int letters = 0;
-    public int upperCase = 0;
-    public int lowerCase = 0;
-    public int numeric = 0;
-    public int symbols = 0;
-    public int nonLetter = 0;
-
-    public static int maxLengthSequence(@NonNull String string) {
-        // Stub implementation
-        return 1;
-    }
-
-    public static PasswordMetrics computeForPassword(@NonNull String password) {
-        return new PasswordMetrics();
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
deleted file mode 100644
index 40b76df759cda90bcdb1b75de661898028363113..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.bluetooth;
-
-/**
- * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
- */
-public class BluetoothCodecConfig {
-}
diff --git a/tests/robotests/src/android/content/om/IOverlayManager.java b/tests/robotests/src/android/content/om/IOverlayManager.java
deleted file mode 100644
index d4f6d10b9f7fa3e44cc137d1bd92c96951cf4375..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/content/om/IOverlayManager.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package android.content.om;
-
-import android.os.IBinder;
-
-public class IOverlayManager {
-
-    public static class Stub {
-        public static IOverlayManager asInterface(IBinder b) {
-            return null;
-        }
-    }
-}
diff --git a/tests/robotests/src/android/content/om/OverlayInfo.java b/tests/robotests/src/android/content/om/OverlayInfo.java
deleted file mode 100644
index cfd3adc050527f6ddf083d16d79e5c1190cc7538..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/content/om/OverlayInfo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package android.content.om;
-
-public class OverlayInfo {
-}
diff --git a/tests/robotests/src/android/net/NetworkBadging.java b/tests/robotests/src/android/net/NetworkBadging.java
deleted file mode 100644
index f2af08b0590f32ac10527d2816003ede6d0ab418..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/net/NetworkBadging.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.net;
-
-import android.annotation.IntDef;
-import android.annotation.Nullable;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Implementation for {@link android.net.NetworkBadging}.
- *
- * <p>Can be removed once Robolectric supports Android O.
- */
-public class NetworkBadging {
-    @IntDef({BADGING_NONE, BADGING_SD, BADGING_HD, BADGING_4K})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Badging {}
-
-    public static final int BADGING_NONE = 0;
-    public static final int BADGING_SD = 10;
-    public static final int BADGING_HD = 20;
-    public static final int BADGING_4K = 30;
-
-    private static Drawable drawable;
-
-    public static Drawable getWifiIcon(
-            int signalLevel, @NetworkBadging.Badging int badging, @Nullable Resources.Theme theme) {
-        return new ColorDrawable(Color.GREEN);
-    }
-}
diff --git a/tests/robotests/src/android/net/NetworkScorerAppData.java b/tests/robotests/src/android/net/NetworkScorerAppData.java
deleted file mode 100644
index f7da4d1ccd54b4a19d58a2292a13e0c721734a5e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/net/NetworkScorerAppData.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package android.net;
-
-import android.annotation.Nullable;
-import android.content.ComponentName;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.Objects;
-
-/**
- * Holds metadata about a discovered network scorer/recommendation application.
- *
- * TODO: delete this class once robolectric supports Android O
- */
-public final class NetworkScorerAppData implements Parcelable {
-    /** UID of the scorer app. */
-    public final int packageUid;
-    private final ComponentName mRecommendationService;
-    /** User visible label in Settings for the recommendation service. */
-    private final String mRecommendationServiceLabel;
-    /**
-     * The {@link ComponentName} of the Activity to start before enabling the "connect to open
-     * wifi networks automatically" feature.
-     */
-    private final ComponentName mEnableUseOpenWifiActivity;
-    /**
-     * The {@link android.app.NotificationChannel} ID used by {@link #mRecommendationService} to
-     * post open network notifications.
-     */
-    private final String mNetworkAvailableNotificationChannelId;
-
-    public NetworkScorerAppData(int packageUid, ComponentName recommendationServiceComp,
-            String recommendationServiceLabel, ComponentName enableUseOpenWifiActivity,
-            String networkAvailableNotificationChannelId) {
-        this.packageUid = packageUid;
-        this.mRecommendationService = recommendationServiceComp;
-        this.mRecommendationServiceLabel = recommendationServiceLabel;
-        this.mEnableUseOpenWifiActivity = enableUseOpenWifiActivity;
-        this.mNetworkAvailableNotificationChannelId = networkAvailableNotificationChannelId;
-    }
-
-    protected NetworkScorerAppData(Parcel in) {
-        packageUid = in.readInt();
-        mRecommendationService = ComponentName.readFromParcel(in);
-        mRecommendationServiceLabel = in.readString();
-        mEnableUseOpenWifiActivity = ComponentName.readFromParcel(in);
-        mNetworkAvailableNotificationChannelId = in.readString();
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(packageUid);
-        ComponentName.writeToParcel(mRecommendationService, dest);
-        dest.writeString(mRecommendationServiceLabel);
-        ComponentName.writeToParcel(mEnableUseOpenWifiActivity, dest);
-        dest.writeString(mNetworkAvailableNotificationChannelId);
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    public static final Creator<NetworkScorerAppData> CREATOR =
-            new Creator<NetworkScorerAppData>() {
-                @Override
-                public NetworkScorerAppData createFromParcel(Parcel in) {
-                    return new NetworkScorerAppData(in);
-                }
-
-                @Override
-                public NetworkScorerAppData[] newArray(int size) {
-                    return new NetworkScorerAppData[size];
-                }
-            };
-
-    public String getRecommendationServicePackageName() {
-        return mRecommendationService.getPackageName();
-    }
-
-    public ComponentName getRecommendationServiceComponent() {
-        return mRecommendationService;
-    }
-
-    @Nullable
-    public ComponentName getEnableUseOpenWifiActivity() {
-        return mEnableUseOpenWifiActivity;
-    }
-
-    @Nullable
-    public String getRecommendationServiceLabel() {
-        return mRecommendationServiceLabel;
-    }
-
-    @Nullable
-    public String getNetworkAvailableNotificationChannelId() {
-        return mNetworkAvailableNotificationChannelId;
-    }
-
-    @Override
-    public String toString() {
-        return "NetworkScorerAppData{" +
-                "packageUid=" + packageUid +
-                ", mRecommendationService=" + mRecommendationService +
-                ", mRecommendationServiceLabel=" + mRecommendationServiceLabel +
-                ", mEnableUseOpenWifiActivity=" + mEnableUseOpenWifiActivity +
-                ", mNetworkAvailableNotificationChannelId=" +
-                mNetworkAvailableNotificationChannelId +
-                '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        NetworkScorerAppData that = (NetworkScorerAppData) o;
-        return packageUid == that.packageUid &&
-                Objects.equals(mRecommendationService, that.mRecommendationService) &&
-                Objects.equals(mRecommendationServiceLabel, that.mRecommendationServiceLabel) &&
-                Objects.equals(mEnableUseOpenWifiActivity, that.mEnableUseOpenWifiActivity) &&
-                Objects.equals(mNetworkAvailableNotificationChannelId,
-                        that.mNetworkAvailableNotificationChannelId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(packageUid, mRecommendationService, mRecommendationServiceLabel,
-                mEnableUseOpenWifiActivity, mNetworkAvailableNotificationChannelId);
-    }
-}
diff --git a/tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java b/tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java
deleted file mode 100644
index 7995e07007ef0e90995bf1c02b623c48184c6bca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.net.wifi;
-
-/**
- * Empty class def for {@link android.net.wifi.WifiNetworkScoreCache}.
- *
- * <p>Can be removed once Robolectric supports Android O.
- */
-public class WifiNetworkScoreCache {
-
-}
diff --git a/tests/robotests/src/android/print/PrintServicesLoader.java b/tests/robotests/src/android/print/PrintServicesLoader.java
deleted file mode 100644
index e4975edb81330b150a9520f73e3f170217ceee58..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/print/PrintServicesLoader.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package android.print;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.content.Loader;
-import android.printservice.PrintServiceInfo;
-import com.android.internal.util.Preconditions;
-
-import java.util.List;
-
-/**
- * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
- */
-public class PrintServicesLoader extends Loader<List<PrintServiceInfo>> {
-    public PrintServicesLoader(@NonNull PrintManager printManager, @NonNull Context context,
-            int selectionFlags) {
-        super(Preconditions.checkNotNull(context));
-    }
-}
diff --git a/tests/robotests/src/android/service/oemlock/OemLockManager.java b/tests/robotests/src/android/service/oemlock/OemLockManager.java
deleted file mode 100644
index c168089be4b3fc8aadff46f6798c0771326fa7e6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/service/oemlock/OemLockManager.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.service.oemlock;
-
-/**
- * Make OemLockManager available to Robolectric.
- */
-public class OemLockManager {
-    public void setOemUnlockAllowedByCarrier(boolean allowed, byte[] signature) {}
-
-    public boolean isOemUnlockAllowedByCarrier() {
-        return true;
-    }
-
-    public void setOemUnlockAllowedByUser(boolean allowed) {}
-
-    public boolean isOemUnlockAllowedByUser() {
-        return false;
-    }
-
-    public boolean isOemUnlockAllowed() {
-        return false;
-    }
-
-    public boolean isDeviceOemUnlocked() {
-        return false;
-    }
-}
diff --git a/tests/robotests/src/android/util/IconDrawableFactory.java b/tests/robotests/src/android/util/IconDrawableFactory.java
deleted file mode 100644
index 9d0d7df2601f3976d35f7ed96bf40d1876ed70f2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/android/util/IconDrawableFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.util;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageItemInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-
-/**
- * This class is only needed to get around Robolectric issue.
- */
-public class IconDrawableFactory {
-
-    public static IconDrawableFactory newInstance(Context context) {
-        return new IconDrawableFactory();
-    }
-
-    public Drawable getBadgedIcon(ApplicationInfo appInfo) {
-        return getBadgedIcon(appInfo, 0);
-    }
-
-    public Drawable getBadgedIcon(ApplicationInfo appInfo, int userId) {
-        return getBadgedIcon(appInfo, appInfo, userId);
-    }
-
-    public Drawable getBadgedIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo, int userId) {
-        return new ColorDrawable(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/ims/ImsManager.java b/tests/robotests/src/com/android/ims/ImsManager.java
deleted file mode 100644
index a4d97b5a64b53d86b4173623fbbf921e924a51fc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/ims/ImsManager.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ims;
-
-import android.content.Context;
-
-/**
- * Fake test class to com.android.ims.ImsManager
- */
-public class ImsManager {
-
-    public static boolean wfcEnabledByPlatform;
-    public static boolean wfcProvisioned;
-
-    public static boolean isWfcEnabledByPlatform(Context context) {
-        return wfcEnabledByPlatform;
-    }
-
-    public static boolean isWfcProvisionedOnDevice(Context context) {
-        return wfcProvisioned;
-    }
-
-    public static int getWfcMode(Context context, boolean roaming) {
-        return 0;
-    }
-
-    public static boolean isWfcEnabledByUser(Context context) {
-        return false;
-    }
-}
diff --git a/tests/robotests/src/com/android/internal/app/LocalePickerWithRegion.java b/tests/robotests/src/com/android/internal/app/LocalePickerWithRegion.java
deleted file mode 100644
index 9edda45cfe7fea708cde7a486423a5bab2caf7c1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/internal/app/LocalePickerWithRegion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.android.internal.app;
-
-/**
- * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
- */
-public class LocalePickerWithRegion {
-
-    public interface LocaleSelectedListener {
-        void onLocaleSelected(LocaleStore.LocaleInfo locale);
-    }
-}
diff --git a/tests/robotests/src/com/android/internal/app/NightDisplayController.java b/tests/robotests/src/com/android/internal/app/NightDisplayController.java
deleted file mode 100644
index bc2a0ca1ff46cfaed74b69d13af2987c74cba1d6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/internal/app/NightDisplayController.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.internal.app;
-
-/**
- * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
- * API 25.
- */
-public class NightDisplayController {
-
-    public static final int AUTO_MODE_CUSTOM = 1;
-    public static final int COLOR_MODE_NATURAL = 0;
-
-    public static final int AUTO_MODE_TWILIGHT = 2;
-    public static final int COLOR_MODE_BOOSTED = 1;
-    public static final int COLOR_MODE_SATURATED = 2;
-    private int mColorMode;
-
-    public void setColorMode(int colorMode) {
-        mColorMode = colorMode;
-    }
-
-    public int getColorMode() {
-        return mColorMode;
-    }
-
-    public interface Callback {
-    }
-}
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
deleted file mode 100644
index 3dcf6ab6d04c355eda35f7275f49c0136770a6c5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.hardware;
-
-import android.content.Context;
-
-/**
- * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
- * API 25.
- */
-public class AmbientDisplayConfiguration {
-
-    public AmbientDisplayConfiguration(Context context) {}
-
-    public boolean pulseOnPickupAvailable() {
-        return false;
-    }
-
-    public boolean pulseOnPickupEnabled(int user) {
-        return true;
-    }
-
-    public boolean pulseOnPickupCanBeModified(int user) {
-        return true;
-    }
-
-    public boolean pulseOnDoubleTapAvailable() {
-        return true;
-    }
-
-    public boolean pulseOnDoubleTapEnabled(int user) {
-        return true;
-    }
-
-    public boolean pulseOnNotificationEnabled(int user) {
-        return true;
-    }
-
-    public boolean pulseOnNotificationAvailable() {
-        return true;
-    }
-
-    public boolean alwaysOnEnabled(int user) {
-        return true;
-    }
-
-    public boolean alwaysOnAvailable() {
-        return true;
-    }
-
-    public boolean alwaysOnAvailableForUser(int user) {
-        return true;
-    }
-
-    public boolean available() {
-        return true;
-    }
-
-    public boolean enabled(int user) {
-        return true;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
deleted file mode 100644
index cd891bee95e6901c4fbf46ff98cfefbc40c746ac..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DeviceAdminAddTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    private DeviceAdminAdd mDeviceAdminAdd;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mDeviceAdminAdd = Robolectric.buildActivity(DeviceAdminAdd.class).get();
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mDeviceAdminAdd.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_ALLOW), eq("app"));
-
-        mDeviceAdminAdd.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_DENY), eq("app"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
deleted file mode 100644
index c5a18339a762f1dab4296cf65b0e5f5e919e961b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.UserManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settingslib.DeviceInfoUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = ShadowUtils.class
-)
-public class DeviceInfoSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-
-    private DeviceInfoSettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mSettings = spy(new DeviceInfoSettings());
-        doReturn(mScreen).when(mSettings).getPreferenceScreen();
-    }
-
-    @Test
-    public void getPrefXml_shouldReturnDeviceInfoXml() {
-        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
-    }
-
-    @Test
-    public void getSummary_shouldReturnDeviceModel() {
-        final SummaryLoader.SummaryProvider mProvider = DeviceInfoSettings.SUMMARY_PROVIDER_FACTORY
-                .createSummaryProvider(null, mSummaryLoader);
-
-        mProvider.setListening(true);
-
-        verify(mSummaryLoader).setSummary(mProvider, Build.MODEL + DeviceInfoUtils.getMsvSuffix());
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        final List<String> niks = DeviceInfoSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final int xmlId = (new DeviceInfoSettings()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
deleted file mode 100644
index 4b345c0c308a6943bb65a7ca581b8e62643b3fca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowPowerManagerWrapper;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DisplaySettingsTest {
-
-    @Test
-    @Config(shadows = ShadowPowerManagerWrapper.class)
-    public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
-        final Context context = RuntimeEnvironment.application;
-//        PowerManager wrapper = mock(PowerManager.class);
-//        doReturn(wrapper).when(context).getSystemService(Context.POWER_SERVICE);
-        final DisplaySettings fragment = new DisplaySettings();
-        final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                fragment.getPreferenceScreenResId());
-        final List<String> preferenceKeys = new ArrayList<>();
-
-        for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
-            preferenceKeys.add(controller.getPreferenceKey());
-        }
-        // Nightmode is currently hidden
-        preferenceKeys.remove("night_mode");
-
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
deleted file mode 100644
index 7a3875e81286b186cc67601600a9999136579b3b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;
-import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;
-import static com.android.settings.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EncryptionAndCredentialTest {
-
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private DevicePolicyManager mDevicePolicyManager;
-
-    private ShadowApplication mApplication;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mApplication = ShadowApplication.getInstance();
-        mApplication.setSystemService(Context.DEVICE_POLICY_SERVICE, mDevicePolicyManager);
-        mApplication.setSystemService(Context.USER_SERVICE, mUserManager);
-        mContext = mApplication.getApplicationContext();
-    }
-
-    @Test
-    public void getMetricsCategory_shouldReturnEncryptionAndCredential() {
-        EncryptionAndCredential fragment = new EncryptionAndCredential();
-        assertThat(fragment.getMetricsCategory()).isEqualTo(MetricsEvent.ENCRYPTION_AND_CREDENTIAL);
-    }
-
-    // Search provider tests
-    @Test
-    public void getXmlResourcesToIndex_shouldReturnAllXmls() {
-        final List<SearchIndexableResource> index =
-                SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        mContext, true /* enabled */);
-
-        assertThat(index).hasSize(3);
-    }
-
-    @Test
-    public void getNonIndexableKeys_pageIsDisabled_shouldReturnAllKeysAsNonIndexable() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-
-        final List<SearchIndexableResource> index =
-                SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext, true /* enabled */);
-        final List<String> expectedKeys = new ArrayList<>();
-        for (SearchIndexableResource res : index) {
-            expectedKeys.addAll(((BaseSearchIndexProvider) SEARCH_INDEX_DATA_PROVIDER)
-                    .getNonIndexableKeysFromXml(mContext, res.xmlResId));
-        }
-        final List<String> keys = SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-
-        assertThat(keys).containsExactlyElementsIn(expectedKeys);
-    }
-
-    @Test
-    public void getNonIndexableKeys_deviceEncrypted_shouldReturnUnencryptedKeys() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mDevicePolicyManager.getStorageEncryptionStatus()).thenReturn(
-                ENCRYPTION_STATUS_ACTIVE);
-
-        final List<String> expectedKeys = new ArrayList<>();
-        expectedKeys.addAll(((BaseSearchIndexProvider) SEARCH_INDEX_DATA_PROVIDER)
-                .getNonIndexableKeysFromXml(mContext, R.xml.security_settings_unencrypted));
-        final List<String> keys = SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-
-        assertThat(keys).containsExactlyElementsIn(expectedKeys);
-    }
-
-    @Test
-    public void getNonIndexableKeys_deviceNotEncrypted_shouldReturnEncryptedKeys() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mDevicePolicyManager.getStorageEncryptionStatus())
-                .thenReturn(ENCRYPTION_STATUS_INACTIVE);
-
-        final List<String> expectedKeys = new ArrayList<>();
-        expectedKeys.addAll(((BaseSearchIndexProvider) SEARCH_INDEX_DATA_PROVIDER)
-                .getNonIndexableKeysFromXml(mContext, R.xml.security_settings_encrypted));
-        final List<String> keys = SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-
-        assertThat(keys).containsExactlyElementsIn(expectedKeys);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
deleted file mode 100644
index e10b878d31a7db338628fb47d648bf86e14543b5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-
-import android.content.Intent;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowHelpUtils;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.robolectric.Shadows.shadowOf;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowHelpUtils.class
-        })
-public class HelpTrampolineTest {
-
-    @After
-    public void tearDown() {
-        ShadowHelpUtils.reset();
-    }
-
-    @Test
-    public void launchHelp_noExtra_shouldDoNothing() {
-        final Intent intent = new Intent().setClassName(
-                RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName());
-
-        Robolectric.buildActivity(HelpTrampoline.class).withIntent(intent).create().get();
-
-        assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isFalse();
-    }
-
-    @Test
-    public void launchHelp_hasExtra_shouldLaunchHelp() {
-        final Intent intent = new Intent().setClassName(
-                RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName())
-                .putExtra(Intent.EXTRA_TEXT, "help_url_upgrading");
-        final ShadowActivity shadow = shadowOf(Robolectric.buildActivity(HelpTrampoline.class)
-                .withIntent(intent).create().get());
-        final Intent launchedIntent = shadow.getNextStartedActivity();
-
-        assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isTrue();
-        assertThat(launchedIntent).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
deleted file mode 100644
index 3d50c6366aa5eaffc3df29840f200fbe7b515111..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LegalSettingsTest {
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        final List<String> niks = LegalSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.about_legal);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
deleted file mode 100644
index ea4b2726aed2c714d692ba172e2db6ba66bebe41..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.xmlpull.v1.XmlPullParserException;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LicenseHtmlGeneratorFromXmlTest {
-    private static final String VAILD_XML_STRING =
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            "<licenses>\n" +
-            "<file-name contentId=\"0\">/file0</file-name>\n" +
-            "<file-name contentId=\"0\">/file1</file-name>\n" +
-            "<file-content contentId=\"0\"><![CDATA[license content #0]]></file-content>\n" +
-            "</licenses>";
-
-    private static final String INVAILD_XML_STRING =
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            "<licenses2>\n" +
-            "<file-name contentId=\"0\">/file0</file-name>\n" +
-            "<file-name contentId=\"0\">/file1</file-name>\n" +
-            "<file-content contentId=\"0\"><![CDATA[license content #0]]></file-content>\n" +
-            "</licenses2>";
-
-    private static final String EXPECTED_HTML_STRING =
-            "<html><head>\n" +
-            "<style type=\"text/css\">\n" +
-            "body { padding: 0; font-family: sans-serif; }\n" +
-            ".same-license { background-color: #eeeeee;\n" +
-            "                border-top: 20px solid white;\n" +
-            "                padding: 10px; }\n" +
-            ".label { font-weight: bold; }\n" +
-            ".file-list { margin-left: 1em; color: blue; }\n" +
-            "</style>\n" +
-            "</head>" +
-            "<body topmargin=\"0\" leftmargin=\"0\" rightmargin=\"0\" bottommargin=\"0\">\n" +
-            "<div class=\"toc\">\n" +
-            "<ul>\n" +
-            "<li><a href=\"#id0\">/file0</a></li>\n" +
-            "<li><a href=\"#id0\">/file1</a></li>\n" +
-            "</ul>\n" +
-            "</div><!-- table of contents -->\n" +
-            "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n" +
-            "<tr id=\"id0\"><td class=\"same-license\">\n" +
-            "<div class=\"label\">Notices for file(s):</div>\n" +
-            "<div class=\"file-list\">\n" +
-            "/file0 <br/>\n" +
-            "/file1 <br/>\n" +
-            "</div><!-- file-list -->\n" +
-            "<pre class=\"license-text\">\n" +
-            "license content #0\n" +
-            "</pre><!-- license-text -->\n" +
-            "</td></tr><!-- same-license -->\n" +
-            "</table></body></html>\n";
-
-    @Test
-    public void testParseValidXmlStream() throws XmlPullParserException, IOException {
-        Map<String, String> fileNameToContentIdMap = new HashMap<String, String>();
-        Map<String, String> contentIdToFileContentMap = new HashMap<String, String>();
-
-        LicenseHtmlGeneratorFromXml.parse(
-                new InputStreamReader(new ByteArrayInputStream(VAILD_XML_STRING.getBytes())),
-                fileNameToContentIdMap, contentIdToFileContentMap);
-        assertThat(fileNameToContentIdMap.size()).isEqualTo(2);
-        assertThat(fileNameToContentIdMap.get("/file0")).isEqualTo("0");
-        assertThat(fileNameToContentIdMap.get("/file1")).isEqualTo("0");
-        assertThat(contentIdToFileContentMap.size()).isEqualTo(1);
-        assertThat(contentIdToFileContentMap.get("0")).isEqualTo("license content #0");
-    }
-
-    @Test(expected = XmlPullParserException.class)
-    public void testParseInvalidXmlStream() throws XmlPullParserException, IOException {
-        Map<String, String> fileNameToContentIdMap = new HashMap<String, String>();
-        Map<String, String> contentIdToFileContentMap = new HashMap<String, String>();
-
-        LicenseHtmlGeneratorFromXml.parse(
-                new InputStreamReader(new ByteArrayInputStream(INVAILD_XML_STRING.getBytes())),
-                fileNameToContentIdMap, contentIdToFileContentMap);
-    }
-
-    @Test
-    public void testGenerateHtml() {
-        Map<String, String> fileNameToContentIdMap = new HashMap<String, String>();
-        Map<String, String> contentIdToFileContentMap = new HashMap<String, String>();
-
-        fileNameToContentIdMap.put("/file0", "0");
-        fileNameToContentIdMap.put("/file1", "0");
-        contentIdToFileContentMap.put("0", "license content #0");
-
-        StringWriter output = new StringWriter();
-        LicenseHtmlGeneratorFromXml.generateHtml(
-                fileNameToContentIdMap, contentIdToFileContentMap, new PrintWriter(output));
-        assertThat(output.toString()).isEqualTo(EXPECTED_HTML_STRING);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
deleted file mode 100644
index b16d3155532e960658465e6db5930389aa910321..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LicenseHtmlLoaderTest {
-    @Mock
-    private Context mContext;
-
-    LicenseHtmlLoader newLicenseHtmlLoader(ArrayList<File> xmlFiles,
-            File cachedHtmlFile, boolean isCachedHtmlFileOutdated,
-            boolean generateHtmlFileSucceeded) {
-        LicenseHtmlLoader loader = spy(new LicenseHtmlLoader(mContext));
-        doReturn(xmlFiles).when(loader).getVaildXmlFiles();
-        doReturn(cachedHtmlFile).when(loader).getCachedHtmlFile();
-        doReturn(isCachedHtmlFileOutdated).when(loader).isCachedHtmlFileOutdated(any(), any());
-        doReturn(generateHtmlFileSucceeded).when(loader).generateHtmlFile(any(), any());
-        return loader;
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void testLoadInBackground() {
-        ArrayList<File> xmlFiles = new ArrayList();
-        xmlFiles.add(new File("test.xml"));
-        File cachedHtmlFile = new File("test.html");
-
-        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, true);
-
-        assertThat(loader.loadInBackground()).isEqualTo(cachedHtmlFile);
-        verify(loader).generateHtmlFile(any(), any());
-    }
-
-    @Test
-    public void testLoadInBackgroundWithNoVaildXmlFiles() {
-        ArrayList<File> xmlFiles = new ArrayList();
-        File cachedHtmlFile = new File("test.html");
-
-        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, true);
-
-        assertThat(loader.loadInBackground()).isNull();
-        verify(loader, never()).generateHtmlFile(any(), any());
-    }
-
-    @Test
-    public void testLoadInBackgroundWithNonOutdatedCachedHtmlFile() {
-        ArrayList<File> xmlFiles = new ArrayList();
-        xmlFiles.add(new File("test.xml"));
-        File cachedHtmlFile = new File("test.html");
-
-        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, false, true);
-
-        assertThat(loader.loadInBackground()).isEqualTo(cachedHtmlFile);
-        verify(loader, never()).generateHtmlFile(any(), any());
-    }
-
-    @Test
-    public void testLoadInBackgroundWithGenerateHtmlFileFailed() {
-        ArrayList<File> xmlFiles = new ArrayList();
-        xmlFiles.add(new File("test.xml"));
-        File cachedHtmlFile = new File("test.html");
-
-        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, false);
-
-        assertThat(loader.loadInBackground()).isNull();
-        verify(loader).generateHtmlFile(any(), any());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
deleted file mode 100644
index 838b1e88f693a084437a19eb3f698aa3957a9f8d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Intent;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {ShadowUtils.class}
-)
-public class MasterClearTest {
-
-    @Mock
-    private MasterClear mMasterClear;
-    @Mock
-    private ScrollView mScrollView;
-    @Mock
-    private LinearLayout mLinearLayout;
-    private ShadowActivity mShadowActivity;
-    private Activity mActivity;
-    private View mContentView;
-
-    private class ActivityForTest extends SettingsActivity {
-        private Bundle mArgs;
-
-        @Override
-        public void startPreferencePanel(Fragment caller, String fragmentClass, Bundle args,
-            int titleRes, CharSequence titleText, Fragment resultTo, int resultRequestCode) {
-            mArgs = args;
-        }
-
-        public Bundle getArgs() {
-            return mArgs;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mMasterClear = spy(new MasterClear());
-        mActivity = Robolectric.setupActivity(Activity.class);
-        mShadowActivity = shadowOf(mActivity);
-        mContentView = LayoutInflater.from(mActivity).inflate(R.layout.master_clear, null);
-
-        // Make scrollView only have one child
-        when(mScrollView.getChildAt(0)).thenReturn(mLinearLayout);
-        when(mScrollView.getChildCount()).thenReturn(1);
-    }
-
-    @Test
-    public void testShowWipeEuicc_euiccDisabled() {
-        prepareEuiccState(
-                false /* isEuiccEnabled */, true /* isEuiccProvisioned */);
-        assertThat(mMasterClear.showWipeEuicc()).isFalse();
-    }
-
-    @Test
-    public void testShowWipeEuicc_euiccEnabled_unprovisioned() {
-        prepareEuiccState(
-                true /* isEuiccEnabled */, false /* isEuiccProvisioned */);
-        assertThat(mMasterClear.showWipeEuicc()).isFalse();
-    }
-
-    @Test
-    public void testShowWipeEuicc_euiccEnabled_provisioned() {
-        prepareEuiccState(
-                true /* isEuiccEnabled */, true /* isEuiccProvisioned */);
-        assertThat(mMasterClear.showWipeEuicc()).isTrue();
-    }
-
-    private void prepareEuiccState(
-            boolean isEuiccEnabled,
-            boolean isEuiccProvisioned) {
-        doReturn(mActivity).when(mMasterClear).getContext();
-        doReturn(isEuiccEnabled).when(mMasterClear).isEuiccEnabled(any());
-        ContentResolver cr = mActivity.getContentResolver();
-        Settings.Global.putInt(
-                cr, android.provider.Settings.Global.EUICC_PROVISIONED, isEuiccProvisioned ? 1 : 0);
-    }
-
-    @Test
-    public void testHasReachedBottom_NotScrollDown_returnFalse() {
-        initScrollView(100, 0, 200);
-
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isFalse();
-    }
-
-    @Test
-    public void testHasReachedBottom_CanNotScroll_returnTrue() {
-        initScrollView(100, 0, 80);
-
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isTrue();
-    }
-
-    @Test
-    public void testHasReachedBottom_ScrollToBottom_returnTrue() {
-        initScrollView(100, 100, 200);
-
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isTrue();
-    }
-
-    @Test
-    public void testInitiateMasterClear_inDemoMode_sendsIntent() {
-        ShadowUtils.setIsDemoUser(true);
-
-        final ComponentName componentName = ComponentName.unflattenFromString(
-                "com.android.retaildemo/.DeviceAdminReceiver");
-        ShadowUtils.setDeviceOwnerComponent(componentName);
-
-        mMasterClear.mInitiateListener.onClick(
-                mContentView.findViewById(R.id.initiate_master_clear));
-        final Intent intent = mShadowActivity.getNextStartedActivity();
-        assertThat(Intent.ACTION_FACTORY_RESET).isEqualTo(intent.getAction());
-        assertThat(componentName.getPackageName()).isEqualTo(intent.getPackage());
-    }
-
-    private void initScrollView(int height, int scrollY, int childBottom) {
-        when(mScrollView.getHeight()).thenReturn(height);
-        when(mScrollView.getScrollY()).thenReturn(scrollY);
-        when(mLinearLayout.getBottom()).thenReturn(childBottom);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
deleted file mode 100644
index c52204dba127c00bb216c0dec907ee1c5b5702a4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PrivacySettingsTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    private PrivacySettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(PrivacySettings.BACKUP_DATA))
-                .thenReturn(mock(Preference.class));
-        when(mScreen.findPreference(PrivacySettings.CONFIGURE_ACCOUNT))
-                .thenReturn(mock(Preference.class));
-        when(mScreen.findPreference(PrivacySettings.DATA_MANAGEMENT))
-                .thenReturn(mock(Preference.class));
-        when(mScreen.findPreference(PrivacySettings.AUTO_RESTORE))
-                .thenReturn(mock(SwitchPreference.class));
-        mSettings = new PrivacySettings();
-    }
-
-    @Test
-    public void testSetPreference_noCrash() {
-        mSettings.setPreferenceReferences(mScreen);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
deleted file mode 100644
index 3d0d5a1f9c26cfb7c0b86b0f244799aea0f91bc3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.IContentProvider;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.notification.LockScreenNotificationPreferenceController;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
-import com.android.settingslib.drawer.DashboardCategory;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-import java.util.Map;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {ShadowLockPatternUtils.class}
-)
-public class SecuritySettingsTest {
-
-    private static final String MOCK_SUMMARY = "summary";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private DashboardCategory mDashboardCategory;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-
-    private SecuritySettings.SummaryProvider mSummaryProvider;
-
-    @Implements(com.android.settingslib.drawer.TileUtils.class)
-    public static class ShadowTileUtils {
-        @Implementation
-        public static String getTextFromUri(Context context, String uriString,
-                Map<String, IContentProvider> providerMap, String key) {
-            return MOCK_SUMMARY;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mSummaryProvider = new SecuritySettings.SummaryProvider(mContext, mSummaryLoader);
-    }
-
-    @Test
-    public void testSummaryProvider_notListening() {
-        mSummaryProvider.setListening(false);
-
-        verifyNoMoreInteractions(mSummaryLoader);
-    }
-
-    @Test
-    public void testSummaryProvider_hasFingerPrint_hasStaticSummary() {
-        final FingerprintManager fpm = mock(FingerprintManager.class);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(true);
-
-        // Cast to Object to workaround a robolectric casting bug
-        when((Object) mContext.getSystemService(FingerprintManager.class)).thenReturn(fpm);
-        when(fpm.isHardwareDetected()).thenReturn(true);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mContext).getString(R.string.security_dashboard_summary);
-    }
-
-    @Test
-    public void testSummaryProvider_noFpFeature_shouldSetSummaryWithNoFingerprint() {
-        final FingerprintManager fpm = mock(FingerprintManager.class);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-            .thenReturn(false);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
-    }
-
-    @Test
-    public void testSummaryProvider_noFpHardware_shouldSetSummaryWithNoFingerprint() {
-        final FingerprintManager fpm = mock(FingerprintManager.class);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-            .thenReturn(true);
-
-        // Cast to Object to workaround a robolectric casting bug
-        when((Object) mContext.getSystemService(FingerprintManager.class)).thenReturn(fpm);
-        when(fpm.isHardwareDetected()).thenReturn(false);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
-    }
-
-    @Test
-    public void testInitTrustAgentPreference_secure_shouldSetSummaryToNumberOfTrustAgent() {
-        final Preference preference = mock(Preference.class);
-        final PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(SecuritySettings.KEY_MANAGE_TRUST_AGENTS))
-                .thenReturn(preference);
-        final LockPatternUtils utils = mock(LockPatternUtils.class);
-        when(utils.isSecure(anyInt())).thenReturn(true);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        final Activity activity = mock(Activity.class);
-        when(activity.getResources()).thenReturn(context.getResources());
-        final SecuritySettings securitySettings = spy(new SecuritySettings());
-        when(securitySettings.getActivity()).thenReturn(activity);
-
-        ReflectionHelpers.setField(securitySettings, "mLockPatternUtils", utils);
-
-        securitySettings.initTrustAgentPreference(screen, 0);
-        verify(preference).setSummary(R.string.manage_trust_agents_summary);
-
-        securitySettings.initTrustAgentPreference(screen, 2);
-        verify(preference).setSummary(context.getResources().getQuantityString(
-            R.plurals.manage_trust_agents_summary_on, 2, 2));
-    }
-
-    @Test
-    public void testSetLockscreenPreferencesSummary_shouldSetSummaryFromLockScreenNotification() {
-        final Preference preference = mock(Preference.class);
-        final PreferenceGroup group = mock(PreferenceGroup.class);
-        when(group.findPreference(SecuritySettings.KEY_LOCKSCREEN_PREFERENCES))
-            .thenReturn(preference);
-        final LockScreenNotificationPreferenceController controller =
-            mock(LockScreenNotificationPreferenceController.class);
-
-        final SecuritySettings securitySettings = new SecuritySettings();
-        ReflectionHelpers.setField(securitySettings,
-            "mLockScreenNotificationPreferenceController", controller);
-
-        when(controller.getSummaryResource()).thenReturn(1234);
-        securitySettings.setLockscreenPreferencesSummary(group);
-        verify(preference).setSummary(1234);
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = spy(RuntimeEnvironment.application);
-        UserManager manager = mock(UserManager.class);
-        when(manager.isAdminUser()).thenReturn(false);
-        doReturn(manager).when(context).getSystemService(Context.USER_SERVICE);
-        final List<String> niks = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.security_settings_misc);
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.location_settings));
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.encryption_and_credential));
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
deleted file mode 100644
index 942634a0a71250856cdd60325e070cabc8e08c69..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings;
-
-import android.app.Dialog;
-import android.app.Fragment;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SettingsDialogFragmentTest {
-
-    private static final int DIALOG_ID = 15;
-
-    @Mock
-    private DialogCreatableFragment mDialogCreatable;
-    private SettingsPreferenceFragment.SettingsDialogFragment mDialogFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void testGetMetrics_shouldGetMetricFromDialogCreatable() {
-        when(mDialogCreatable.getDialogMetricsCategory(DIALOG_ID)).thenReturn(1);
-
-        mDialogFragment =
-                new SettingsPreferenceFragment.SettingsDialogFragment(mDialogCreatable, DIALOG_ID);
-        mDialogFragment.getMetricsCategory();
-
-        // getDialogMetricsCategory called in constructor, and explicitly in test.
-        verify(mDialogCreatable, times(2)).getDialogMetricsCategory(DIALOG_ID);
-    }
-
-    @Test
-    public void testGetInvalidMetricsValue_shouldCrash() {
-        when(mDialogCreatable.getDialogMetricsCategory(DIALOG_ID)).thenReturn(-1);
-
-        try {
-            mDialogFragment = new SettingsPreferenceFragment.SettingsDialogFragment(
-                    mDialogCreatable, DIALOG_ID);
-        } catch (IllegalStateException e) {
-            // getDialogMetricsCategory called in constructor
-            verify(mDialogCreatable).getDialogMetricsCategory(DIALOG_ID);
-            return;
-        }
-        fail("Should fail with IllegalStateException");
-    }
-
-    public static class DialogCreatableFragment extends Fragment implements DialogCreatable {
-
-        @Override
-        public Dialog onCreateDialog(int dialogId) {
-            return null;
-        }
-
-        @Override
-        public int getDialogMetricsCategory(int dialogId) {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
deleted file mode 100644
index 0d0f22c16790d81e582b1e0318973a0b168dad60..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings;
-
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.support.annotation.NonNull;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SettingsDumpServiceTest {
-    private static final String PACKAGE_BROWSER = "com.android.test.browser";
-    private static final String PACKAGE_NULL = "android";
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private ResolveInfo mResolveInfo;
-    private TestService mTestService;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mPackageManager.resolveActivity(TestService.BROWSER_INTENT,
-                PackageManager.MATCH_DEFAULT_ONLY)).thenReturn(mResolveInfo);
-        mTestService = new TestService();
-        mTestService.setPackageManager(mPackageManager);
-    }
-
-    @Test
-    public void testDumpDefaultBrowser_DefaultBrowser_ReturnBrowserName() {
-        mResolveInfo.activityInfo = new ActivityInfo();
-        mResolveInfo.activityInfo.packageName = PACKAGE_BROWSER;
-
-        assertThat(mTestService.dumpDefaultBrowser()).isEqualTo(PACKAGE_BROWSER);
-    }
-
-    @Test
-    public void testDumpDefaultBrowser_NoDefault_ReturnNull() {
-        mResolveInfo.activityInfo = new ActivityInfo();
-        mResolveInfo.activityInfo.packageName = PACKAGE_NULL;
-
-        assertThat(mTestService.dumpDefaultBrowser()).isEqualTo(null);
-    }
-
-    @Test
-    public void testDump_ReturnJsonObject() throws JSONException {
-        mResolveInfo.activityInfo = new ActivityInfo();
-        mResolveInfo.activityInfo.packageName = PACKAGE_BROWSER;
-        TestPrintWriter printWriter = new TestPrintWriter(System.out);
-
-        mTestService.dump(null, printWriter, null);
-        JSONObject object = (JSONObject)printWriter.getPrintObject();
-
-        assertThat(object.get(TestService.KEY_SERVICE)).isNotNull();
-    }
-
-    /**
-     * Test service used to pass in the mock {@link PackageManager}
-     */
-    private class TestService extends SettingsDumpService {
-        private PackageManager mPm;
-
-        public void setPackageManager(PackageManager pm) {
-            mPm = pm;
-        }
-
-        @Override
-        public PackageManager getPackageManager() {
-            return mPm;
-        }
-    }
-
-    /**
-     * Test printWriter to store the object to be printed
-     */
-    private class TestPrintWriter extends PrintWriter {
-        private Object mPrintObject;
-
-        public TestPrintWriter(@NonNull OutputStream out) {
-            super(out);
-        }
-
-        @Override
-        public void println(Object object) {
-            mPrintObject = object;
-        }
-
-        public Object getPrintObject() {
-            return mPrintObject;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
deleted file mode 100644
index dd17d9c1e8ec291778a681c6a24fe5cd2e381cb9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.Application;
-import android.os.SystemProperties;
-import android.content.Intent;
-import android.net.Uri;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import java.io.File;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SettingsLicenseActivityTest {
-    private ActivityController<SettingsLicenseActivity> mActivityController;
-    private SettingsLicenseActivity mActivity;
-    private Application mApplication;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mApplication = RuntimeEnvironment.application;
-        mActivityController = Robolectric.buildActivity(SettingsLicenseActivity.class);
-        mActivity = spy(mActivityController.get());
-    }
-
-    void assertEqualIntents(Intent actual, Intent expected) {
-        assertThat(actual.getAction()).isEqualTo(expected.getAction());
-        assertThat(actual.getDataString()).isEqualTo(expected.getDataString());
-        assertThat(actual.getType()).isEqualTo(expected.getType());
-        assertThat(actual.getCategories()).isEqualTo(expected.getCategories());
-        assertThat(actual.getPackage()).isEqualTo(expected.getPackage());
-        assertThat(actual.getFlags()).isEqualTo(expected.getFlags());
-    }
-
-    @Test
-    public void testOnCreateWithValidHtmlFile() {
-        SystemProperties.set("ro.config.license_path", "/system/etc/NOTICE.html.gz");
-
-        doReturn(true).when(mActivity).isFileValid(any());
-        mActivity.onCreate(null);
-
-        final Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(Uri.parse("file:///system/etc/NOTICE.html.gz"), "text/html");
-        intent.putExtra(Intent.EXTRA_TITLE, mActivity.getString(
-                R.string.settings_license_activity_title));
-        intent.addCategory(Intent.CATEGORY_DEFAULT);
-        intent.setPackage("com.android.htmlviewer");
-
-        assertEqualIntents(shadowOf(mApplication).getNextStartedActivity(), intent);
-    }
-
-    @Test
-    public void testOnCreateWithGeneratedHtmlFile() {
-        doReturn(null).when(mActivity).onCreateLoader(anyInt(), any());
-        doReturn(Uri.parse("content://com.android.settings.files/my_cache/generated_test.html"))
-                .when(mActivity).getUriFromGeneratedHtmlFile(any());
-
-        mActivity.onCreate(null);
-        mActivity.onLoadFinished(null, new File("/generated_test.html"));
-
-        final Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(
-                Uri.parse("content://com.android.settings.files/my_cache/generated_test.html"),
-                "text/html");
-        intent.putExtra(Intent.EXTRA_TITLE, mActivity.getString(
-                R.string.settings_license_activity_title));
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        intent.addCategory(Intent.CATEGORY_DEFAULT);
-        intent.setPackage("com.android.htmlviewer");
-
-        assertEqualIntents(shadowOf(mApplication).getNextStartedActivity(), intent);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
deleted file mode 100644
index dc4166d7eb3e07a08fb9cddc497e76fa2b202d3f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.View;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SettingsPreferenceFragmentTest {
-
-    private static final int ITEM_COUNT = 5;
-
-    @Mock
-    private PreferenceManager mPreferenceManager;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private View mListContainer;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    private Context mContext;
-    private TestFragment mFragment;
-    private View mEmptyView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mFragment = spy(new TestFragment());
-        doReturn(mActivity).when(mFragment).getActivity();
-
-        mEmptyView = new View(mContext);
-        ReflectionHelpers.setField(mFragment, "mEmptyView", mEmptyView);
-
-        doReturn(ITEM_COUNT).when(mPreferenceScreen).getPreferenceCount();
-    }
-
-    @Test
-    public void removePreference_nested_shouldRemove() {
-        final String key = "test_key";
-        final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
-        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-
-        final PreferenceCategory nestedCategory = new ProgressCategory(mContext);
-        final Preference preference = new Preference(mContext);
-        preference.setKey(key);
-        preference.setPersistent(false);
-
-        mScreen.addPreference(nestedCategory);
-        nestedCategory.addPreference(preference);
-
-        assertThat(mFragment.removePreference(mScreen, key)).isTrue();
-        assertThat(nestedCategory.getPreferenceCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void removePreference_flat_shouldRemove() {
-        final String key = "test_key";
-        final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
-        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-
-        final Preference preference = mock(Preference.class);
-        when(preference.getKey()).thenReturn(key);
-
-        mScreen.addPreference(preference);
-
-        assertThat(mFragment.removePreference(mScreen, key)).isTrue();
-        assertThat(mScreen.getPreferenceCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void removePreference_doNotExist_shouldNotRemove() {
-        final String key = "test_key";
-        final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
-        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-
-        final Preference preference = mock(Preference.class);
-        when(preference.getKey()).thenReturn(key);
-
-        mScreen.addPreference(preference);
-
-        assertThat(mFragment.removePreference(mScreen, "not" + key)).isFalse();
-        assertThat(mScreen.getPreferenceCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void testUpdateEmptyView_containerInvisible_emptyViewVisible() {
-        doReturn(View.INVISIBLE).when(mListContainer).getVisibility();
-        doReturn(mListContainer).when(mActivity).findViewById(android.R.id.list_container);
-        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
-
-        mFragment.updateEmptyView();
-
-        assertThat(mEmptyView.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void testUpdateEmptyView_containerNull_emptyViewGone() {
-        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
-
-        mFragment.updateEmptyView();
-
-        assertThat(mEmptyView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    public static class TestFragment extends SettingsPreferenceFragment {
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-    }
-
-
-}
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
deleted file mode 100644
index 69a1351795113fa831aa834f5d0299262ab9e21d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.pm.PackageManager;
-import android.os.UserHandle;
-
-import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
-import com.android.settings.password.ChooseLockPattern.IntentBuilder;
-import com.android.settings.password.SetupChooseLockPattern;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.res.builder.RobolectricPackageManager.ComponentState;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEventLogWriter.class,
-                ShadowUtils.class
-        })
-public class SetupChooseLockPatternTest {
-
-    private SetupChooseLockPattern mActivity;
-
-    @Before
-    public void setUp() {
-        RuntimeEnvironment.getRobolectricPackageManager().setComponentEnabledSetting(
-                new ComponentName(application, SetupRedactionInterstitial.class),
-                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                PackageManager.DONT_KILL_APP);
-
-        mActivity =  Robolectric.buildActivity(
-                SetupChooseLockPattern.class,
-                SetupChooseLockPattern.modifyIntentForSetup(
-                        application,
-                        new IntentBuilder(application)
-                                .setUserId(UserHandle.myUserId())
-                                .build()))
-                .setup().get();
-    }
-
-    @Test
-    public void chooseLockSaved_shouldEnableRedactionInterstitial() {
-        findFragment(mActivity).onChosenLockSaveFinished(false, null);
-
-        ComponentState redactionComponentState =
-                RuntimeEnvironment.getRobolectricPackageManager().getComponentState(
-                        new ComponentName(application, SetupRedactionInterstitial.class));
-        assertThat(redactionComponentState.newState).named("Redaction component state")
-                .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
-    }
-
-    private ChooseLockPatternFragment findFragment(Activity activity) {
-        return (ChooseLockPatternFragment)
-                activity.getFragmentManager().findFragmentById(R.id.main_content);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
deleted file mode 100644
index 21061c1b33db15e32fb66646b5b8753deb964a95..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static com.android.settings.testutils.ResIdSubject.assertResId;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Intent;
-
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.setupwizardlib.util.WizardManagerHelper;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowSystemProperties.class
-        })
-public class SetupWizardUtilsTest {
-
-    @After
-    public void tearDown() {
-        SettingsShadowSystemProperties.clear();
-    }
-
-    @Test
-    public void testCopySetupExtras() throws Throwable {
-        Intent fromIntent = new Intent();
-        final String theme = "TEST_THEME";
-        fromIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);
-        fromIntent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, true);
-        Intent toIntent = new Intent();
-        SetupWizardUtils.copySetupExtras(fromIntent, toIntent);
-
-        assertThat(theme).isEqualTo(toIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME));
-        assertThat(toIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false))
-                .isTrue();
-    }
-
-    @Test
-    public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
-        SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
-                WizardManagerHelper.THEME_GLIF);
-        Intent intent = new Intent();
-        intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
-
-        assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
-    }
-
-    @Test
-    public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() {
-        SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
-                WizardManagerHelper.THEME_GLIF_V2_LIGHT);
-        Intent intent = new Intent();
-
-        assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
deleted file mode 100644
index 59a5867081a0af1ab5744b22884c5bdba077a6c7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class
-})
-public class SummaryPreferenceTest {
-
-    private Context mContext;
-    private PreferenceViewHolder mHolder;
-    private SummaryPreference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SummaryPreference(mContext, null);
-
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        final View view = inflater.inflate(mPreference.getLayoutResource(),
-                new LinearLayout(mContext), false);
-
-        mHolder = PreferenceViewHolder.createInstanceForTests(view);
-    }
-
-    @Test
-    public void disableChart_shouldNotRender() {
-        mPreference.setChartEnabled(false);
-        mPreference.onBindViewHolder(mHolder);
-
-        assertTrue(
-                TextUtils.isEmpty(((TextView) mHolder.findViewById(android.R.id.text1)).getText()));
-        assertTrue(
-                TextUtils.isEmpty(((TextView) mHolder.findViewById(android.R.id.text2)).getText()));
-    }
-
-    @Test
-    public void enableChart_shouldRender() {
-        final String testLabel1 = "label1";
-        final String testLabel2 = "label2";
-        mPreference.setChartEnabled(true);
-        mPreference.setLabels(testLabel1, testLabel2);
-        mPreference.onBindViewHolder(mHolder);
-
-        assertEquals(testLabel1,
-                ((TextView) mHolder.findViewById(android.R.id.text1)).getText());
-        assertEquals(testLabel2,
-                ((TextView) mHolder.findViewById(android.R.id.text2)).getText());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/TestConfig.java b/tests/robotests/src/com/android/settings/TestConfig.java
deleted file mode 100644
index 3b2d2e46d42eeb0ae7881576152ada6b45d5a658..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/TestConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-/**
- * Constants for Robolectric config
- */
-public class TestConfig {
-    public static final int SDK_VERSION = 23;
-    public static final String MANIFEST_PATH = "packages/apps/Settings/AndroidManifest.xml";
-}
diff --git a/tests/robotests/src/com/android/settings/TestUtils.java b/tests/robotests/src/com/android/settings/TestUtils.java
deleted file mode 100644
index 16d35f3622d034371cc53b8b5640ba456bf37242..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/TestUtils.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-/**
- * Convenience methods and constants for testing.
- */
-public class TestUtils {
-    public static final long KILOBYTE = 1024L; // TODO: Change to 1000 in O Robolectric.
-    public static final long MEGABYTE = KILOBYTE * KILOBYTE;
-    public static final long GIGABYTE = KILOBYTE * MEGABYTE;
-}
diff --git a/tests/robotests/src/com/android/settings/TetherServiceTest.java b/tests/robotests/src/com/android/settings/TetherServiceTest.java
deleted file mode 100644
index 0275c1525f993cf008afecc90aeb897adb7e80dd..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/TetherServiceTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TetherServiceTest {
-
-    @Mock
-    private Context mContext;
-
-    private ShadowApplication mShadowApplication;
-    private Context mAppContext;
-    private TetherService mService;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mShadowApplication = ShadowApplication.getInstance();
-        mAppContext = mShadowApplication.getApplicationContext();
-        mService = new TetherService();
-        ReflectionHelpers.setField(mService, "mBase", mAppContext);
-        mService.setHotspotOffReceiver(new HotspotOffReceiver(mContext));
-    }
-
-    @Test
-    public void scheduleAlarm_shouldRegisterReceiver() {
-        mService.setHotspotOffReceiver(new HotspotOffReceiver(mAppContext));
-
-        mService.scheduleAlarm();
-
-        assertThat(mShadowApplication.hasReceiverForIntent(
-            new Intent(WifiManager.WIFI_AP_STATE_CHANGED_ACTION))).isTrue();
-    }
-
-    @Test
-    public void cancelAlarmIfNecessary_hasActiveTethers_shouldNotUnregisterReceiver() {
-        mService.scheduleAlarm();
-        final ArrayList<Integer> tethers = new ArrayList<>();
-        tethers.add(1);
-        ReflectionHelpers.setField(mService, "mCurrentTethers", tethers);
-
-        mService.cancelAlarmIfNecessary();
-        verify(mContext, never()).unregisterReceiver(any(HotspotOffReceiver.class));
-    }
-
-    @Test
-    public void cancelAlarmIfNecessary_noActiveTethers_shouldUnregisterReceiver() {
-        final ArrayList<Integer> tethers = new ArrayList<>();
-        ReflectionHelpers.setField(mService, "mCurrentTethers", tethers);
-        mService.scheduleAlarm();
-
-        mService.cancelAlarmIfNecessary();
-        verify(mContext).unregisterReceiver(any(HotspotOffReceiver.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
deleted file mode 100644
index 33ead1fd4d03b09a6ae9b6db43637ab684225d71..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.UserInfo;
-import android.net.ConnectivityManager;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.Network;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.UserManager;
-import android.os.storage.DiskInfo;
-import android.os.storage.StorageManager;
-import android.os.storage.VolumeInfo;
-import android.text.SpannableStringBuilder;
-import android.text.format.DateUtils;
-import android.text.style.TtsSpan;
-
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UtilsTest {
-
-    private static final String TIME_DESCRIPTION = "1 day 20 hours 30 minutes";
-    private static final String PACKAGE_NAME = "com.android.app";
-    private Context mContext;
-    @Mock
-    private WifiManager wifiManager;
-    @Mock
-    private Network network;
-    @Mock
-    private ConnectivityManager connectivityManager;
-    @Mock
-    private DevicePolicyManagerWrapper mDevicePolicyManager;
-    @Mock
-    private UserManager mUserManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(WifiManager.class)).thenReturn(wifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(connectivityManager);
-    }
-
-    @Test
-    public void testGetWifiIpAddresses_succeeds() throws Exception {
-        when(wifiManager.getCurrentNetwork()).thenReturn(network);
-        LinkAddress address = new LinkAddress(InetAddress.getByName("127.0.0.1"), 0);
-        LinkProperties lp = new LinkProperties();
-        lp.addLinkAddress(address);
-        when(connectivityManager.getLinkProperties(network)).thenReturn(lp);
-
-        assertThat(Utils.getWifiIpAddresses(mContext)).isEqualTo("127.0.0.1");
-    }
-
-    @Test
-    public void testGetWifiIpAddresses_nullLinkProperties() {
-        when(wifiManager.getCurrentNetwork()).thenReturn(network);
-        // Explicitly set the return value to null for readability sake.
-        when(connectivityManager.getLinkProperties(network)).thenReturn(null);
-
-        assertThat(Utils.getWifiIpAddresses(mContext)).isNull();
-    }
-
-    @Test
-    public void testGetWifiIpAddresses_nullNetwork() {
-        // Explicitly set the return value to null for readability sake.
-        when(wifiManager.getCurrentNetwork()).thenReturn(null);
-
-        assertThat(Utils.getWifiIpAddresses(mContext)).isNull();
-    }
-
-    @Test
-    public void testAssignDefaultPhoto_ContextNull_ReturnFalseAndNotCrash() {
-        // Should not crash here
-        assertThat(Utils.assignDefaultPhoto(null, 0)).isFalse();
-    }
-
-    @Test
-    public void testFormatElapsedTime_WithSeconds_ShowSeconds() {
-        final double testMillis = 5 * DateUtils.MINUTE_IN_MILLIS + 30 * DateUtils.SECOND_IN_MILLIS;
-        final String expectedTime = "5m 30s";
-
-        assertThat(Utils.formatElapsedTime(mContext, testMillis, true).toString()).isEqualTo(
-                expectedTime);
-    }
-
-    @Test
-    public void testFormatElapsedTime_NoSeconds_DoNotShowSeconds() {
-        final double testMillis = 5 * DateUtils.MINUTE_IN_MILLIS + 30 * DateUtils.SECOND_IN_MILLIS;
-        final String expectedTime = "6m";
-
-        assertThat(Utils.formatElapsedTime(mContext, testMillis, false).toString()).isEqualTo(
-                expectedTime);
-    }
-
-    @Test
-    public void testFormatElapsedTime_TimeMoreThanOneDay_ShowCorrectly() {
-        final double testMillis = 2 * DateUtils.DAY_IN_MILLIS
-                + 4 * DateUtils.HOUR_IN_MILLIS + 15 * DateUtils.MINUTE_IN_MILLIS;
-        final String expectedTime = "2d 4h 15m";
-
-        assertThat(Utils.formatElapsedTime(mContext, testMillis, false).toString()).isEqualTo(
-                expectedTime);
-    }
-
-    @Test
-    public void testFormatElapsedTime_ZeroFieldsInTheMiddleDontShow() {
-        final double testMillis = 2 * DateUtils.DAY_IN_MILLIS + 15 * DateUtils.MINUTE_IN_MILLIS;
-        final String expectedTime = "2d 15m";
-
-        assertThat(Utils.formatElapsedTime(mContext, testMillis, false).toString()).isEqualTo(
-                expectedTime);
-    }
-
-    @Test
-    public void testFormatElapsedTime_FormatZero_WithSeconds() {
-        final double testMillis = 0;
-        final String expectedTime = "0s";
-
-        assertThat(Utils.formatElapsedTime(mContext, testMillis, true).toString()).isEqualTo(
-                expectedTime);
-    }
-
-    @Test
-    public void testFormatElapsedTime_FormatZero_NoSeconds() {
-        final double testMillis = 0;
-        final String expectedTime = "0m";
-
-        assertThat(Utils.formatElapsedTime(mContext, testMillis, false).toString()).isEqualTo(
-                expectedTime);
-    }
-
-    @Test
-    public void testFormatElapsedTime_onlyContainsMinute_hasTtsSpan() {
-        final double testMillis = 15 * DateUtils.MINUTE_IN_MILLIS;
-
-        final CharSequence charSequence = Utils.formatElapsedTime(mContext, testMillis, false);
-        assertThat(charSequence).isInstanceOf(SpannableStringBuilder.class);
-
-        final SpannableStringBuilder expectedString = (SpannableStringBuilder) charSequence;
-        final TtsSpan[] ttsSpans = expectedString.getSpans(0, expectedString.length(),
-                TtsSpan.class);
-
-        assertThat(ttsSpans).asList().hasSize(1);
-        assertThat(ttsSpans[0].getType()).isEqualTo(TtsSpan.TYPE_MEASURE);
-    }
-
-    @Test
-    public void testInitializeVolumeDoesntBreakOnNullVolume() {
-        VolumeInfo info = new VolumeInfo("id", 0, new DiskInfo("id", 0), "");
-        StorageManager storageManager = mock(StorageManager.class, RETURNS_DEEP_STUBS);
-        when(storageManager.findVolumeById(anyString())).thenReturn(info);
-
-        Utils.maybeInitializeVolume(storageManager, new Bundle());
-    }
-
-    @Test
-    public void testGetInstallationStatus_notInstalled_shouldReturnUninstalled() {
-        assertThat(Utils.getInstallationStatus(new ApplicationInfo()))
-                .isEqualTo(R.string.not_installed);
-    }
-
-    @Test
-    public void testGetInstallationStatus_enabled_shouldReturnInstalled() {
-        final ApplicationInfo info = new ApplicationInfo();
-        info.flags = ApplicationInfo.FLAG_INSTALLED;
-        info.enabled = true;
-
-        assertThat(Utils.getInstallationStatus(info)).isEqualTo(R.string.installed);
-    }
-
-    @Test
-    public void testGetInstallationStatus_disabled_shouldReturnDisabled() {
-        final ApplicationInfo info = new ApplicationInfo();
-        info.flags = ApplicationInfo.FLAG_INSTALLED;
-        info.enabled = false;
-
-        assertThat(Utils.getInstallationStatus(info)).isEqualTo(R.string.disabled);
-    }
-
-    @Test
-    public void testIsProfileOrDeviceOwner_deviceOwnerApp_returnTrue() {
-        when(mDevicePolicyManager.isDeviceOwnerAppOnAnyUser(PACKAGE_NAME)).thenReturn(true);
-
-        assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
-                PACKAGE_NAME)).isTrue();
-    }
-
-    @Test
-    public void testIsProfileOrDeviceOwner_profileOwnerApp_returnTrue() {
-        final List<UserInfo> userInfos = new ArrayList<>();
-        userInfos.add(new UserInfo());
-
-        when(mUserManager.getUsers()).thenReturn(userInfos);
-        when(mDevicePolicyManager.getProfileOwnerAsUser(userInfos.get(0).id)).thenReturn(
-                new ComponentName(PACKAGE_NAME, ""));
-
-        assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
-                PACKAGE_NAME)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/ZonePickerTest.java b/tests/robotests/src/com/android/settings/ZonePickerTest.java
deleted file mode 100644
index 31606f1a41fb23b18d7328604815af80fea04f27..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/ZonePickerTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.text.Spanned;
-import android.text.style.TtsSpan;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.SimpleAdapter;
-import android.widget.TextView;
-
-import com.android.settings.datetime.ZonePicker;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowLibcoreTimeZoneNames;
-import com.android.settings.testutils.shadow.ShadowTimeZoneNames;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowLibcoreTimeZoneNames.class,
-                ShadowLibcoreTimeZoneNames.ShadowZoneStringsCache.class,
-                ShadowTimeZoneNames.class
-        }
-)
-public class ZonePickerTest {
-
-    @Test
-    public void testConstructTimeZoneAdapter() {
-        final SimpleAdapter adapter =
-                ZonePicker.constructTimezoneAdapter(RuntimeEnvironment.application, true);
-        assertThat(adapter).isNotNull();
-
-        ViewGroup parent = new FrameLayout(RuntimeEnvironment.application);
-        ViewGroup convertView = new FrameLayout(RuntimeEnvironment.application);
-        TextView text1 = new TextView(RuntimeEnvironment.application);
-        text1.setId(android.R.id.text1);
-        convertView.addView(text1);
-        TextView text2 = new TextView(RuntimeEnvironment.application);
-        text2.setId(android.R.id.text2);
-        convertView.addView(text2);
-
-        adapter.getView(0, convertView, parent);
-        final CharSequence text = text2.getText();
-        assertThat(text).isInstanceOf(Spanned.class);
-        final TtsSpan[] spans = ((Spanned) text).getSpans(0, text.length(), TtsSpan.class);
-        // GMT offset label should have TTS spans
-        assertThat(spans.length).isGreaterThan(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
deleted file mode 100644
index fb32da11ccd53a3b8c06cad83936ebabab1e4072..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.XmlTestUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccessibilitySettingsTest {
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final List<String> keys = new ArrayList<>();
-
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings));
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
deleted file mode 100644
index f2d1e6534acc85934f4389f6433bf08c87841aaf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-
-import android.test.mock.MockContentResolver;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ShortcutServicePickerFragmentTest {
-
-    private static final String TEST_SERVICE_KEY_1 = "abc/123";
-    private static final String TEST_SERVICE_KEY_2 = "abcd/1234";
-
-    private static final String SUMMARY_1 = "summary1";
-    private static final String SUMMARY_2 = "summary2";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-
-    private ShortcutServicePickerFragment mFragment;
-    private MockContentResolver mContentResolver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mFragment = spy(new ShortcutServicePickerFragment());
-        mFragment.onAttach((Context) mActivity);
-
-        doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
-    }
-
-    @Test
-    public void setAndGetDefaultAppKey_shouldUpdateDefaultAppKey() {
-        assertThat(mFragment.setDefaultKey(TEST_SERVICE_KEY_1)).isTrue();
-        assertThat(mFragment.getDefaultKey()).isEqualTo(TEST_SERVICE_KEY_1);
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
deleted file mode 100644
index 15a3746aa9426216f793fbc27acd06167bdcba83..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.accounts;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.DashboardFeatureProviderImpl;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccountDetailDashboardFragmentTest {
-
-    private static final String METADATA_CATEGORY = "com.android.settings.category";
-    private static final String METADATA_ACCOUNT_TYPE = "com.android.settings.ia.account";
-    private static final String METADATA_USER_HANDLE = "user_handle";
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private AccountManager mAccountManager;
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private AccountDetailDashboardFragment mFragment;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
-        mContext = spy(shadowContext.getApplicationContext());
-
-        mFragment = spy(new AccountDetailDashboardFragment());
-        final Bundle args = new Bundle();
-        args.putParcelable(METADATA_USER_HANDLE, UserHandle.CURRENT);
-        mFragment.setArguments(args);
-        mFragment.mAccountType = "com.abc";
-        mFragment.mAccount = new Account("name1@abc.com", "com.abc");
-    }
-
-    @Test
-    public void testCategory_isAccountDetail() {
-        assertThat(new AccountDetailDashboardFragment().getCategoryKey())
-                .isEqualTo(CategoryKey.CATEGORY_ACCOUNT_DETAIL);
-    }
-
-    @Test
-    public void refreshDashboardTiles_HasAccountType_shouldDisplay() {
-        final Tile tile = new Tile();
-        final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
-        metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
-        tile.metaData = metaData;
-
-        assertThat(mFragment.displayTile(tile)).isTrue();
-    }
-
-    @Test
-    public void refreshDashboardTiles_NoAccountType_shouldNotDisplay() {
-        final Tile tile = new Tile();
-        final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
-        tile.metaData = metaData;
-
-        assertThat(mFragment.displayTile(tile)).isFalse();
-    }
-
-    @Test
-    public void refreshDashboardTiles_OtherAccountType_shouldNotDisplay() {
-        final Tile tile = new Tile();
-        final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
-        metaData.putString(METADATA_ACCOUNT_TYPE, "com.other");
-        tile.metaData = metaData;
-
-        assertThat(mFragment.displayTile(tile)).isFalse();
-    }
-
-    @Test
-    public void refreshDashboardTiles_HasAccountType_shouldAddAccountNameToIntent() {
-        FakeFeatureFactory.setupForTest(mActivity);
-        final FakeFeatureFactory featureFactory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
-        final DashboardFeatureProviderImpl dashboardFeatureProvider =
-                new DashboardFeatureProviderImpl(mActivity);
-        final PackageManager packageManager = mock(PackageManager.class);
-        ReflectionHelpers.setField(dashboardFeatureProvider, "mPackageManager", packageManager);
-        when(packageManager.resolveActivity(any(Intent.class), anyInt()))
-            .thenReturn(mock(ResolveInfo.class));
-
-        final Tile tile = new Tile();
-        tile.key = "key";
-        tile.metaData = new Bundle();
-        tile.metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
-        tile.metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
-        tile.metaData.putString("com.android.settings.intent.action", Intent.ACTION_ASSIST);
-        tile.intent = new Intent();
-        tile.userHandle = null;
-        mFragment.displayTile(tile);
-
-        final Activity activity = Robolectric.buildActivity(Activity.class).get();
-        final Preference preference = new Preference(mContext);
-        dashboardFeatureProvider.bindPreferenceToTile(activity,
-                MetricsProto.MetricsEvent.DASHBOARD_SUMMARY, preference, tile, "key",
-                Preference.DEFAULT_ORDER);
-
-        preference.performClick();
-
-        final Intent intent = shadowOf(activity).getNextStartedActivityForResult().intent;
-
-        assertThat(intent.getStringExtra("extra.accountName"))
-                .isEqualTo("name1@abc.com");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
deleted file mode 100644
index 34ac1839ec6bfcfaa180407ae2a4114b72531181..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-
-import android.accounts.Account;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.accounts.AuthenticatorHelper;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class
-)
-public class AccountHeaderPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private PreferenceFragment mFragment;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private LayoutPreference mHeaderPreference;
-
-    private AccountHeaderPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mHeaderPreference = new LayoutPreference(
-                RuntimeEnvironment.application, R.layout.settings_entity_header);
-    }
-
-    @Test
-    public void isAvailable_noArgs_shouldReturnNull() {
-        mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,
-                new Lifecycle(), mActivity, mFragment, null /* args */);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void onResume_shouldDisplayAccountInEntityHeader() {
-        final Lifecycle lifecycle = new Lifecycle();
-        final Account account = new Account("name1@abc.com", "com.abc");
-        Bundle args = new Bundle();
-        args.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT, account);
-        args.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE, UserHandle.CURRENT);
-        mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,
-                lifecycle, mActivity, mFragment, args);
-
-        assertThat(mController.isAvailable()).isTrue();
-
-        when(mScreen.findPreference(anyString())).thenReturn(mHeaderPreference);
-
-        mController.displayPreference(mScreen);
-        lifecycle.onResume();
-
-        final CharSequence label =
-                ((TextView) mHeaderPreference.findViewById(R.id.entity_header_title)).getText();
-
-        assertThat(label).isEqualTo(account.name);
-
-    }
-
-    @Implements(AuthenticatorHelper.class)
-    public static class ShadowAuthenticatorHelper {
-        @Implementation
-        public void onAccountsUpdated(Account[] accounts) {
-
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
deleted file mode 100644
index 139bee79f6dff5ec3432513415c1d887728b3a29..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.accounts;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-
-import com.android.settings.AccessiblePreferenceCategory;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.shadow.ShadowAccountManager;
-import com.android.settings.testutils.shadow.ShadowContentResolver;
-import com.android.settingslib.accounts.AuthenticatorHelper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
-public class AccountPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private SettingsPreferenceFragment mFragment;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private AccountManager mAccountManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private AccountRestrictionHelper mAccountHelper;
-
-    private Context mContext;
-    private AccountPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
-        shadowContext.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
-        mContext = shadowContext.getApplicationContext();
-
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
-                new AuthenticatorDescription[0]);
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
-        mController = new AccountPreferenceController(mContext, mFragment, null, mAccountHelper);
-    }
-
-    @Test
-    public void onResume_managedProfile_shouldNotAddAccountCategory() {
-        when(mUserManager.isManagedProfile()).thenReturn(true);
-        mController.onResume();
-
-        verify(mScreen, never()).addPreference(any(Preference.class));
-    }
-
-    @Test
-    public void onResume_linkedUser_shouldAddOneAccountCategory() {
-        final UserInfo info = new UserInfo(1, "user 1", 0);
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(true);
-        when(mUserManager.getUserInfo(anyInt())).thenReturn(info);
-
-        mController.onResume();
-
-        verify(mScreen, times(1)).addPreference(any(PreferenceGroup.class));
-    }
-
-    @Test
-    public void onResume_oneProfile_shouldAddOneAccountCategory() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.onResume();
-
-        verify(mScreen, times(1)).addPreference(any(PreferenceGroup.class));
-    }
-
-    @Test
-    public void onResume_twoProfiles_shouldAddTwoAccountCategory() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.onResume();
-
-        verify(mScreen, times(2)).addPreference(any(PreferenceGroup.class));
-    }
-
-    @Test
-    public void onResume_noProfileChange_shouldNotAddOrRemoveAccountCategory() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        // First time resume will build the UI
-        mController.onResume();
-        reset(mScreen);
-
-        mController.onResume();
-        verify(mScreen, never()).addPreference(any(PreferenceGroup.class));
-        verify(mScreen, never()).removePreference(any(PreferenceGroup.class));
-    }
-
-    @Test
-    public void onResume_oneNewProfile_shouldAddOneAccountCategory() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        // First time resume will build the UI
-        mController.onResume();
-        // add a new profile
-        infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-        reset(mScreen);
-
-        mController.onResume();
-        verify(mScreen, times(1)).addPreference(any(PreferenceGroup.class));
-    }
-
-    @Test
-    public void onResume_oneProfileRemoved_shouldRemoveOneAccountCategory() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        // First time resume will build the UI
-        mController.onResume();
-        // remove a profile
-        infos.remove(1);
-
-        mController.onResume();
-        verify(mScreen, times(1)).removePreference(any(PreferenceGroup.class));
-    }
-
-    @Test
-    public void onResume_oneProfile_shouldSetAccountTitleWithUserName() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-
-        mController.onResume();
-
-        verify(preferenceGroup).setTitle(
-                mContext.getString(R.string.account_for_section_header, "user 1"));
-
-    }
-
-    @Test
-    public void onResume_noPreferenceScreen_shouldNotCrash() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-
-        mController.onResume();
-
-        // Should not crash
-    }
-
-    @Test
-    public void onResume_noPreferenceManager_shouldNotCrash() {
-        when(mFragment.getPreferenceManager()).thenReturn(null);
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        mController.onResume();
-
-        // Should not crash
-    }
-
-    @Test
-    public void updateRawDataToIndex_ManagedProfile_shouldNotUpdate() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        when(mUserManager.isManagedProfile()).thenReturn(true);
-
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data).isEmpty();
-    }
-
-    @Test
-    public void updateRawDataToIndex_DisabledUser_shouldNotUpdate() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_DISABLED));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data).isEmpty();
-    }
-
-    @Test
-    public void updateRawDataToIndex_EnabledUser_shouldAddOne() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void updateRawDataToIndex_ManagedUser_shouldAddThree() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data.size()).isEqualTo(3);
-    }
-
-    @Test
-    public void updateRawDataToIndex_DisallowRemove_shouldAddTwo() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        when(mAccountHelper.hasBaseUserRestriction(
-                eq(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE), anyInt()))
-                .thenReturn(true);
-
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data.size()).isEqualTo(2);
-    }
-
-    @Test
-    public void updateRawDataToIndex_DisallowModify_shouldAddTwo() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        when(mAccountHelper.hasBaseUserRestriction(
-                eq(UserManager.DISALLOW_MODIFY_ACCOUNTS), anyInt())).thenReturn(true);
-
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data.size()).isEqualTo(2);
-    }
-
-    @Test
-    public void onResume_twoAccountsOfSameType_shouldAddThreePreferences() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        Account[] accounts = {new Account("Account1", "com.acct1")};
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
-
-        Account[] accountType1 = new Account[2];
-        accountType1[0] = new Account("Account11", "com.acct1");
-        accountType1[1] = new Account("Account12", "com.acct1");
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accountType1);
-
-        AuthenticatorDescription[] authDescs = {
-                new AuthenticatorDescription("com.acct1", "com.android.settings",
-                        R.string.account_settings_title, 0, 0, 0, false)
-        };
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
-
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-
-        mController.onResume();
-
-        // should add 2 individual account and the Add account preference
-        verify(preferenceGroup, times(3)).addPreference(any(Preference.class));
-    }
-
-    @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
-            ShadowAuthenticatorHelper.class})
-    public void onResume_twoAccountsOfSameName_shouldAddFivePreferences() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        final Account[] accountType1 = new Account[2];
-        accountType1[0] = new Account("Account1", "com.acct1");
-        accountType1[1] = new Account("Account2", "com.acct1");
-        final Account[] accountType2 = new Account[2];
-        accountType2[0] = new Account("Account1", "com.acct2");
-        accountType2[1] = new Account("Account2", "com.acct2");
-        final Account[] allAccounts = new Account[4];
-        allAccounts[0] = accountType1[0];
-        allAccounts[1] = accountType1[1];
-        allAccounts[2] = accountType2[0];
-        allAccounts[3] = accountType2[1];
-        final AuthenticatorDescription[] authDescs = {
-                new AuthenticatorDescription("com.acct1", "com.android.settings",
-                        R.string.account_settings_title, 0, 0, 0, false),
-                new AuthenticatorDescription("com.acct2", "com.android.settings",
-                        R.string.account_settings_title, 0, 0, 0, false)
-        };
-
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(allAccounts);
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accountType1);
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct2"), any(UserHandle.class)))
-                .thenReturn(accountType2);
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
-
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-
-        mController.onResume();
-
-        // should add 4 individual account and the Add account preference
-        verify(preferenceGroup, times(5)).addPreference(any(Preference.class));
-    }
-
-    @Test
-    public void onResume_noAccountChange_shouldNotAddAccountPreference() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        Account[] accounts = {new Account("Acct1", "com.acct1")};
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
-
-        Account[] accountType1 = new Account[2];
-        accountType1[0] = new Account("Acct11", "com.acct1");
-        accountType1[1] = new Account("Acct12", "com.acct1");
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accountType1);
-
-        AuthenticatorDescription[] authDescs = {
-                new AuthenticatorDescription("com.acct1", "com.android.settings",
-                        R.string.account_settings_title, 0, 0, 0, false)
-        };
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
-
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-        mController.onResume();
-
-        mController.onResume();
-
-        // each account should be added only once
-        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct11")));
-        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct12")));
-    }
-
-    @Test
-    public void onResume_oneNewAccount_shouldAddOneAccountPreference() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        Account[] accounts = {new Account("Acct1", "com.acct1")};
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
-
-        Account[] accountType1 = new Account[2];
-        accountType1[0] = new Account("Acct11", "com.acct1");
-        accountType1[1] = new Account("Acct12", "com.acct1");
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accountType1);
-
-        AuthenticatorDescription[] authDescs = {
-                new AuthenticatorDescription("com.acct1", "com.android.settings",
-                        R.string.account_settings_title, 0, 0, 0, false)
-        };
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
-
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-
-        mController.onResume();
-
-        // add a new account
-        accountType1 = new Account[3];
-        accountType1[0] = new Account("Acct11", "com.acct1");
-        accountType1[1] = new Account("Acct12", "com.acct1");
-        accountType1[2] = new Account("Acct13", "com.acct1");
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accountType1);
-
-        mController.onResume();
-
-        // each account should be added only once
-        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct11")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct12")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct13")));
-    }
-
-    @Test
-    public void onResume_oneNewAccountType_shouldAddOneAccountPreference() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-
-        // First time resume will build the UI with no account
-        mController.onResume();
-
-        // Add new account
-        Account[] accounts = {new Account("Acct1", "com.acct1")};
-        when(mAccountManager.getAccountsAsUser(2)).thenReturn(accounts);
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accounts);
-
-        AuthenticatorDescription[] authDescs = {
-                new AuthenticatorDescription("com.acct1", "com.android.settings",
-                        R.string.account_settings_title, 0, 0, 0, false)
-        };
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
-
-        // Resume should show the newly added account
-        mController.onResume();
-
-        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct1")));
-    }
-
-    @Test
-    public void onResume_oneAccountRemoved_shouldRemoveOneAccountPreference() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        Account[] accounts = {new Account("Acct1", "com.acct1")};
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
-
-        Account[] accountType1 = new Account[2];
-        accountType1[0] = new Account("Acct11", "com.acct1");
-        accountType1[1] = new Account("Acct12", "com.acct1");
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accountType1);
-
-        AuthenticatorDescription[] authDescs = {
-                new AuthenticatorDescription("com.acct1", "com.android.settings",
-                        R.string.account_settings_title, 0, 0, 0, false)
-        };
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
-
-        AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
-        when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-                preferenceGroup);
-
-        mController.onResume();
-
-        // remove an account
-        accountType1 = new Account[1];
-        accountType1[0] = new Account("Acct11", "com.acct1");
-        when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-                .thenReturn(accountType1);
-
-        mController.onResume();
-
-        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct11")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct12")));
-        verify(preferenceGroup, times(1)).removePreference(argThat(titleMatches("Acct12")));
-    }
-
-    private static ArgumentMatcher<Preference> titleMatches(String expected) {
-        return preference -> TextUtils.equals(expected, preference.getTitle());
-    }
-
-    @Implements(AuthenticatorHelper.class)
-    public static class ShadowAuthenticatorHelper {
-        @Implementation
-        public Drawable getDrawableForType(Context context, final String accountType) {
-            return new ColorDrawable();
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
deleted file mode 100644
index 07780432be8d80d51d7077075e398041d7b15b48..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import android.accounts.Account;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccountPreferenceTest {
-
-    private Context mContext;
-    private Account mAccount;
-    private ArrayList<String> mAuthorities;
-    private AccountPreference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        mAccount = new Account("name", "type");
-        mAuthorities = new ArrayList<>();
-        mAuthorities.add("authority");
-
-        mPreference = spy(new AccountPreference(
-                mContext, mAccount, null /* icon */, mAuthorities, false /* showTypeIcon */));
-    }
-
-    @Test
-    public void setSyncStatus_differentStatus_shouldUpdate() {
-        mPreference.setSyncStatus(AccountPreference.SYNC_ERROR, true);
-        verify(mPreference).setSummary(R.string.sync_error);
-    }
-
-    @Test
-    public void setSyncStatus_sameStatus_shouldNotUpdate() {
-        // Set it once, should update summary
-        mPreference.setSyncStatus(AccountPreference.SYNC_ERROR, true);
-        verify(mPreference).setSummary(R.string.sync_error);
-
-        // Set it again, should not update summary
-        mPreference.setSyncStatus(AccountPreference.SYNC_ERROR, true);
-        verify(mPreference).setSummary(R.string.sync_error);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
deleted file mode 100644
index 5fbd3a706a446e7b5d5bab45ed628c75ccddf6a7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.accounts;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SyncAdapterType;
-import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowAccountManager;
-import com.android.settings.testutils.shadow.ShadowContentResolver;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
-public class AccountSyncPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private AccountManager mAccountManager;
-
-    private Context mContext;
-    private AccountSyncPreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication application = ShadowApplication.getInstance();
-        application.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
-        mContext = application.getApplicationContext();
-
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
-                new AuthenticatorDescription[0]);
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
-
-        mPreference = new Preference(mContext);
-        mPreference.setKey("account_sync");
-
-        mController = new AccountSyncPreferenceController(mContext);
-        mController.init(new Account("acct1", "type1"), new UserHandle(3));
-    }
-
-    @After
-    public void tearDown() {
-        ShadowContentResolver.reset();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_shouldStartFragment() {
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final Intent nextActivity = ShadowApplication.getInstance().getNextStartedActivity();
-
-        assertThat(nextActivity.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
-                .isEqualTo(AccountSyncSettings.class.getName());
-        assertThat(nextActivity.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
-                .isEqualTo(R.string.account_sync_title);
-    }
-
-    @Test
-    public void updateSummary_adapterInvisible_shouldNotCount() {
-        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
-                "type1" /* accountType */, false /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType[] syncAdapters = {syncAdapterType};
-        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
-    }
-
-    @Test
-    public void updateSummary_notSameAccountType_shouldNotCount() {
-        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
-                "type5" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType[] syncAdapters = {syncAdapterType};
-        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
-    }
-
-    @Test
-    public void updateSummary_notSyncable_shouldNotCount() {
-        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
-                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType[] syncAdapters = {syncAdapterType};
-        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
-        ShadowContentResolver.setSyncable("authority", 0);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
-    }
-
-    @Test
-    public void updateSummary_syncDisabled_shouldNotCount() {
-        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
-                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType[] syncAdapters = {syncAdapterType};
-        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
-        ShadowContentResolver.setSyncAutomatically("authority", false);
-        ShadowContentResolver.setMasterSyncAutomatically(3, true);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
-    }
-
-    @Test
-    public void updateSummary_syncEnabled_shouldCount() {
-        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
-                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType[] syncAdapters = {syncAdapterType};
-        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_on));
-    }
-
-    @Test
-    public void updateSummary_multipleSyncAdapters_shouldSetSummary() {
-        SyncAdapterType syncAdapterType1 = new SyncAdapterType("authority1" /* authority */,
-                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType syncAdapterType2 = new SyncAdapterType("authority2" /* authority */,
-                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType syncAdapterType3 = new SyncAdapterType("authority3" /* authority */,
-                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType syncAdapterType4 = new SyncAdapterType("authority4" /* authority */,
-                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
-        SyncAdapterType[] syncAdapters =
-                {syncAdapterType1, syncAdapterType2, syncAdapterType3, syncAdapterType4};
-        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
-
-        ShadowContentResolver.setSyncAutomatically("authority4", false);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.account_sync_summary_some_on, 3, 4));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
deleted file mode 100644
index fff73b7f8e9783c703e25599bc6af63e4826e760..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserHandle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowAccountManager;
-import com.android.settings.testutils.shadow.ShadowContentResolver;
-import com.android.settingslib.accounts.AuthenticatorHelper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccountTypePreferenceLoaderTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private AccountManager mAccountManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceFragment mPreferenceFragment;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private Context mContext;
-    private Account mAccount;
-    private AccountTypePreferenceLoader mPrefLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
-            new AuthenticatorDescription[0]);
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
-        when(mPreferenceFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
-        mContext = shadowContext.getApplicationContext();
-        mAccount = new Account("name", "type");
-        final AuthenticatorHelper helper = new AuthenticatorHelper(mContext, UserHandle.CURRENT,
-            null /* OnAccountsUpdateListener */);
-        mPrefLoader = spy(new AccountTypePreferenceLoader(mPreferenceFragment, helper,
-            UserHandle.CURRENT));
-    }
-
-    @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
-    public void updatePreferenceIntents_shouldRunRecursively() {
-        final PreferenceManager preferenceManager = mock(PreferenceManager.class);
-        // Top level
-        PreferenceGroup prefRoot = spy(new PreferenceScreen(mContext, null));
-        when(prefRoot.getPreferenceManager()).thenReturn(preferenceManager);
-        Preference pref1 = mock(Preference.class);
-        PreferenceGroup prefGroup2 = spy(new PreferenceScreen(mContext, null));
-        when(prefGroup2.getPreferenceManager()).thenReturn(preferenceManager);
-        Preference pref3 = mock(Preference.class);
-        PreferenceGroup prefGroup4 = spy(new PreferenceScreen(mContext, null));
-        when(prefGroup4.getPreferenceManager()).thenReturn(preferenceManager);
-        prefRoot.addPreference(pref1);
-        prefRoot.addPreference(prefGroup2);
-        prefRoot.addPreference(pref3);
-        prefRoot.addPreference(prefGroup4);
-
-        // 2nd level
-        Preference pref21 = mock(Preference.class);
-        Preference pref22 = mock(Preference.class);
-        prefGroup2.addPreference(pref21);
-        prefGroup2.addPreference(pref22);
-        PreferenceGroup prefGroup41 = spy(new PreferenceScreen(mContext, null));
-        when(prefGroup41.getPreferenceManager()).thenReturn(preferenceManager);
-        Preference pref42 = mock(Preference.class);
-        prefGroup4.addPreference(prefGroup41);
-        prefGroup4.addPreference(pref42);
-
-        // 3rd level
-        Preference pref411 = mock(Preference.class);
-        Preference pref412 = mock(Preference.class);
-        prefGroup41.addPreference(pref411);
-        prefGroup41.addPreference(pref412);
-
-        final String acctType = "testType";
-        mPrefLoader.updatePreferenceIntents(prefRoot, acctType, mAccount);
-
-        verify(mPrefLoader).updatePreferenceIntents(prefGroup2, acctType, mAccount);
-        verify(mPrefLoader).updatePreferenceIntents(prefGroup4, acctType, mAccount);
-        verify(mPrefLoader).updatePreferenceIntents(prefGroup41, acctType, mAccount);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
deleted file mode 100644
index 38f698881aa8f05253e961afe29c3212304de20c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.accounts;
-
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-import android.provider.Settings.Global;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import com.android.settingslib.RestrictedSwitchPreference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AddUserWhenLockedPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UserInfo mUserInfo;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-
-    private Context mContext;
-    private AddUserWhenLockedPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
-        mContext = shadowContext.getApplicationContext();
-        mController = new AddUserWhenLockedPreferenceController(mContext);
-    }
-
-    @Test
-    public void displayPref_NotAdmin_shouldNotDisplay() {
-        when(mUserManager.getUserInfo(anyInt())).thenReturn(mUserInfo);
-        when(mUserInfo.isAdmin()).thenReturn(false);
-        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedWhenSettingIsOn() {
-        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-        Global.putInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 1);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
-        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-        Global.putInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-    }
-
-    @Test
-    public void onPreferenceChange_SettingIsOnWhenPreferenceChecked() {
-        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-        preference.setChecked(true);
-
-        mController.onPreferenceChange(preference, Boolean.TRUE);
-
-        assertThat(Global.getInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0))
-                .isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChange_SettingIsOffWhenPreferenceNotChecked() {
-        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-        preference.setChecked(false);
-
-        mController.onPreferenceChange(preference, Boolean.FALSE);
-
-        assertThat(Global.getInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0))
-                .isEqualTo(0);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
deleted file mode 100644
index b8ad837e24d97e2461345a66e6a8e90ad447749d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.accounts;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.SwitchPreference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutoSyncDataPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private Preference mPreference;
-
-    private Context mContext;
-    private AutoSyncDataPreferenceController mController;
-    private AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment mConfirmSyncFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
-        mContext = shadowContext.getApplicationContext();
-        mController = new AutoSyncDataPreferenceController(mContext, mFragment);
-        mConfirmSyncFragment = new AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment();
-        mConfirmSyncFragment.setTargetFragment(mFragment, 0);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void displayPref_managedProfile_shouldNotDisplay() {
-        when(mUserManager.isManagedProfile()).thenReturn(true);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPref_linkedUser_shouldDisplay() {
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(true);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPref_oneProfile_shouldDisplay() {
-        List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPref_moreThanOneProfile_shouldNotDisplay() {
-        List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        infos.add(new UserInfo(2, "user 2", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void autoSyncData_shouldNotBeSetOnCancel() {
-        final ShadowApplication application = ShadowApplication.getInstance();
-        final Context context = application.getApplicationContext();
-        final SwitchPreference preference = new SwitchPreference(context);
-        preference.setChecked(false);
-        mController = new AutoSyncDataPreferenceController(context, mFragment);
-        mConfirmSyncFragment.mPreference = preference;
-        mConfirmSyncFragment.mEnabling = true;
-
-        mConfirmSyncFragment.onClick(null, DialogInterface.BUTTON_NEGATIVE);
-        assertThat(preference.isChecked()).isFalse();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
deleted file mode 100644
index ab462c001c37ee5e6c39aedf9f7b50ca4af4fd19..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.accounts;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutoSyncPersonalDataPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private Preference mPreference;
-
-    private Context mContext;
-    private AutoSyncPersonalDataPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
-        mContext = shadowContext.getApplicationContext();
-        mController = new AutoSyncPersonalDataPreferenceController(mContext, mFragment);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void displayPref_managedProfile_shouldNotDisplay() {
-        when(mUserManager.isManagedProfile()).thenReturn(true);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPref_linkedUser_shouldNotDisplay() {
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(true);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPref_oneProfile_shouldNotDisplay() {
-        List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPref_prefAvaiable_shouldDisplay() {
-        List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        infos.add(new UserInfo(2, "user 2", 0));
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
deleted file mode 100644
index a25aa281a01267cce09a69d7b9b48389e5de1972..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutoSyncWorkDataPreferenceControllerTest {
-
-    private static int MANAGED_PROFILE_ID = 10;
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private Context mContext;
-
-    private AutoSyncWorkDataPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mController = new AutoSyncWorkDataPreferenceController(mContext, mFragment);
-    }
-
-    @Test
-    public void checkIsAvailable_managedProfile_shouldNotDisplay() {
-        when(mUserManager.isManagedProfile()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void checkIsAvailable_linkedUser_shouldNotDisplay() {
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void checkIsAvailable_singleUserProfile_shouldNotDisplay() {
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
-        when(mUserManager.getProfiles(eq(UserHandle.USER_SYSTEM))).thenReturn(infos);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void multipleProfile_shouldInitWithWorkProfileUserHandle() {
-        when(mUserManager.isManagedProfile()).thenReturn(false);
-        when(mUserManager.isLinkedUser()).thenReturn(false);
-
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
-        infos.add(new UserInfo(
-                MANAGED_PROFILE_ID, "work profile", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.getProfiles(eq(UserHandle.USER_SYSTEM))).thenReturn(infos);
-
-        mController = new AutoSyncWorkDataPreferenceController(mContext, mFragment);
-
-        assertThat(mController.mUserHandle.getIdentifier()).isEqualTo(MANAGED_PROFILE_ID);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
deleted file mode 100644
index 0f7de468307f914c1b5788692a73babefcc89206..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.accounts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.shadow.ShadowAccountManager;
-import com.android.settings.testutils.shadow.ShadowContentResolver;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EmergencyInfoPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-
-    private EmergencyInfoPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new EmergencyInfoPreferenceController(mContext);
-    }
-
-    @Test
-    public void updateRawDataToIndex_prefUnavaiable_shouldNotUpdate() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        when(mContext.getPackageManager().queryIntentActivities(
-                any(Intent.class), anyInt()))
-                .thenReturn(null);
-
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data).isEmpty();
-    }
-
-    @Test
-    public void updateRawDataToIndex_prefAvaiable_shouldUpdate() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        final List<ResolveInfo> infos = new ArrayList<>();
-        infos.add(new ResolveInfo());
-        when(mContext.getPackageManager().queryIntentActivities(
-                any(Intent.class), anyInt()))
-                .thenReturn(infos);
-
-        mController.updateRawDataToIndex(data);
-
-        assertThat(data).isNotEmpty();
-    }
-
-    @Test
-    public void displayPref_prefUnAvaiable_shouldNotDisplay() {
-        when(mContext.getPackageManager().queryIntentActivities(
-                any(Intent.class), anyInt()))
-                .thenReturn(null);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPref_prefAvaiable_shouldDisplay() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
-        final List<ResolveInfo> infos = new ArrayList<>();
-        infos.add(new ResolveInfo());
-        when(mContext.getPackageManager().queryIntentActivities(
-                any(Intent.class), anyInt()))
-                .thenReturn(infos);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
-    public void updateState_shouldSetSummary() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
-        when((Object) mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        final Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setSummary(
-            mContext.getString(R.string.emergency_info_summary, "user 1"));
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_shouldStartActivity() {
-        final ShadowApplication application = ShadowApplication.getInstance();
-        final Context context = application.getApplicationContext();
-        final Preference preference = new Preference(context);
-        preference.setKey("emergency_info");
-        mController = new EmergencyInfoPreferenceController(context);
-
-        mController.handlePreferenceTreeClick(preference);
-
-        assertThat(application.getNextStartedActivity().getAction())
-                .isEqualTo("android.settings.EDIT_EMERGENCY_INFO");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
deleted file mode 100644
index a1eb2d85488ef26427750d0be817573e7847ffc9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.accounts;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AuthenticatorDescription;
-import android.app.Activity;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowAccountManager;
-import com.android.settings.testutils.shadow.ShadowContentResolver;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RemoveAccountPreferenceControllerTest {
-
-    private static final String KEY_REMOVE_ACCOUNT = "remove_account";
-    private static final String TAG_REMOVE_ACCOUNT_DIALOG = "confirmRemoveAccount";
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private AccountManager mAccountManager;
-    @Mock
-    private DevicePolicyManagerWrapper mDevicePolicyManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceFragment mFragment;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-    @Mock
-    private LayoutPreference mPreference;
-
-    private Context mContext;
-    private RemoveAccountPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
-        mContext = spy(shadowContext.getApplicationContext());
-
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
-        when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
-        when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
-            new AuthenticatorDescription[0]);
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
-        mController = new RemoveAccountPreferenceController(mContext, mFragment,
-            mDevicePolicyManager);
-    }
-
-    @Test
-    public void displayPreference_shouldAddClickListener() {
-        when(mScreen.findPreference(KEY_REMOVE_ACCOUNT)).thenReturn(mPreference);
-        final Button button = mock(Button.class);
-        when(mPreference.findViewById(R.id.button)).thenReturn(button);
-
-        mController.displayPreference(mScreen);
-
-        verify(button).setOnClickListener(mController);
-    }
-
-    @Test
-    public void onClick_shouldStartConfirmDialog() {
-        when(mFragment.isAdded()).thenReturn(true);
-        mController.onClick(null);
-
-        verify(mFragmentTransaction).add(
-            any(RemoveAccountPreferenceController.ConfirmRemoveAccountDialog.class),
-            eq(TAG_REMOVE_ACCOUNT_DIALOG));
-    }
-
-    @Test
-    public void onClick_shouldNotStartConfirmDialogWhenModifyAccountsIsDisallowed() {
-        when(mFragment.isAdded()).thenReturn(true);
-        when(mDevicePolicyManager.createAdminSupportIntent(UserManager.DISALLOW_MODIFY_ACCOUNTS))
-            .thenReturn(new Intent());
-        mController.onClick(null);
-
-        verify(mFragmentTransaction, never()).add(
-            any(RemoveAccountPreferenceController.ConfirmRemoveAccountDialog.class),
-            eq(TAG_REMOVE_ACCOUNT_DIALOG));
-    }
-
-    @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
-    public void confirmRemove_shouldRemoveAccount() {
-        when(mFragment.isAdded()).thenReturn(true);
-        Activity activity = mock(Activity.class);
-        when(activity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
-        when(mFragment.getActivity()).thenReturn(activity);
-
-        Account account = new Account("Account11", "com.acct1");
-        UserHandle userHandle = new UserHandle(10);
-        RemoveAccountPreferenceController.ConfirmRemoveAccountDialog dialog =
-            RemoveAccountPreferenceController.ConfirmRemoveAccountDialog.show(
-                    mFragment, account, userHandle);
-        dialog.onCreate(new Bundle());
-        dialog.onClick(null, 0);
-        verify(mAccountManager).removeAccountAsUser(eq(account), nullable(Activity.class),
-            nullable(AccountManagerCallback.class), nullable(Handler.class), eq(userHandle));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
deleted file mode 100644
index cd73068e194fd738558b0c2c3f655944f2ec697e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Modifier;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RemoveUserFragmentTest {
-
-    @Test
-    public void testClassModifier_shouldBePublic() {
-        final int modifiers = RemoveUserFragment.class.getModifiers();
-
-        assertThat(Modifier.isPublic(modifiers)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
deleted file mode 100644
index 8c13aab993c5ca0aff1d17f3ce43e086e3171e4b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.accounts;
-
-import android.app.Activity;
-import android.content.pm.UserInfo;
-import android.os.Bundle;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserAndAccountDashboardFragmentTest {
-
-    private static final String METADATA_CATEGORY = "com.android.settings.category";
-    private static final String METADATA_ACCOUNT_TYPE = "com.android.settings.ia.account";
-
-    @Mock
-    private UserManager mUserManager;
-    private UserAndAccountDashboardFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFragment = new UserAndAccountDashboardFragment();
-    }
-
-    @Test
-    public void testCategory_isAccount() {
-        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
-    }
-
-    @Test
-    public void updateSummary_shouldDisplaySignedInUser() {
-        final Activity activity = mock(Activity.class);
-        final SummaryLoader loader = mock(SummaryLoader.class);
-        final UserInfo userInfo = new UserInfo();
-        userInfo.name = "test_name";
-
-        when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager);
-        when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
-
-        final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
-                .createSummaryProvider(activity, loader);
-        provider.setListening(true);
-
-        verify(activity).getString(R.string.users_and_accounts_summary,
-                userInfo.name);
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                UserAndAccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
deleted file mode 100644
index 697d04ffa8d5d582b0af7cb3cf919c7557898789..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.content.Context;
-
-import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.XmlTestUtils;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppAndNotificationDashboardFragmentTest {
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = spy(RuntimeEnvironment.application);
-        UserManager manager = mock(UserManager.class);
-        when(manager.isAdminUser()).thenReturn(true);
-        when(context.getSystemService(Context.USER_SERVICE)).thenReturn(manager);
-        final List<String> niks = AppAndNotificationDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final int xmlId = (new AppAndNotificationDashboardFragment()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
deleted file mode 100644
index 62395f3063db6ec41e3733a2dee1f226c4b27bc5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowEntityHeaderController.class)
-public class AppInfoWithHeaderTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private EntityHeaderController mHeaderController;
-
-    private FakeFeatureFactory mFactory;
-    private TestFragment mAppInfoWithHeader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        when(mFactory.metricsFeatureProvider.getMetricsCategory(any(Object.class)))
-                .thenReturn(MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY);
-        mAppInfoWithHeader = new TestFragment();
-        ShadowEntityHeaderController.setUseMock(mHeaderController);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowEntityHeaderController.reset();
-    }
-
-    @Test
-    public void testAppHeaderIsAdded() {
-        mAppInfoWithHeader.onActivityCreated(null);
-
-        verify(mAppInfoWithHeader.mScreen).addPreference(any(LayoutPreference.class));
-    }
-
-    @Test
-    public void packageRemoved_noAppEntry_shouldFinishActivity() {
-        BroadcastReceiver packageRemovedReceiver =
-                ReflectionHelpers.getField(mAppInfoWithHeader, "mPackageRemovedReceiver");
-        ReflectionHelpers.setField(mAppInfoWithHeader, "mAppEntry", null);
-
-        final Intent packageRemovedBroadcast = new Intent();
-        packageRemovedBroadcast.setData(Uri.parse("package:com.android.settings"));
-        packageRemovedReceiver.onReceive(RuntimeEnvironment.application, packageRemovedBroadcast);
-
-        assertThat(mAppInfoWithHeader.mPackageRemovedCalled).isTrue();
-    }
-
-    @Test
-    public void packageRemoved_appEntryMatchesPackageName_shouldFinishActivity() {
-        BroadcastReceiver packageRemovedReceiver =
-                ReflectionHelpers.getField(mAppInfoWithHeader, "mPackageRemovedReceiver");
-        final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
-        entry.info = new ApplicationInfo();
-        entry.info.packageName = "com.android.settings";
-        ReflectionHelpers.setField(mAppInfoWithHeader, "mAppEntry", entry);
-
-        final Intent packageRemovedBroadcast = new Intent();
-        packageRemovedBroadcast.setData(Uri.parse("package:" + entry.info.packageName));
-        packageRemovedReceiver.onReceive(RuntimeEnvironment.application, packageRemovedBroadcast);
-
-        assertThat(mAppInfoWithHeader.mPackageRemovedCalled).isTrue();
-    }
-
-    public static class TestFragment extends AppInfoWithHeader {
-
-        PreferenceManager mManager;
-        PreferenceScreen mScreen;
-        Context mShadowContext;
-        boolean mPackageRemovedCalled;
-
-        public TestFragment() {
-            mPm = mock(PackageManager.class);
-            mManager = mock(PreferenceManager.class);
-            mScreen = mock(PreferenceScreen.class);
-            mPackageInfo = new PackageInfo();
-            mPackageInfo.applicationInfo = new ApplicationInfo();
-            mShadowContext = ShadowApplication.getInstance().getApplicationContext();
-            ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                    (InstantAppDataProvider) (info -> false));
-            when(mManager.getContext()).thenReturn(mShadowContext);
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-
-        @Override
-        protected boolean refreshUi() {
-            return false;
-        }
-
-        @Override
-        protected AlertDialog createDialog(int id, int errorCode) {
-            return null;
-        }
-
-        @Override
-        public PreferenceScreen getPreferenceScreen() {
-            return mScreen;
-        }
-
-        @Override
-        public PreferenceManager getPreferenceManager() {
-            return mManager;
-        }
-
-        @Override
-        public Context getContext() {
-            return mShadowContext;
-        }
-
-        @Override
-        protected void onPackageRemoved() {
-            mPackageRemovedCalled = true;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
deleted file mode 100644
index e19c52f22045565191bf12f04ab115884f6a30fd..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PermissionGroupInfo;
-import android.content.pm.PermissionInfo;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppPermissionsPreferenceControllerTest {
-
-    private static final String PERM_LOCATION = "android.permission-group.LOCATION";
-    private static final String PERM_MICROPHONE = "android.permission-group.MICROPHONE";
-    private static final String PERM_CAMERA = "android.permission-group.CAMERA";
-    private static final String PERM_SMS = "android.permission-group.SMS";
-    private static final String PERM_CONTACTS = "android.permission-group.CONTACTS";
-    private static final String PERM_PHONE = "android.permission-group.PHONE";
-    private static final String LABEL_LOCATION = "Location";
-    private static final String LABEL_MICROPHONE = "Microphone";
-    private static final String LABEL_CAMERA = "Camera";
-    private static final String LABEL_SMS = "Sms";
-    private static final String LABEL_CONTACTS = "Contacts";
-    private static final String LABEL_PHONE = "Phone";
-
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private PermissionGroupInfo mGroupLocation;
-    @Mock
-    private PermissionGroupInfo mGroupMic;
-    @Mock
-    private PermissionGroupInfo mGroupCamera;
-    @Mock
-    private PermissionGroupInfo mGroupSms;
-    @Mock
-    private PermissionGroupInfo mGroupContacts;
-    @Mock
-    private PermissionGroupInfo mGroupPhone;
-
-    private Context mContext;
-    private AppPermissionsPreferenceController mController;
-    private PermissionInfo mPermLocation;
-    private PermissionInfo mPermMic;
-    private PermissionInfo mPermCamera;
-    private PermissionInfo mPermSms;
-    private PermissionInfo mPermContacts;
-    private PermissionInfo mPermPhone;
-
-    @Before
-    public void setUp() throws NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
-        // create permission groups
-        when(mPackageManager.getPermissionGroupInfo(eq(PERM_LOCATION), anyInt()))
-            .thenReturn(mGroupLocation);
-        when(mGroupLocation.loadLabel(mPackageManager)).thenReturn(LABEL_LOCATION);
-        when(mPackageManager.getPermissionGroupInfo(eq(PERM_MICROPHONE), anyInt()))
-            .thenReturn(mGroupMic);
-        when(mGroupMic.loadLabel(mPackageManager)).thenReturn(LABEL_MICROPHONE);
-        when(mPackageManager.getPermissionGroupInfo(eq(PERM_CAMERA), anyInt()))
-            .thenReturn(mGroupCamera);
-        when(mGroupCamera.loadLabel(mPackageManager)).thenReturn(LABEL_CAMERA);
-        when(mPackageManager.getPermissionGroupInfo(eq(PERM_SMS), anyInt())).thenReturn(mGroupSms);
-        when(mGroupSms.loadLabel(mPackageManager)).thenReturn(LABEL_SMS);
-        when(mPackageManager.getPermissionGroupInfo(eq(PERM_CONTACTS), anyInt()))
-            .thenReturn(mGroupContacts);
-        when(mGroupContacts.loadLabel(mPackageManager)).thenReturn(LABEL_CONTACTS);
-        when(mPackageManager.getPermissionGroupInfo(eq(PERM_PHONE), anyInt()))
-            .thenReturn(mGroupPhone);
-        when(mGroupPhone.loadLabel(mPackageManager)).thenReturn(LABEL_PHONE);
-
-        // create permissions
-        mPermLocation = new PermissionInfo();
-        mPermLocation.name = "Permission1";
-        mPermLocation.group = PERM_LOCATION;
-        mPermMic = new PermissionInfo();
-        mPermMic.name = "Permission2";
-        mPermMic.group = PERM_MICROPHONE;
-        mPermCamera = new PermissionInfo();
-        mPermCamera.name = "Permission3";
-        mPermCamera.group = PERM_CAMERA;
-        mPermSms = new PermissionInfo();
-        mPermSms.name = "Permission4";
-        mPermSms.group = PERM_SMS;
-        mPermContacts = new PermissionInfo();
-        mPermContacts.name = "Permission4";
-        mPermContacts.group = PERM_CONTACTS;
-        mPermPhone = new PermissionInfo();
-        mPermPhone.name = "Permission4";
-        mPermPhone.group = PERM_PHONE;
-        final List<PermissionInfo> permissions = new ArrayList<>();
-        permissions.add(mPermLocation);
-        permissions.add(mPermMic);
-        permissions.add(mPermCamera);
-        permissions.add(mPermSms);
-        permissions.add(mPermContacts);
-        permissions.add(mPermPhone);
-        when(mPackageManager.queryPermissionsByGroup(anyString(), anyInt()))
-            .thenReturn(permissions);
-
-        mController = spy(new AppPermissionsPreferenceController(mContext));
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_noGrantedPermissions_shouldNotSetSummary() {
-        final List<PackageInfo> installedPackages = new ArrayList<>();
-        final PackageInfo info = new PackageInfo();
-        installedPackages.add(info);
-        when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS))
-            .thenReturn(installedPackages);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference, never()).setSummary(anyString());
-    }
-
-    @Test
-    public void updateState_hasPermissions_shouldSetSummary() {
-        final List<PackageInfo> installedPackages = new ArrayList<>();
-        final PackageInfo info = new PackageInfo();
-        installedPackages.add(info);
-        when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS))
-            .thenReturn(installedPackages);
-        PermissionInfo[] permissions = new PermissionInfo[4];
-        info.permissions = permissions;
-
-        permissions[0] = mPermLocation;
-        permissions[1] = mPermMic;
-        permissions[2] = mPermCamera;
-        permissions[3] = mPermSms;
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("Apps using Location, Microphone, Camera");
-
-        permissions[0] = mPermPhone;
-        permissions[1] = mPermMic;
-        permissions[2] = mPermCamera;
-        permissions[3] = mPermSms;
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("Apps using Microphone, Camera, Sms");
-
-        permissions[0] = mPermPhone;
-        permissions[1] = mPermMic;
-        permissions[2] = mPermContacts;
-        permissions[3] = mPermSms;
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("Apps using Microphone, Sms, Contacts");
-
-        permissions = new PermissionInfo[2];
-        info.permissions = permissions;
-        permissions[0] = mPermLocation;
-        permissions[1] = mPermCamera;
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("Apps using Location, Camera");
-
-        permissions = new PermissionInfo[1];
-        info.permissions = permissions;
-        permissions[0] = mPermCamera;
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("Apps using Camera");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
deleted file mode 100644
index df226a83be481bc828f3de410ceb960d6e9bd53b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-
-import android.Manifest;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.os.RemoteException;
-import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AppStateAppOpsBridgeTest {
-
-    @Mock private Context mContext;
-    @Mock private UserManager mUserManager;
-    @Mock private IPackageManagerWrapper mPackageManagerService;
-    @Mock private AppOpsManager mAppOpsManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
-    }
-
-    @Test
-    public void getPermissionInfo_nullPackageInfo_shouldNotCrash() throws RemoteException {
-        when(mPackageManagerService.getPackageInfo(anyString(), anyInt(), anyInt()))
-            .thenReturn(null);
-        TestAppStateAppOpsBridge appStateAppOpsBridge = new TestAppStateAppOpsBridge();
-
-        appStateAppOpsBridge.getPermissionInfo("pkg1", 1);
-        // should not crash
-    }
-
-    private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge {
-        public TestAppStateAppOpsBridge() {
-            super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
-                new String[] {Manifest.permission.SYSTEM_ALERT_WINDOW},
-                mPackageManagerService);
-        }
-
-        @Override
-        protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
deleted file mode 100644
index 62623e58cecc00ba8b608204cc3dedb424faa155..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.AppOpsManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppStateInstallAppsBridgeTest {
-
-    @Test
-    public void testInstallAppsStateCanInstallApps() {
-        AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
-                .InstallAppsState();
-        assertThat(appState.canInstallApps()).isFalse();
-
-        appState.permissionGranted = true;
-        appState.permissionRequested = true;
-        assertThat(appState.canInstallApps()).isTrue();
-
-        appState.appOpMode = AppOpsManager.MODE_ERRORED;
-        assertThat(appState.canInstallApps()).isFalse();
-    }
-
-    @Test
-    public void testInstallAppsStateIsPotentialAppSource() {
-        AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
-                .InstallAppsState();
-        assertThat(appState.isPotentialAppSource()).isFalse();
-
-        appState.appOpMode = AppOpsManager.MODE_ERRORED;
-        assertThat(appState.isPotentialAppSource()).isTrue();
-
-        appState.permissionRequested = true;
-        appState.appOpMode = AppOpsManager.MODE_DEFAULT;
-        assertThat(appState.isPotentialAppSource()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
deleted file mode 100644
index 8145b40fcb23a754ae99603c39156e62893069c6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import com.android.settings.R;
-import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppStorageSizesControllerTest {
-    private static final String COMPUTING = "Computing…";
-    private static final String INVALID_SIZE = "Couldn’t compute package size.";
-    private AppStorageSizesController mController;
-    private Context mContext;
-
-    private Preference mAppPreference;
-    private Preference mCachePreference;
-    private Preference mDataPreference;
-    private Preference mTotalPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mAppPreference = new Preference(mContext);
-        mCachePreference = new Preference(mContext);
-        mDataPreference = new Preference(mContext);
-        mTotalPreference = new Preference(mContext);
-
-        mController = new AppStorageSizesController.Builder()
-                .setAppSizePreference(mAppPreference)
-                .setCacheSizePreference(mCachePreference)
-                .setDataSizePreference(mDataPreference)
-                .setTotalSizePreference(mTotalPreference)
-                .setErrorString(R.string.invalid_size_value)
-                .setComputingString(R.string.computing_size)
-                .build();
-    }
-
-    @Test
-    public void requestingUpdateBeforeValuesSetIsComputing() {
-        mController.updateUi(mContext);
-
-        assertThat(mAppPreference.getSummary()).isEqualTo(COMPUTING);
-        assertThat(mCachePreference.getSummary()).isEqualTo(COMPUTING);
-        assertThat(mDataPreference.getSummary()).isEqualTo(COMPUTING);
-        assertThat(mTotalPreference.getSummary()).isEqualTo(COMPUTING);
-    }
-
-    @Test
-    public void requestingUpdateAfterFailureHasErrorText() {
-        mController.setResult(null);
-        mController.updateUi(mContext);
-
-        assertThat(mAppPreference.getSummary()).isEqualTo(INVALID_SIZE);
-        assertThat(mCachePreference.getSummary()).isEqualTo(INVALID_SIZE);
-        assertThat(mDataPreference.getSummary()).isEqualTo(INVALID_SIZE);
-        assertThat(mTotalPreference.getSummary()).isEqualTo(INVALID_SIZE);
-    }
-
-    @Test
-    public void properlyPopulatedAfterValidEntry() {
-        AppStorageStats result = mock(AppStorageStats.class);
-        when(result.getCodeBytes()).thenReturn(1L);
-        when(result.getCacheBytes()).thenReturn(10L);
-        when(result.getDataBytes()).thenReturn(100L);
-        when(result.getTotalBytes()).thenReturn(101L);
-
-        mController.setResult(result);
-        mController.updateUi(mContext);
-
-        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
-        assertThat(mCachePreference.getSummary()).isEqualTo("10.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("101B");
-    }
-
-    @Test
-    public void fakeCacheFlagSetsCacheToZero() {
-        AppStorageStats result = mock(AppStorageStats.class);
-        when(result.getCodeBytes()).thenReturn(1L);
-        when(result.getCacheBytes()).thenReturn(10L);
-        when(result.getDataBytes()).thenReturn(100L);
-        when(result.getTotalBytes()).thenReturn(101L);
-
-        mController.setResult(result);
-        mController.setCacheCleared(true);
-        mController.updateUi(mContext);
-
-        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
-        assertThat(mCachePreference.getSummary()).isEqualTo("0.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("91.00B");
-    }
-
-    @Test
-    public void fakeDataFlagSetsDataAndCacheToZero() {
-        AppStorageStats result = mock(AppStorageStats.class);
-        when(result.getCodeBytes()).thenReturn(1L);
-        when(result.getCacheBytes()).thenReturn(10L);
-        when(result.getDataBytes()).thenReturn(100L);
-        when(result.getTotalBytes()).thenReturn(101L);
-
-        mController.setResult(result);
-        mController.setDataCleared(true);
-        mController.updateUi(mContext);
-
-        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
-        assertThat(mCachePreference.getSummary()).isEqualTo("0.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("0.00B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("1.00B");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
deleted file mode 100644
index 11401a886d60175d08b91109aa3245f2d4749ed2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.os.Build;
-import android.os.RemoteException;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.Arrays;
-
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link InstalledAppCounter}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AppWithAdminGrantedPermissionsCounterTest {
-
-    private final String APP_1 = "app1";
-    private final String APP_2 = "app2";
-    private final String APP_3 = "app3";
-    private final String APP_4 = "app4";
-    private final String APP_5 = "app5";
-    private final String APP_6 = "app6";
-
-    private final int MAIN_USER_ID = 0;
-    private final int MANAGED_PROFILE_ID = 10;
-
-    private final int PER_USER_UID_RANGE = 100000;
-    private final int APP_1_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 1;
-    private final int APP_2_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 2;
-    private final int APP_3_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 3;
-    private final int APP_4_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 4;
-    private final int APP_5_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 5;
-    private final int APP_6_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE + 1;
-
-    private final String PERMISSION_1 = "some.permission.1";
-    private final String PERMISSION_2 = "some.permission.2";
-    private final String[] PERMISSIONS = {PERMISSION_1, PERMISSION_2};
-
-    @Mock private UserManager mUserManager;
-    @Mock private Context mContext;
-    @Mock private PackageManagerWrapper mPackageManager;
-    @Mock private IPackageManagerWrapper mPackageManagerService;
-    @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
-
-    private int mAppCount = -1;
-    private ApplicationInfo mApp1;
-    private ApplicationInfo mApp2;
-    private ApplicationInfo mApp3;
-    private ApplicationInfo mApp4;
-    private ApplicationInfo mApp5;
-    private ApplicationInfo mApp6;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mApp1 = buildInfo(APP_1_UID, APP_1, 0 /* flags */, Build.VERSION_CODES.M);
-        mApp2 = buildInfo(APP_2_UID, APP_2, 0 /* flags */, Build.VERSION_CODES.M);
-        mApp3 = buildInfo(APP_3_UID, APP_3, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP);
-        mApp4 = buildInfo(APP_4_UID, APP_4, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP);
-        mApp5 = buildInfo(APP_5_UID, APP_5, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP);
-        mApp6 = buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M);
-    }
-
-    private void verifyCountInstalledApps(boolean async) throws Exception {
-        configureUserManager();
-        configurePackageManager();
-        configureRunTimePermissions();
-        configureInstallTimePermissions();
-
-        // Count the number of all apps installed that were granted on or more permissions by the
-        // admin.
-        if (async) {
-            (new AppWithAdminGrantedPermissionsCounterTestable(PERMISSIONS)).execute();
-            // Wait for the background task to finish.
-            ShadowApplication.runBackgroundTasks();
-        } else {
-            (new AppWithAdminGrantedPermissionsCounterTestable(PERMISSIONS)).executeInForeground();
-        }
-        assertThat(mAppCount).isEqualTo(3);
-
-        // Verify that installed packages were retrieved the current user and the user's managed
-        // profile only.
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
-                eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());
-        verifyNoMoreInteractions(mPackageManager);
-    }
-
-    @Test
-    public void testIncludeInCount() throws Exception {
-        configurePackageManager();
-        configureRunTimePermissions();
-        configureInstallTimePermissions();
-
-        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
-                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp1)).isTrue();
-
-        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
-                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp2)).isFalse();
-
-        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
-                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp3)).isTrue();
-
-        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
-                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp4)).isFalse();
-
-        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
-                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp5)).isFalse();
-    }
-
-    @Test
-    public void testCountInstalledAppsSync() throws Exception {
-        verifyCountInstalledApps(false /* async */);
-    }
-
-    @Test
-    public void testCountInstalledAppsAync() throws Exception {
-        verifyCountInstalledApps(true /* async */);
-    }
-
-    private void configureInstallTimePermissions() throws RemoteException {
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_3_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_4_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-    }
-
-    private void configureRunTimePermissions() {
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_1))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-    }
-
-    private void configurePackageManager() {
-        // The first user has five apps installed:
-        // * app1 uses run-time permissions. It has been granted one of the permissions by the
-        //        admin. It should be counted.
-        // * app2 uses run-time permissions. It has not been granted any of the permissions by the
-        //        admin. It should not be counted.
-        // * app3 uses install-time permissions. It was installed by the admin and requested one of
-        //        the permissions. It should be counted.
-        // * app4 uses install-time permissions. It was not installed by the admin but did request
-        //        one of the permissions. It should not be counted.
-        // * app5 uses install-time permissions. It was installed by the admin but did not request
-        //        any of the permissions. It should not be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
-                | PackageManager.MATCH_ANY_USER,
-                MAIN_USER_ID)).thenReturn(Arrays.asList(mApp1, mApp2, mApp3, mApp4, mApp5));
-        // The second user has one app installed. This app uses run-time permissions. It has been
-        // granted both permissions by the admin. It should be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
-                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(mApp6));
-
-        // app3 and app5 were installed by enterprise policy.
-        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
-        when(mPackageManager.getInstallReason(APP_1, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_2, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_3, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_4, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_5, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        // app6 was not installed by enterprise policy.
-        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
-        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-
-    }
-
-    private void configureUserManager() {
-        // There are two users.
-        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
-                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
-                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
-    }
-
-    private class AppWithAdminGrantedPermissionsCounterTestable extends
-            AppWithAdminGrantedPermissionsCounter {
-        public AppWithAdminGrantedPermissionsCounterTestable(String[] permissions) {
-            super(mContext, permissions, mPackageManager, mPackageManagerService,
-                    mDevicePolicyManager);
-        }
-
-        @Override
-        protected void onCountComplete(int num) {
-            mAppCount = num;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
deleted file mode 100644
index c3c1bb3877c51eec153ae70671eead6444c93e11..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.os.Build;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link AppWithAdminGrantedPermissionsLister}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AppWithAdminGrantedPermissionsListerTest {
-
-    private final String APP_1 = "app1";
-    private final String APP_2 = "app2";
-    private final String APP_3 = "app3";
-    private final String APP_4 = "app4";
-    private final String APP_5 = "app5";
-    private final String APP_6 = "app6";
-
-    private final int MAIN_USER_ID = 0;
-    private final int MANAGED_PROFILE_ID = 10;
-
-    private final int PER_USER_UID_RANGE = 100000;
-    private final int APP_1_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 1;
-    private final int APP_2_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 2;
-    private final int APP_3_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 3;
-    private final int APP_4_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 4;
-    private final int APP_5_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 5;
-    private final int APP_6_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE + 1;
-
-    private final String PERMISSION_1 = "some.permission.1";
-    private final String PERMISSION_2 = "some.permission.2";
-    private final String[] PERMISSIONS = {PERMISSION_1, PERMISSION_2};
-
-    @Mock private UserManager mUserManager;
-    @Mock private PackageManagerWrapper mPackageManager;
-    @Mock private IPackageManagerWrapper mPackageManagerService;
-    @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
-
-    private List<UserAppInfo> mAppList = Collections.emptyList();
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void verifyListInstalledApps() throws Exception {
-        // There are two users.
-        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
-                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
-                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
-
-        // The first user has five apps installed:
-        // * app1 uses run-time permissions. It has been granted one of the permissions by the
-        //        admin. It should be listed.
-        // * app2 uses run-time permissions. It has not been granted any of the permissions by the
-        //        admin. It should not be listed.
-        // * app3 uses install-time permissions. It was installed by the admin and requested one of
-        //        the permissions. It should be listed.
-        // * app4 uses install-time permissions. It was not installed by the admin but did request
-        //        one of the permissions. It should not be listed.
-        // * app5 uses install-time permissions. It was installed by the admin but did not request
-        //        any of the permissions. It should not be listed.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
-                | PackageManager.MATCH_ANY_USER,
-                MAIN_USER_ID)).thenReturn(Arrays.asList(
-                        buildInfo(APP_1_UID, APP_1, 0 /* flags */, Build.VERSION_CODES.M),
-                        buildInfo(APP_2_UID, APP_2, 0 /* flags */, Build.VERSION_CODES.M),
-                        buildInfo(APP_3_UID, APP_3, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP),
-                        buildInfo(APP_4_UID, APP_4, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP),
-                        buildInfo(APP_5_UID, APP_5, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP)));
-
-        // Grant run-time permissions as appropriate.
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_1))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-
-        // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_3_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_4_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-
-        // app3 and app5 were installed by enterprise policy.
-        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
-        when(mPackageManager.getInstallReason(APP_1, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_2, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_3, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_4, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_5, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        // The second user has one app installed. This app uses run-time permissions. It has been
-        // granted both permissions by the admin. It should be listed.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
-                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(
-                        buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M)));
-
-        // Grant run-time permissions as appropriate.
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-
-        // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-
-        // app6 was not installed by enterprise policy.
-        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
-        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-
-        // List all apps installed that were granted one or more permissions by the
-        // admin.
-        (new AppWithAdminGrantedPermissionsListerTestable(PERMISSIONS)).execute();
-
-        // Wait for the background task to finish.
-        ShadowApplication.runBackgroundTasks();
-        assertThat(mAppList.size()).isEqualTo(3);
-        InstalledAppListerTest.verifyListUniqueness(mAppList);
-
-        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_1, MAIN_USER_ID)).isTrue();
-        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_2, MAIN_USER_ID)).isFalse();
-        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_3, MAIN_USER_ID)).isTrue();
-        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_4, MAIN_USER_ID)).isFalse();
-        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_5, MAIN_USER_ID)).isFalse();
-        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_6, MANAGED_PROFILE_ID)).
-                isTrue();
-
-        // Verify that installed packages were retrieved the current user and the user's managed
-        // profile only.
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
-                eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());
-        verifyNoMoreInteractions(mPackageManager);
-    }
-
-    private class AppWithAdminGrantedPermissionsListerTestable extends
-            AppWithAdminGrantedPermissionsLister {
-
-        public AppWithAdminGrantedPermissionsListerTestable(String[] permissions) {
-            super(permissions, mPackageManager, mPackageManagerService,
-                    mDevicePolicyManager, mUserManager);
-        }
-
-        @Override
-        protected void onAppListBuilt(List<UserAppInfo> list) {
-            mAppList = list;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
deleted file mode 100644
index 2b1c29671078dfbbdcded1413780451029e3444d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.Build;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.testutils.ApplicationTestUtils;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link ApplicationFeatureProviderImpl}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowUserManager.class})
-public final class ApplicationFeatureProviderImplTest {
-
-    private final int MAIN_USER_ID = 0;
-    private final int MANAGED_PROFILE_ID = 10;
-
-    private final int PER_USER_UID_RANGE = 100000;
-    private final int APP_1_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 1;
-    private final int APP_2_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE + 1;
-
-    private final String APP_1 = "app1";
-    private final String APP_2 = "app2";
-
-    private final String PERMISSION = "some.permission";
-
-    private @Mock UserManager mUserManager;
-    private @Mock Context mContext;
-    private @Mock PackageManagerWrapper mPackageManager;
-    @Mock private IPackageManagerWrapper mPackageManagerService;
-    @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
-
-    private ApplicationFeatureProvider mProvider;
-
-    private int mAppCount = -1;
-    private List<UserAppInfo> mAppList = null;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mProvider = new ApplicationFeatureProviderImpl(mContext, mPackageManager,
-                mPackageManagerService, mDevicePolicyManager);
-    }
-
-    private void verifyCalculateNumberOfPolicyInstalledApps(boolean async) {
-        setUpUsersAndInstalledApps();
-
-        when(mPackageManager.getInstallReason(APP_1, new UserHandle(MAIN_USER_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_2, new UserHandle(MANAGED_PROFILE_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        mAppCount = -1;
-        mProvider.calculateNumberOfPolicyInstalledApps(async,
-                (num) -> mAppCount = num);
-        if (async) {
-            ShadowApplication.runBackgroundTasks();
-        }
-        assertThat(mAppCount).isEqualTo(1);
-    }
-
-    @Test
-    public void testListPolicyInstalledApps() {
-        setUpUsersAndInstalledApps();
-
-        when(mPackageManager.getInstallReason(APP_1, new UserHandle(MAIN_USER_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_2, new UserHandle(MANAGED_PROFILE_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        mAppList = null;
-        mProvider.listPolicyInstalledApps((list) -> mAppList = list);
-        assertThat(mAppList).isNotNull();
-        assertThat(mAppList.size()).isEqualTo(1);
-        assertThat(mAppList.get(0).appInfo.packageName).isEqualTo(APP_2);
-    }
-
-    @Test
-    public void testCalculateNumberOfInstalledAppsSync() {
-        verifyCalculateNumberOfPolicyInstalledApps(false /* async */);
-    }
-
-    @Test
-    public void testCalculateNumberOfInstalledAppsAsync() {
-        verifyCalculateNumberOfPolicyInstalledApps(true /* async */);
-    }
-
-    private void verifyCalculateNumberOfAppsWithAdminGrantedPermissions(boolean async)
-            throws Exception {
-        setUpUsersAndInstalledApps();
-
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_2, PERMISSION))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION, APP_1_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION, APP_2_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManager.getInstallReason(APP_1, new UserHandle(MAIN_USER_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_2, new UserHandle(MANAGED_PROFILE_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        mAppCount = -1;
-        mProvider.calculateNumberOfAppsWithAdminGrantedPermissions(new String[] {PERMISSION}, async,
-                (num) -> mAppCount = num);
-        if (async) {
-            ShadowApplication.runBackgroundTasks();
-        }
-        assertThat(mAppCount).isEqualTo(2);
-    }
-
-    @Test
-    public void testCalculateNumberOfAppsWithAdminGrantedPermissionsSync() throws Exception {
-        verifyCalculateNumberOfAppsWithAdminGrantedPermissions(false /* async */);
-    }
-
-    @Test
-    public void testCalculateNumberOfAppsWithAdminGrantedPermissionsAsync() throws Exception {
-        verifyCalculateNumberOfAppsWithAdminGrantedPermissions(true /* async */);
-    }
-
-    @Test
-    public void testListAppsWithAdminGrantedPermissions()
-            throws Exception {
-        setUpUsersAndInstalledApps();
-
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_2, PERMISSION))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION, APP_1_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION, APP_2_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManager.getInstallReason(APP_1, new UserHandle(MAIN_USER_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_2, new UserHandle(MANAGED_PROFILE_ID)))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        mAppList = null;
-        mProvider.listAppsWithAdminGrantedPermissions(new String[] {PERMISSION},
-                (list) -> mAppList = list);
-        assertThat(mAppList).isNotNull();
-        assertThat(mAppList.size()).isEqualTo(2);
-        assertThat(Arrays.asList(mAppList.get(0).appInfo.packageName,
-                mAppList.get(1).appInfo.packageName).containsAll(Arrays.asList(APP_1, APP_2)))
-                .isTrue();
-    }
-
-    @Test
-    public void testFindPersistentPreferredActivities() throws Exception {
-        final UserInfo mainUser = new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN);
-        final UserInfo managedUser = new UserInfo(MANAGED_PROFILE_ID, "managed",
-                UserInfo.FLAG_MANAGED_PROFILE);
-
-        when(mUserManager.getUserProfiles()).thenReturn(Arrays.asList(new UserHandle(MAIN_USER_ID),
-                new UserHandle(MANAGED_PROFILE_ID)));
-        when(mUserManager.getUserInfo(MAIN_USER_ID)).thenReturn(mainUser);
-        when(mUserManager.getUserInfo(MANAGED_PROFILE_ID)).thenReturn(managedUser);
-
-        final Intent viewIntent = new Intent(Intent.ACTION_VIEW);
-        final Intent editIntent = new Intent(Intent.ACTION_EDIT);
-        final Intent sendIntent = new Intent(Intent.ACTION_SEND);
-
-        final ResolveInfo app1 = createResolveInfo(APP_1);
-        final ResolveInfo app2 = createResolveInfo(APP_2);
-        when(mPackageManagerService.findPersistentPreferredActivity(viewIntent, MAIN_USER_ID))
-                .thenReturn(app1);
-        when(mPackageManagerService.findPersistentPreferredActivity(viewIntent, MANAGED_PROFILE_ID))
-                .thenReturn(app1);
-        when(mPackageManagerService.findPersistentPreferredActivity(editIntent, MAIN_USER_ID))
-                .thenReturn(null);
-        when(mPackageManagerService.findPersistentPreferredActivity(editIntent, MANAGED_PROFILE_ID))
-                .thenReturn(app2);
-        when(mPackageManagerService.findPersistentPreferredActivity(sendIntent, MAIN_USER_ID))
-                .thenReturn(app1);
-        when(mPackageManagerService.findPersistentPreferredActivity(sendIntent, MANAGED_PROFILE_ID))
-                .thenReturn(null);
-
-        final List<UserAppInfo> expectedMainUserActivities = new ArrayList<>();
-        expectedMainUserActivities.add(new UserAppInfo(mainUser,
-                new ApplicationInfo(app1.activityInfo.applicationInfo)));
-        final List<UserAppInfo> expectedManagedUserActivities = new ArrayList<>();
-        expectedManagedUserActivities.add(new UserAppInfo(managedUser,
-                new ApplicationInfo(app1.activityInfo.applicationInfo)));
-        expectedManagedUserActivities.add(new UserAppInfo(managedUser,
-                new ApplicationInfo(app2.activityInfo.applicationInfo)));
-
-        assertThat(mProvider.findPersistentPreferredActivities(MAIN_USER_ID,
-                new Intent[] {viewIntent, editIntent, sendIntent}))
-                .isEqualTo(expectedMainUserActivities);
-        assertThat(mProvider.findPersistentPreferredActivities(MANAGED_PROFILE_ID,
-                new Intent[] {viewIntent, editIntent, sendIntent}))
-                .isEqualTo(expectedManagedUserActivities);
-    }
-
-    @Test
-    public void getKeepEnabledPackages_shouldContainNothing() {
-        assertThat(mProvider.getKeepEnabledPackages())
-                .isEmpty();
-    }
-
-    private void setUpUsersAndInstalledApps() {
-        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
-                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
-                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
-
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
-                | PackageManager.MATCH_ANY_USER,
-                MAIN_USER_ID)).thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(APP_1_UID, APP_1, 0 /* flags */,
-                                Build.VERSION_CODES.M)));
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
-                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(APP_2_UID, APP_2, 0 /* flags */,
-                                Build.VERSION_CODES.LOLLIPOP)));
-    }
-
-    private ResolveInfo createResolveInfo(String packageName) {
-        final ApplicationInfo applicationInfo = new ApplicationInfo();
-        applicationInfo.packageName = packageName;
-        final ActivityInfo activityInfo = new ActivityInfo();
-        activityInfo.packageName = packageName;
-        activityInfo.applicationInfo = applicationInfo;
-        final ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.activityInfo = activityInfo;
-        return resolveInfo;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
deleted file mode 100644
index 9054a8e52b46270cc97e5af90b24c04c86d04072..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserManager;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
-import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
-import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAppSettingsTest {
-
-    private Context mContext;
-
-    private DefaultAppSettings mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mFragment = new DefaultAppSettings();
-        mFragment.onAttach(mContext);
-    }
-
-    @Test
-    public void getPreferenceScreenResId_shouldUseAppDefaultSettingPrefLayout() {
-        assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(
-                R.xml.app_default_settings);
-    }
-
-    @Test
-    public void setListening_shouldUpdateSummary() {
-        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
-        final DefaultAppSettings.SummaryProvider summaryProvider =
-                new DefaultAppSettings.SummaryProvider(mContext, summaryLoader);
-        final DefaultSmsPreferenceController defaultSms =
-                mock(DefaultSmsPreferenceController.class);
-        final DefaultBrowserPreferenceController defaultBrowser =
-                mock(DefaultBrowserPreferenceController.class);
-        final DefaultPhonePreferenceController defaultPhone =
-                mock(DefaultPhonePreferenceController.class);
-        ReflectionHelpers.setField(summaryProvider, "mDefaultSmsPreferenceController", defaultSms);
-        ReflectionHelpers.setField(
-                summaryProvider, "mDefaultBrowserPreferenceController", defaultBrowser);
-        ReflectionHelpers.setField(
-                summaryProvider, "mDefaultPhonePreferenceController", defaultPhone);
-
-        // all available
-        when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
-        when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
-        summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1, Phone1");
-
-        // 2 available
-        when(defaultSms.getDefaultAppLabel()).thenReturn(null);
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
-        when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
-        summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Browser1, Phone1");
-
-        when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn(null);
-        when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
-        summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Sms1, Phone1");
-
-        when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
-        when(defaultPhone.getDefaultAppLabel()).thenReturn(null);
-        summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1");
-
-        // 1 available
-        when(defaultSms.getDefaultAppLabel()).thenReturn(null);
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
-        when(defaultPhone.getDefaultAppLabel()).thenReturn(null);
-        summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Browser1");
-
-        when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn(null);
-        when(defaultPhone.getDefaultAppLabel()).thenReturn(null);
-        summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Sms1");
-
-        when(defaultSms.getDefaultAppLabel()).thenReturn(null);
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn(null);
-        when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
-        summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Phone1");
-
-        // None available
-        when(defaultSms.getDefaultAppLabel()).thenReturn(null);
-        when(defaultBrowser.getDefaultAppLabel()).thenReturn(null);
-        when(defaultPhone.getDefaultAppLabel()).thenReturn(null);
-        summaryProvider.setListening(true);
-        verify(summaryLoader, never()).setSummary(summaryProvider, eq(anyString()));
-
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = spy(RuntimeEnvironment.application);
-        final Context mockContext = mock(Context.class);
-        when(mockContext.getApplicationContext()).thenReturn(mockContext);
-        final UserManager userManager = mock(UserManager.class, RETURNS_DEEP_STUBS);
-
-        when(mockContext.getSystemService(Context.USER_SERVICE))
-                .thenReturn(userManager);
-        when(userManager.getUserInfo(anyInt()).isRestricted()).thenReturn(true);
-
-        when(mockContext.getSystemService(Context.TELEPHONY_SERVICE))
-                .thenReturn(mock(TelephonyManager.class));
-        when(mockContext.getPackageManager())
-                .thenReturn(mock(PackageManager.class));
-        final List<String> niks = DefaultAppSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mockContext);
-
-        final int xmlId = (new DefaultAppSettings()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
deleted file mode 100644
index 5d20a4c9cc3dab53fbfde5e0b83a0b416c17b7e2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.nullable;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
-
-import android.app.Activity;
-import android.content.Context;
-
-import android.view.Window;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import com.android.settings.testutils.shadow.ShadowAppInfoBase;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DrawOverlayDetailsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-
-    @Mock
-    private Window mWindow;
-
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Spy
-    private DrawOverlayDetails mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        when(mFragment.getContext()).thenReturn(
-                ShadowApplication.getInstance().getApplicationContext());
-
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW), eq("app"));
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY), eq("app"));
-    }
-
-    @Test
-    @Config(shadows = {ShadowAppInfoBase.class})
-    public void hideNonSystemOverlaysWhenResumed() {
-        when(mFragment.getActivity()).thenReturn(mActivity);
-        when(mActivity.getWindow()).thenReturn(mWindow);
-
-        mFragment.onResume();
-        mFragment.onPause();
-
-        InOrder inOrder = Mockito.inOrder(mWindow);
-        inOrder.verify(mWindow).addFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
-        inOrder.verify(mWindow).clearFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
-        inOrder.verifyNoMoreInteractions();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
deleted file mode 100644
index 10caf13f24d08a42ea4bdc60808580f9b7a57c6f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EnterpriseDefaultAppsTest {
-    @Test
-    public void testNumberOfIntentsCorrelateWithUI() throws Exception {
-        final int concatenation_templates[] =
-                new int[]{0 /* no need for single app name */,
-                        R.string.app_names_concatenation_template_2,
-                        R.string.app_names_concatenation_template_3};
-        for (EnterpriseDefaultApps app : EnterpriseDefaultApps.values()) {
-            assertTrue("Number of intents should be limited by number of apps the UI can show",
-                    app.getIntents().length <= concatenation_templates.length);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
deleted file mode 100644
index 3269acb1e2933cc7160799a3b0b7e076b08f7a47..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.UserHandle;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.io.IOException;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FetchPackageStorageAsyncLoaderTest {
-    private static final String PACKAGE_NAME = "com.test.package";
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private StorageStatsSource mSource;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void worksForValidPackageNameAndUid() throws Exception {
-        AppStorageStats stats = mock(AppStorageStats.class);
-        when(stats.getCodeBytes()).thenReturn(1L);
-        when(stats.getDataBytes()).thenReturn(2L);
-        when(stats.getCacheBytes()).thenReturn(3L);
-        when(mSource.getStatsForPackage(nullable(String.class), nullable(String.class),
-                any(UserHandle.class)))
-                .thenReturn(stats);
-        ApplicationInfo info = new ApplicationInfo();
-        info.packageName = PACKAGE_NAME;
-
-        FetchPackageStorageAsyncLoader task = new FetchPackageStorageAsyncLoader(
-                mContext, mSource, info, new UserHandle(0));
-        assertThat(task.loadInBackground()).isEqualTo(stats);
-    }
-
-    @Test
-    public void installerExceptionHandledCleanly() throws Exception {
-        when(mSource.getStatsForPackage(anyString(), anyString(), any(UserHandle.class))).
-                thenThrow(new IOException("intentional failure"));
-        ApplicationInfo info = new ApplicationInfo();
-        info.packageName = PACKAGE_NAME;
-        FetchPackageStorageAsyncLoader task = new FetchPackageStorageAsyncLoader(
-                mContext, mSource, info, new UserHandle(0));
-
-        assertThat(task.loadInBackground()).isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
deleted file mode 100644
index 56df10e73e335b9c43af69351cfeff5cca41d749..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * Tests for {@link InstalledAppCounter}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowUserManager.class})
-public final class InstalledAppCounterTest {
-
-    private final String APP_1 = "app1";
-    private final String APP_2 = "app2";
-    private final String APP_3 = "app3";
-    private final String APP_4 = "app4";
-    private final String APP_5 = "app5";
-    private final String APP_6 = "app6";
-
-    private final int MAIN_USER_ID = 0;
-    private final int MANAGED_PROFILE_ID = 10;
-
-    private final int PER_USER_UID_RANGE = 100000;
-    private final int MAIN_USER_APP_UID = MAIN_USER_ID * PER_USER_UID_RANGE;
-    private final int MANAGED_PROFILE_APP_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE;
-
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Context mContext;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-
-    private int mInstalledAppCount = -1;
-    private ApplicationInfo mApp1;
-    private ApplicationInfo mApp2;
-    private ApplicationInfo mApp3;
-    private ApplicationInfo mApp4;
-    private ApplicationInfo mApp5;
-    private ApplicationInfo mApp6;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mApp1 = buildInfo(MAIN_USER_APP_UID, APP_1,
-                ApplicationInfo.FLAG_UPDATED_SYSTEM_APP, 0 /* targetSdkVersion */);
-        mApp2 = buildInfo(MAIN_USER_APP_UID, APP_2, 0 /* flags */,
-                0 /* targetSdkVersion */);
-        mApp3 = buildInfo(MAIN_USER_APP_UID, APP_3, ApplicationInfo.FLAG_SYSTEM,
-                0 /* targetSdkVersion */);
-        mApp4 = buildInfo(MAIN_USER_APP_UID, APP_4, ApplicationInfo.FLAG_SYSTEM,
-                0 /* targetSdkVersion */);
-        mApp5 = buildInfo(MANAGED_PROFILE_APP_UID, APP_5, 0 /* flags */,
-                0 /* targetSdkVersion */);
-        mApp6 = buildInfo(MANAGED_PROFILE_APP_UID, APP_6, ApplicationInfo.FLAG_SYSTEM,
-                0 /* targetSdkVersion */);
-    }
-
-    private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
-        when(mPackageManager.queryIntentActivitiesAsUser(
-                argThat(isLaunchIntentFor(packageName)),
-                eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
-                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
-                eq(userId))).thenReturn(launchable
-                        ? Collections.singletonList(new ResolveInfo())
-                        : new ArrayList<>());
-    }
-
-    private void testCountInstalledAppsAcrossAllUsers(boolean async) {
-        // There are two users.
-        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
-                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
-                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
-        configurePackageManager();
-
-        // Count the number of all apps installed, irrespective of install reason.
-        count(InstalledAppCounter.IGNORE_INSTALL_REASON, async);
-        assertThat(mInstalledAppCount).isEqualTo(5);
-
-        // Verify that installed packages were retrieved the current user and the user's managed
-        // profile only.
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
-                eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(any(Intent.class), anyInt(),
-                anyInt());
-        verifyNoMoreInteractions(mPackageManager);
-
-        // Count once more, considering apps installed by enterprise policy only.
-        count(PackageManager.INSTALL_REASON_POLICY, async);
-        assertThat(mInstalledAppCount).isEqualTo(3);
-    }
-
-    @Test
-    public void testIncludeInCount() {
-        configurePackageManager();
-        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
-                mPackageManager, mApp1)).isTrue();
-        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
-                mPackageManager, mApp2)).isTrue();
-        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
-                mPackageManager, mApp3)).isTrue();
-        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
-                mPackageManager, mApp4)).isFalse();
-        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
-                mPackageManager, mApp5)).isTrue();
-        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
-                mPackageManager, mApp6)).isTrue();
-
-        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
-                mPackageManager, mApp1)).isTrue();
-        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
-                mPackageManager, mApp2)).isFalse();
-        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
-                mPackageManager, mApp3)).isTrue();
-        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
-                mPackageManager, mApp4)).isFalse();
-        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
-                mPackageManager, mApp5)).isTrue();
-        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
-                mPackageManager, mApp6)).isFalse();
-    }
-
-    @Test
-    public void testCountInstalledAppsAcrossAllUsersSync() {
-        testCountInstalledAppsAcrossAllUsers(false /* async */);
-    }
-
-    @Test
-    public void testCountInstalledAppsAcrossAllUsersAsync() {
-        testCountInstalledAppsAcrossAllUsers(true /* async */);
-    }
-
-    private void count(int installReason, boolean async) {
-        mInstalledAppCount = -1;
-        final InstalledAppCounterTestable counter = new InstalledAppCounterTestable(installReason);
-        if (async) {
-            counter.execute();
-            // Wait for the background task to finish.
-            ShadowApplication.runBackgroundTasks();
-        } else {
-            counter.executeInForeground();
-        }
-    }
-
-    private void configurePackageManager() {
-        // The first user has four apps installed:
-        // * app1 is an updated system app. It should be counted.
-        // * app2 is a user-installed app. It should be counted.
-        // * app3 is a system app that provides a launcher icon. It should be counted.
-        // * app4 is a system app that provides no launcher icon. It should not be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
-                | PackageManager.MATCH_ANY_USER,
-                MAIN_USER_ID)).thenReturn(Arrays.asList(mApp1, mApp2, mApp3, mApp4));
-        // For system apps, InstalledAppCounter checks whether they handle the default launcher
-        // intent to decide whether to include them in the count of installed apps or not.
-        expectQueryIntentActivities(MAIN_USER_ID, APP_3, true /* launchable */);
-        expectQueryIntentActivities(MAIN_USER_ID, APP_4, false /* launchable */);
-
-        // app1, app3 and app4 are installed by enterprise policy.
-        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
-        when(mPackageManager.getInstallReason(APP_1, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_2, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_3, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_4, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        // The second user has two apps installed:
-        // * app5 is a user-installed app. It should be counted.
-        // * app6 is a system app that provides a launcher icon. It should be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,MANAGED_PROFILE_ID))
-                .thenReturn(Arrays.asList(mApp5, mApp6));
-        expectQueryIntentActivities(MANAGED_PROFILE_ID, APP_6, true /* launchable */);
-
-        // app5 is installed by enterprise policy.
-        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
-        when(mPackageManager.getInstallReason(APP_5, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-    }
-
-
-    private class InstalledAppCounterTestable extends InstalledAppCounter {
-        public InstalledAppCounterTestable(int installReason) {
-            super(mContext, installReason, mPackageManager);
-        }
-
-        @Override
-        protected void onCountComplete(int num) {
-            mInstalledAppCount = num;
-        }
-    }
-
-    private ArgumentMatcher<Intent> isLaunchIntentFor(String packageName) {
-        return intent -> {
-            if (intent == null) {
-                return false;
-            }
-            if (!Intent.ACTION_MAIN.equals(intent.getAction())) {
-                return false;
-            }
-            final Set<String> categories = intent.getCategories();
-            if (categories == null || categories.size() != 1 ||
-                    !categories.contains(Intent.CATEGORY_LAUNCHER)) {
-                return false;
-            }
-            if (!packageName.equals(intent.getPackage())) {
-                return false;
-            }
-            return true;
-        };
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
deleted file mode 100644
index deef5e0dd1f5c2a72c2c1e14fdf4115dec4fe0cf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-
-import android.app.AlertDialog;
-import android.app.AppOpsManager;
-import android.app.Fragment;
-import android.app.LoaderManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.os.BatteryStats;
-import android.os.Bundle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.instantapps.InstantAppButtonsController;
-import com.android.settings.applications.instantapps.InstantAppButtonsController.ShowDialogDelegate;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.Utils;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyDouble;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = InstalledAppDetailsTest.ShadowUtils.class
-)
-public final class InstalledAppDetailsTest {
-
-    private static final String PACKAGE_NAME = "test_package_name";
-    private static final int TARGET_UID = 111;
-    private static final int OTHER_UID = 222;
-    private static final double BATTERY_LEVEL = 60;
-    private static final String BATTERY_LEVEL_STRING = "60%";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SettingsActivity mActivity;
-    @Mock
-    private DevicePolicyManagerWrapper mDevicePolicyManager;
-    @Mock
-    private BatterySipper mBatterySipper;
-    @Mock
-    private BatterySipper mOtherBatterySipper;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private BatteryStats.Uid mUid;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    @Mock
-    private LoaderManager mLoaderManager;
-    @Mock
-    private AppOpsManager mAppOpsManager;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private InstalledAppDetails mAppDetail;
-    private Context mShadowContext;
-    private Preference mBatteryPreference;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
-        mShadowContext = RuntimeEnvironment.application;
-        mAppDetail = spy(new InstalledAppDetails());
-        mAppDetail.mBatteryUtils = mBatteryUtils;
-
-        mBatteryPreference = new Preference(mShadowContext);
-        mAppDetail.mBatteryPreference = mBatteryPreference;
-
-        mBatterySipper.drainType = BatterySipper.DrainType.IDLE;
-        mBatterySipper.uidObj = mUid;
-        doReturn(TARGET_UID).when(mBatterySipper).getUid();
-        doReturn(OTHER_UID).when(mOtherBatterySipper).getUid();
-        doReturn(mActivity).when(mAppDetail).getActivity();
-        doReturn(mShadowContext).when(mAppDetail).getContext();
-        doReturn(mPackageManager).when(mActivity).getPackageManager();
-        doReturn(mAppOpsManager).when(mActivity).getSystemService(Context.APP_OPS_SERVICE);
-
-        // Default to not considering any apps to be instant (individual tests can override this).
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> false));
-    }
-
-    @Test
-    public void shouldShowUninstallForAll_installForOneOtherUserOnly_shouldReturnTrue() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
-        when(mUserManager.getUsers().size()).thenReturn(2);
-        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
-        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
-        final ApplicationInfo info = new ApplicationInfo();
-        info.enabled = true;
-        final AppEntry appEntry = mock(AppEntry.class);
-        appEntry.info = info;
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
-
-        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isTrue();
-    }
-
-    @Test
-    public void shouldShowUninstallForAll_installForSelfOnly_shouldReturnFalse() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
-        when(mUserManager.getUsers().size()).thenReturn(2);
-        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
-        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
-        final ApplicationInfo info = new ApplicationInfo();
-        info.flags = ApplicationInfo.FLAG_INSTALLED;
-        info.enabled = true;
-        final AppEntry appEntry = mock(AppEntry.class);
-        appEntry.info = info;
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
-
-        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isFalse();
-    }
-
-    @Test
-    public void getStorageSummary_shouldWorkForExternal() {
-        Context context = RuntimeEnvironment.application.getApplicationContext();
-        AppStorageStats stats = mock(AppStorageStats.class);
-        when(stats.getTotalBytes()).thenReturn(1L);
-
-        assertThat(InstalledAppDetails.getStorageSummary(context, stats, true))
-                .isEqualTo("1.00B used in external storage");
-    }
-
-    @Test
-    public void getStorageSummary_shouldWorkForInternal() {
-        Context context = RuntimeEnvironment.application.getApplicationContext();
-        AppStorageStats stats = mock(AppStorageStats.class);
-        when(stats.getTotalBytes()).thenReturn(1L);
-
-        assertThat(InstalledAppDetails.getStorageSummary(context, stats, false))
-                .isEqualTo("1.00B used in internal storage");
-    }
-
-    @Test
-    public void launchFragment_hasNoPackageInfo_shouldFinish() {
-        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", null);
-
-        assertThat(mAppDetail.ensurePackageInfoAvailable(mActivity)).isFalse();
-        verify(mActivity).finishAndRemoveTask();
-    }
-
-    @Test
-    public void launchFragment_hasPackageInfo_shouldReturnTrue() {
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
-
-        assertThat(mAppDetail.ensurePackageInfoAvailable(mActivity)).isTrue();
-        verify(mActivity, never()).finishAndRemoveTask();
-    }
-
-    @Test
-    public void packageSizeChange_isOtherPackage_shouldNotRefreshUi() {
-        ReflectionHelpers.setField(mAppDetail, "mPackageName", PACKAGE_NAME);
-        mAppDetail.onPackageSizeChanged("Not_" + PACKAGE_NAME);
-
-        verify(mAppDetail, never()).refreshUi();
-    }
-
-    @Test
-    public void packageSizeChange_isOwnPackage_shouldRefreshUi() {
-        doReturn(Boolean.TRUE).when(mAppDetail).refreshUi();
-        ReflectionHelpers.setField(mAppDetail, "mPackageName", PACKAGE_NAME);
-
-        mAppDetail.onPackageSizeChanged(PACKAGE_NAME);
-
-        verify(mAppDetail).refreshUi();
-    }
-
-    @Test
-    public void launchPowerUsageDetailFragment_shouldNotCrash() {
-        mAppDetail.mBatteryPreference = mBatteryPreference;
-        mAppDetail.mSipper = mBatterySipper;
-        mAppDetail.mBatteryHelper = mBatteryStatsHelper;
-
-        // Should not crash
-        mAppDetail.onPreferenceClick(mBatteryPreference);
-    }
-
-    // Tests that we don't show the "uninstall for all users" button for instant apps.
-    @Test
-    public void instantApps_noUninstallForAllButton() {
-        // Make this app appear to be instant.
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> true));
-        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
-        when(mUserManager.getUsers().size()).thenReturn(2);
-
-        final ApplicationInfo info = new ApplicationInfo();
-        info.enabled = true;
-        final AppEntry appEntry = mock(AppEntry.class);
-        appEntry.info = info;
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-
-        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
-        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
-        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
-
-        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isFalse();
-    }
-
-    // Tests that we don't show the uninstall button for instant apps"
-    @Test
-    public void instantApps_noUninstallButton() {
-        // Make this app appear to be instant.
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> true));
-        final ApplicationInfo info = new ApplicationInfo();
-        info.flags = ApplicationInfo.FLAG_INSTALLED;
-        info.enabled = true;
-        final AppEntry appEntry = mock(AppEntry.class);
-        appEntry.info = info;
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        packageInfo.applicationInfo = info;
-        final Button uninstallButton = mock(Button.class);
-
-        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
-        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
-        ReflectionHelpers.setField(mAppDetail, "mUninstallButton", uninstallButton);
-
-        mAppDetail.initUnintsallButtonForUserApp();
-        verify(uninstallButton).setVisibility(View.GONE);
-    }
-
-    // Tests that we don't show the force stop button for instant apps (they aren't allowed to run
-    // when they aren't in the foreground).
-    @Test
-    public void instantApps_noForceStop() {
-        // Make this app appear to be instant.
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> true));
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        final AppEntry appEntry = mock(AppEntry.class);
-        final ApplicationInfo info = new ApplicationInfo();
-        appEntry.info = info;
-        final Button forceStopButton = mock(Button.class);
-
-        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
-        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
-        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-        ReflectionHelpers.setField(mAppDetail, "mForceStopButton", forceStopButton);
-
-        mAppDetail.checkForceStop();
-        verify(forceStopButton).setVisibility(View.GONE);
-    }
-
-    @Test
-    public void instantApps_buttonControllerHandlesDialog() {
-        InstantAppButtonsController mockController = mock(InstantAppButtonsController.class);
-        ReflectionHelpers.setField(
-                mAppDetail, "mInstantAppButtonsController", mockController);
-        // Make sure first that button controller is not called for supported dialog id
-        AlertDialog mockDialog = mock(AlertDialog.class);
-        when(mockController.createDialog(InstantAppButtonsController.DLG_CLEAR_APP))
-                .thenReturn(mockDialog);
-        assertThat(mAppDetail.createDialog(InstantAppButtonsController.DLG_CLEAR_APP, 0))
-                .isEqualTo(mockDialog);
-        verify(mockController).createDialog(InstantAppButtonsController.DLG_CLEAR_APP);
-    }
-
-    // A helper class for testing the InstantAppButtonsController - it lets us look up the
-    // preference associated with a key for instant app buttons and get back a mock
-    // LayoutPreference (to avoid a null pointer exception).
-    public static class InstalledAppDetailsWithMockInstantButtons extends InstalledAppDetails {
-        @Mock
-        private LayoutPreference mInstantButtons;
-
-        public InstalledAppDetailsWithMockInstantButtons() {
-            super();
-            MockitoAnnotations.initMocks(this);
-        }
-
-        @Override
-        public Preference findPreference(CharSequence key) {
-            if (key == "instant_app_buttons") {
-                return mInstantButtons;
-            }
-            return super.findPreference(key);
-        }
-    }
-
-    @Test
-    public void instantApps_instantSpecificButtons() {
-        // Make this app appear to be instant.
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> true));
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-
-        final InstalledAppDetailsWithMockInstantButtons
-                fragment = new InstalledAppDetailsWithMockInstantButtons();
-        ReflectionHelpers.setField(fragment, "mPackageInfo", packageInfo);
-        ReflectionHelpers.setField(fragment, "mApplicationFeatureProvider",
-                mFeatureFactory.applicationFeatureProvider);
-
-        final InstantAppButtonsController buttonsController =
-                mock(InstantAppButtonsController.class);
-        when(buttonsController.setPackageName(nullable(String.class)))
-                .thenReturn(buttonsController);
-        when(mFeatureFactory.applicationFeatureProvider.newInstantAppButtonsController(
-                nullable(Fragment.class), nullable(View.class), nullable(ShowDialogDelegate.class)))
-                .thenReturn(buttonsController);
-
-        fragment.maybeAddInstantAppButtons();
-        verify(buttonsController).setPackageName(nullable(String.class));
-        verify(buttonsController).show();
-    }
-
-    @Test
-    public void instantApps_removeCorrectPref() {
-        PreferenceScreen mockPreferenceScreen = mock(PreferenceScreen.class);
-        PreferenceManager mockPreferenceManager = mock(PreferenceManager.class);
-        AppDomainsPreference mockAppDomainsPref = mock(AppDomainsPreference.class);
-        Preference mockLaunchPreference = mock(Preference.class);
-        PackageInfo mockPackageInfo = mock(PackageInfo.class);
-        PackageManager mockPackageManager = mock(PackageManager.class);
-        ReflectionHelpers.setField(
-                mAppDetail, "mLaunchPreference", mockLaunchPreference);
-        ReflectionHelpers.setField(
-                mAppDetail, "mInstantAppDomainsPreference", mockAppDomainsPref);
-        ReflectionHelpers.setField(
-                mAppDetail, "mPreferenceManager", mockPreferenceManager);
-        ReflectionHelpers.setField(
-                mAppDetail, "mPackageInfo", mockPackageInfo);
-        ReflectionHelpers.setField(
-                mAppDetail, "mPm", mockPackageManager);
-        when(mockPreferenceManager.getPreferenceScreen()).thenReturn(mockPreferenceScreen);
-
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> false));
-        mAppDetail.prepareInstantAppPrefs();
-
-        // For the non instant case we remove the app domain pref, and leave the launch pref
-        verify(mockPreferenceScreen).removePreference(mockAppDomainsPref);
-        verify(mockPreferenceScreen, never()).removePreference(mockLaunchPreference);
-
-        // For the instant app case we remove the launch preff, and leave the app domain pref
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> true));
-
-        mAppDetail.prepareInstantAppPrefs();
-        verify(mockPreferenceScreen).removePreference(mockLaunchPreference);
-        // Will be 1 still due to above call
-        verify(mockPreferenceScreen, times(1))
-                .removePreference(mockAppDomainsPref);
-    }
-
-    @Test
-    public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() {
-        doReturn(true).when(mAppDetail).refreshUi();
-
-        mAppDetail.onActivityResult(InstalledAppDetails.REQUEST_UNINSTALL, 0, mock(Intent.class));
-
-        verify(mActivity).invalidateOptionsMenu();
-    }
-
-    @Test
-    public void findTargetSipper_findCorrectSipper() {
-        List<BatterySipper> usageList = new ArrayList<>();
-        usageList.add(mBatterySipper);
-        usageList.add(mOtherBatterySipper);
-        doReturn(usageList).when(mBatteryStatsHelper).getUsageList();
-
-        assertThat(mAppDetail.findTargetSipper(mBatteryStatsHelper, TARGET_UID)).isEqualTo(
-                mBatterySipper);
-    }
-
-    @Test
-    public void updateBattery_noBatteryStats_summaryNo() {
-        doReturn(mShadowContext.getString(R.string.no_battery_summary)).when(mAppDetail).getString(
-                R.string.no_battery_summary);
-        mAppDetail.updateBattery();
-
-        assertThat(mBatteryPreference.getSummary()).isEqualTo(
-                "No battery use since last full charge");
-    }
-
-    @Test
-    public void updateBattery_hasBatteryStats_summaryPercent() {
-        mAppDetail.mBatteryHelper = mBatteryStatsHelper;
-        mAppDetail.mSipper = mBatterySipper;
-        doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
-                anyDouble(), anyDouble(), anyInt());
-        doReturn(mShadowContext.getString(R.string.battery_summary, BATTERY_LEVEL_STRING)).when(
-                mAppDetail).getString(R.string.battery_summary, BATTERY_LEVEL_STRING);
-        doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList();
-
-        mAppDetail.updateBattery();
-
-        assertThat(mBatteryPreference.getSummary()).isEqualTo("60% use since last full charge");
-    }
-
-    @Test
-    public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() {
-        mAppDetail.mBatteryHelper = mBatteryStatsHelper;
-        mAppDetail.mSipper = mBatterySipper;
-
-        assertThat(mAppDetail.isBatteryStatsAvailable()).isTrue();
-    }
-
-    @Test
-    public void isBatteryStatsAvailable_parametersNull_returnFalse() {
-        assertThat(mAppDetail.isBatteryStatsAvailable()).isFalse();
-    }
-
-    @Test
-    public void handleDisableable_appIsHomeApp_buttonShouldNotWork() {
-        final ApplicationInfo info = new ApplicationInfo();
-        info.packageName = "pkg";
-        info.enabled = true;
-        final AppEntry appEntry = mock(AppEntry.class);
-        appEntry.info = info;
-        final HashSet<String> homePackages = new HashSet<>();
-        homePackages.add(info.packageName);
-
-        ReflectionHelpers.setField(mAppDetail, "mHomePackages", homePackages);
-        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-        final Button button = mock(Button.class);
-
-        assertThat(mAppDetail.handleDisableable(button)).isFalse();
-        verify(button).setText(R.string.disable_text);
-    }
-
-    @Test
-    public void handleDisableable_appIsEnabled_buttonShouldWork() {
-        final ApplicationInfo info = new ApplicationInfo();
-        info.packageName = "pkg";
-        info.enabled = true;
-        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-
-        final AppEntry appEntry = mock(AppEntry.class);
-        appEntry.info = info;
-        when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
-                new HashSet<>());
-
-        ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
-                mFeatureFactory.applicationFeatureProvider);
-        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-        final Button button = mock(Button.class);
-
-        assertThat(mAppDetail.handleDisableable(button)).isTrue();
-        verify(button).setText(R.string.disable_text);
-    }
-
-    @Test
-    public void handleDisableable_appIsEnabledAndInKeepEnabledWhitelist_buttonShouldNotWork() {
-        final ApplicationInfo info = new ApplicationInfo();
-        info.packageName = "pkg";
-        info.enabled = true;
-        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-
-        final AppEntry appEntry = mock(AppEntry.class);
-        appEntry.info = info;
-
-        final HashSet<String> packages = new HashSet<>();
-        packages.add(info.packageName);
-        when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
-                packages);
-
-        ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
-                mFeatureFactory.applicationFeatureProvider);
-        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-
-        final Button button = mock(Button.class);
-
-        assertThat(mAppDetail.handleDisableable(button)).isFalse();
-        verify(button).setText(R.string.disable_text);
-    }
-
-    @Test
-    public void testRestartBatteryStatsLoader() {
-        doReturn(mLoaderManager).when(mAppDetail).getLoaderManager();
-
-        mAppDetail.restartBatteryStatsLoader();
-
-        verify(mLoaderManager).restartLoader(InstalledAppDetails.LOADER_BATTERY, Bundle.EMPTY,
-                mAppDetail.mBatteryCallbacks);
-    }
-
-    @Implements(Utils.class)
-    public static class ShadowUtils {
-        @Implementation
-        public static boolean isSystemPackage(Resources resources, PackageManager pm,
-                PackageInfo pkg) {
-            return false;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
deleted file mode 100644
index c4c3259bf2c55b06ebb7f6324e085e23dc170894..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link InstalledAppLister}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class InstalledAppListerTest {
-
-    private final String APP_1 = "app1";
-    private final String APP_2 = "app2";
-    private final String APP_3 = "app3";
-    private final String APP_4 = "app4";
-    private final String APP_5 = "app5";
-    private final String APP_6 = "app6";
-
-    private final int MAIN_USER_ID = 0;
-    private final int MANAGED_PROFILE_ID = 10;
-
-    private final int PER_USER_UID_RANGE = 100000;
-    private final int MAIN_USER_APP_UID = MAIN_USER_ID * PER_USER_UID_RANGE;
-    private final int MANAGED_PROFILE_APP_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE;
-
-    @Mock private UserManager mUserManager;
-    @Mock private PackageManagerWrapper mPackageManager;
-
-    private List<UserAppInfo> mInstalledAppList = Collections.emptyList();
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
-        when(mPackageManager.queryIntentActivitiesAsUser(
-                argThat(isLaunchIntentFor(packageName)),
-                eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
-                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
-                eq(userId))).thenReturn(launchable
-                        ? Collections.singletonList(new ResolveInfo())
-                        : Collections.emptyList());
-    }
-
-    @Test
-    public void testCountInstalledAppsAcrossAllUsers() {
-        // There are two users.
-        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
-                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
-                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
-
-        // The first user has four apps installed:
-        // * app1 is an updated system app. It should be listed.
-        // * app2 is a user-installed app. It should be listed.
-        // * app3 is a system app that provides a launcher icon. It should be listed.
-        // * app4 is a system app that provides no launcher icon. It should not be listed.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
-                | PackageManager.MATCH_ANY_USER,
-                MAIN_USER_ID)).thenReturn(Arrays.asList(
-                        buildInfo(MAIN_USER_APP_UID, APP_1,
-                                ApplicationInfo.FLAG_UPDATED_SYSTEM_APP, 0 /* targetSdkVersion */),
-                        buildInfo(MAIN_USER_APP_UID, APP_2, 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        buildInfo(MAIN_USER_APP_UID, APP_3, ApplicationInfo.FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        buildInfo(MAIN_USER_APP_UID, APP_4, ApplicationInfo.FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        // For system apps, InstalledAppLister checks whether they handle the default launcher
-        // intent to decide whether to include them in the list of installed apps or not.
-        expectQueryIntentActivities(MAIN_USER_ID, APP_3, true /* launchable */);
-        expectQueryIntentActivities(MAIN_USER_ID, APP_4, false /* launchable */);
-
-        // app1, app3 and app4 are installed by enterprise policy.
-        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
-        when(mPackageManager.getInstallReason(APP_1, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_2, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_3, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_4, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        // The second user has two apps installed:
-        // * app5 is a user-installed app. It should be listed.
-        // * app6 is a system app that provides a launcher icon. It should be listed.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
-                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(
-                        buildInfo(MANAGED_PROFILE_APP_UID, APP_5, 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        buildInfo(MANAGED_PROFILE_APP_UID, APP_6, ApplicationInfo.FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        expectQueryIntentActivities(MANAGED_PROFILE_ID, APP_6, true /* launchable */);
-
-        // app5 is installed by enterprise policy.
-        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
-        when(mPackageManager.getInstallReason(APP_5, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-
-        // List apps, considering apps installed by enterprise policy only.
-        mInstalledAppList = Collections.emptyList();
-        final InstalledAppListerTestable counter = new InstalledAppListerTestable();
-        counter.execute();
-        // Wait for the background task to finish.
-        ShadowApplication.runBackgroundTasks();
-
-        assertThat(mInstalledAppList.size()).isEqualTo(3);
-
-        assertThat(checkAppFound(mInstalledAppList, APP_1, MAIN_USER_ID)).isTrue();
-        assertThat(checkAppFound(mInstalledAppList, APP_2, MAIN_USER_ID)).isFalse();
-        assertThat(checkAppFound(mInstalledAppList, APP_3, MAIN_USER_ID)).isTrue();
-        assertThat(checkAppFound(mInstalledAppList, APP_4, MAIN_USER_ID)).isFalse();
-        assertThat(checkAppFound(mInstalledAppList, APP_5, MANAGED_PROFILE_ID)).isTrue();
-        assertThat(checkAppFound(mInstalledAppList, APP_6, MANAGED_PROFILE_ID)).isFalse();
-
-        // Verify that installed packages were retrieved for the current user and the user's
-        // managed profile.
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
-        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
-                eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(anyObject(), anyInt(),
-                anyInt());
-    }
-
-    public static boolean checkAppFound(List<UserAppInfo> mInstalledAppList, String appId,
-            int userId) {
-       for (UserAppInfo info : mInstalledAppList) {
-           if (appId.equals(info.appInfo.packageName) && (info.userInfo.id == userId)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static void verifyListUniqueness(List<UserAppInfo> list) {
-        assertThat((new HashSet<>(list)).size()).isEqualTo(list.size());
-    }
-
-    private class InstalledAppListerTestable extends InstalledAppLister {
-        public InstalledAppListerTestable() {
-            super(mPackageManager, mUserManager);
-        }
-
-        @Override
-        protected void onAppListBuilt(List<UserAppInfo> list) {
-            mInstalledAppList = list;
-        }
-    }
-
-    private static ArgumentMatcher<Intent> isLaunchIntentFor(String packageName) {
-        return intent -> {
-            if (intent == null) {
-                return false;
-            }
-            if (!Intent.ACTION_MAIN.equals(intent.getAction())) {
-                return false;
-            }
-            final Set<String> categories = intent.getCategories();
-            if (categories == null || categories.size() != 1 ||
-                    !categories.contains(Intent.CATEGORY_LAUNCHER)) {
-                return false;
-            }
-            if (!packageName.equals(intent.getPackage())) {
-                return false;
-            }
-            return true;
-        };
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
deleted file mode 100644
index 699c0dbb3c5ce47fb8df6adccc940ffcb8d333a0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.support.v7.preference.Preference.OnPreferenceClickListener;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LayoutPreferenceTest {
-
-    private Context mContext;
-    private LayoutPreference mPreference;
-    private View mRootView;
-    private PreferenceViewHolder mHolder;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new LayoutPreference(mContext, R.layout.app_action_buttons);
-        mRootView = mPreference.mRootView;
-        mHolder = PreferenceViewHolder.createInstanceForTests(LayoutInflater.from(mContext)
-                .inflate(R.layout.layout_preference_frame, null, false));
-    }
-
-    @Test
-    public void setOnClickListener_shouldAttachToRootView() {
-        final OnPreferenceClickListener listener = mock(OnPreferenceClickListener.class);
-
-        mPreference.setOnPreferenceClickListener(listener);
-        mPreference.onBindViewHolder(mHolder);
-
-        mHolder.itemView.callOnClick();
-
-        verify(listener).onPreferenceClick(mPreference);
-        assertThat(mHolder.itemView.isFocusable()).isTrue();
-        assertThat(mHolder.itemView.isClickable()).isTrue();
-    }
-
-    @Test
-    public void setNonSelectable_viewShouldNotBeSelectable() {
-        mPreference.setSelectable(false);
-        mPreference.onBindViewHolder(mHolder);
-
-        assertThat(mHolder.itemView.isFocusable()).isFalse();
-        assertThat(mHolder.itemView.isClickable()).isFalse();
-    }
-
-    @Test
-    public void disableSomeView_shouldMaintainStateAfterBind() {
-        mPreference.findViewById(R.id.left_button).setEnabled(false);
-        mPreference.findViewById(R.id.right_button).setEnabled(true);
-
-        mPreference.onBindViewHolder(mHolder);
-
-        assertThat(mPreference.findViewById(R.id.left_button).isEnabled()).isFalse();
-        assertThat(mPreference.findViewById(R.id.right_button).isEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
deleted file mode 100644
index 8ed728484578863247506291909a03da05b8c623..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.Settings;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.widget.LoadingViewController;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.fakes.RoboMenuItem;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-/**
- * Tests for {@link ManageApplications}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-// TODO: Consider making the shadow class set global using a robolectric.properties file.
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowTheme.class,
-                ShadowEventLogWriter.class
-        })
-public class ManageApplicationsTest {
-
-    @Mock
-    private ApplicationsState mState;
-    @Mock
-    private ApplicationsState.Session mSession;
-    @Mock
-    private Menu mMenu;
-    private MenuItem mAppReset;
-    private Looper mBgLooper;
-    private ManageApplications mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mAppReset = new RoboMenuItem(R.id.reset_app_preferences);
-        ReflectionHelpers.setStaticField(ApplicationsState.class, "sInstance", mState);
-        when(mState.newSession(any())).thenReturn(mSession);
-        mBgLooper = Looper.myLooper();
-        when(mState.getBackgroundLooper()).thenReturn(mBgLooper);
-
-        mFragment = new ManageApplications();
-        ReflectionHelpers.setField(mFragment, "mLifecycle", new Lifecycle());
-    }
-
-    @Test
-    public void launchFragment() {
-        SettingsRobolectricTestRunner.startSettingsFragment(
-                mFragment, Settings.ManageApplicationsActivity.class);
-    }
-
-    @Test
-    public void updateDisableView_appDisabledUntilUsed_shouldSetDisabled() {
-        final TextView view = mock(TextView.class);
-        final ApplicationInfo info = new ApplicationInfo();
-        info.flags = ApplicationInfo.FLAG_INSTALLED;
-        info.enabled = true;
-        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
-        ManageApplications fragment = mock(ManageApplications.class);
-        when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final ManageApplications.ApplicationsAdapter adapter =
-                new ManageApplications.ApplicationsAdapter(mState, fragment, 0);
-
-        adapter.updateDisableView(view, info);
-
-        verify(view).setText(R.string.disabled);
-    }
-
-    @Test
-    public void updateMenu_mainListType_showAppReset() {
-        setUpOptionMenus();
-        ReflectionHelpers.setField(mFragment, "mListType", ManageApplications.LIST_TYPE_MAIN);
-        ReflectionHelpers.setField(mFragment, "mOptionsMenu", mMenu);
-
-        mFragment.updateOptionsMenu();
-        assertThat(mMenu.findItem(R.id.reset_app_preferences).isVisible()).isTrue();
-    }
-
-    @Test
-    public void updateMenu_batteryListType_hideAppReset() {
-        setUpOptionMenus();
-        ReflectionHelpers.setField(mFragment, "mListType", ManageApplications.LIST_TYPE_HIGH_POWER);
-        ReflectionHelpers.setField(mFragment, "mOptionsMenu", mMenu);
-
-        mFragment.updateOptionsMenu();
-        assertThat(mMenu.findItem(R.id.reset_app_preferences).isVisible()).isFalse();
-    }
-
-    @Test
-    public void onCreateView_shouldNotShowLoadingContainer() {
-        final ManageApplications fragment = spy(new ManageApplications());
-        ReflectionHelpers.setField(fragment, "mResetAppsHelper",
-                mock(ResetAppsHelper.class));
-        doNothing().when(fragment).createHeader();
-
-        final LayoutInflater layoutInflater = mock(LayoutInflater.class);
-        final View view = mock(View.class);
-        final View loadingContainer = mock(View.class);
-        when(layoutInflater.inflate(anyInt(), eq(null))).thenReturn(view);
-        when(view.findViewById(R.id.loading_container)).thenReturn(loadingContainer);
-
-        fragment.onCreateView(layoutInflater, mock(ViewGroup.class), null);
-
-        verify(loadingContainer, never()).setVisibility(View.VISIBLE);
-    }
-
-    @Test
-    public void updateLoading_appLoaded_shouldNotDelayCallToHandleLoadingContainer() {
-        final ManageApplications fragment = mock(ManageApplications.class);
-        ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
-        ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
-        when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final Handler handler = mock(Handler.class);
-        final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        final LoadingViewController loadingViewController =
-                mock(LoadingViewController.class);
-        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
-
-        // app loading completed
-        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", true);
-        final ArrayList<ApplicationsState.AppEntry> appList = new ArrayList<>();
-        appList.add(mock(ApplicationsState.AppEntry.class));
-        when(mSession.getAllApps()).thenReturn(appList);
-
-        adapter.updateLoading();
-
-        verify(loadingViewController, never()).showLoadingViewDelayed();
-    }
-
-    @Test
-    public void updateLoading_appNotLoaded_shouldDelayCallToHandleLoadingContainer() {
-        final ManageApplications fragment = mock(ManageApplications.class);
-        ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
-        ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
-        when(fragment.getActivity()).thenReturn(mock(Activity.class));
-
-        final Handler handler = mock(Handler.class);
-        final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        final LoadingViewController loadingViewController =
-                mock(LoadingViewController.class);
-        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
-
-        // app loading not yet completed
-        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", false);
-
-        adapter.updateLoading();
-
-        verify(loadingViewController).showLoadingViewDelayed();
-    }
-
-    @Test
-    public void onRebuildComplete_shouldHideLoadingView() {
-        final Context context = RuntimeEnvironment.application;
-        final ManageApplications fragment = mock(ManageApplications.class);
-        final View loadingContainer = mock(View.class);
-        when(loadingContainer.getContext()).thenReturn(context);
-        final View listContainer = mock(View.class);
-        when(listContainer.getVisibility()).thenReturn(View.INVISIBLE);
-        when(listContainer.getContext()).thenReturn(context);
-        ReflectionHelpers.setField(fragment, "mLoadingContainer", loadingContainer);
-        ReflectionHelpers.setField(fragment, "mListContainer", listContainer);
-        when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final Handler handler = mock(Handler.class);
-        final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        final LoadingViewController loadingViewController =
-                mock(LoadingViewController.class);
-        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
-        ReflectionHelpers.setField(adapter, "mFilterMode", -1);
-
-        // app loading not yet completed
-        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", false);
-        adapter.updateLoading();
-
-        // app loading completed
-        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", true);
-        final ArrayList<ApplicationsState.AppEntry> appList = new ArrayList<>();
-        appList.add(mock(ApplicationsState.AppEntry.class));
-        when(mSession.getAllApps()).thenReturn(appList);
-
-        adapter.onRebuildComplete(null);
-
-        verify(loadingViewController).showContent(true /* animate */);
-    }
-
-    private void setUpOptionMenus() {
-        when(mMenu.findItem(anyInt())).thenAnswer(invocation -> {
-            final Object[] args = invocation.getArguments();
-            final int id = (int) args[0];
-            if (id == mAppReset.getItemId()) {
-                return mAppReset;
-            }
-            return new RoboMenuItem(id);
-        });
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
deleted file mode 100644
index 5df5bed9ed3daf2523a2da128a9f5f453ede60d4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.nullable;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-import android.provider.DocumentsContract;
-import android.view.LayoutInflater;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class MusicViewHolderControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private StorageVolumeProvider mSvp;
-    @Mock
-    private StorageStatsSource mSource;
-
-    private Context mContext;
-    private MusicViewHolderController mController;
-    private VolumeInfo mVolume;
-    private AppViewHolder mHolder;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mVolume = new VolumeInfo("id", 0, null, "id");
-        mController = new MusicViewHolderController(mContext, mSource, mVolume.fsUuid,
-                new UserHandle(0));
-
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = AppViewHolder.createOrRecycle(inflater, null);
-    }
-
-    @Test
-    public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("0.00B");
-    }
-
-    @Test
-    public void storageShouldRepresentStorageStatsQuery() throws Exception {
-        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class))).thenReturn(
-                new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
-
-        mController.queryStats();
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("1.00B");
-    }
-
-    @Test
-    public void clickingShouldIntentIntoFilesApp() {
-        mController.onClick(mFragment);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment).startActivity(argumentCaptor.capture());
-        Intent intent = argumentCaptor.getValue();
-
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
-        assertThat(intent.getData()).isEqualTo(DocumentsContract.buildRootUri(
-                "com.android.providers.media.documents",
-                "audio_root"));
-        assertThat(intent.getType()).isEqualTo(DocumentsContract.Root.MIME_TYPE_ITEM);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
deleted file mode 100644
index 16355768651e2d4cfbd062a7284c6735cc1462e7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.content.Context;
-
-import android.content.pm.ApplicationInfo;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.notification.NotificationBackend;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NotificationAppsTest {
-
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-    @Mock
-    private NotificationBackend mBackend;
-
-    private Context mContext;
-    private NotificationApps.SummaryProvider mSummaryProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowApplication = ShadowApplication.getInstance();
-        shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager);
-        mContext = shadowApplication.getApplicationContext();
-        mSummaryProvider = spy(new NotificationApps.SummaryProvider(mContext, mSummaryLoader));
-        ReflectionHelpers.setField(mSummaryProvider, "mNotificationBackend", mBackend);
-        ReflectionHelpers.setField(mSummaryProvider, "mPackageManager", mPackageManager);
-    }
-
-    @Test
-    public void setListening_shouldSetSummary() {
-        List<UserInfo> userInfos = new ArrayList<>();
-        userInfos.add(new UserInfo(1, "user1", 0));
-        when(mUserManager.getProfiles(anyInt())).thenReturn(userInfos);
-        List<ApplicationInfo> appInfos = new ArrayList<>();
-        ApplicationInfo info1 = new ApplicationInfo();
-        info1.packageName = "package1";
-        appInfos.add(info1);
-        ApplicationInfo info2 = new ApplicationInfo();
-        info2.packageName = "package2";
-        appInfos.add(info2);
-        when(mPackageManager.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-            .thenReturn(appInfos);
-
-        // no notification off
-        when(mBackend.getNotificationsBanned(anyString(), anyInt())).thenReturn(false);
-        mSummaryProvider.setListening(true);
-        ShadowApplication.runBackgroundTasks();
-        verify(mSummaryLoader).setSummary(mSummaryProvider,
-            mContext.getString(R.string.notification_summary_none));
-
-        // some notification off
-        when(mBackend.getNotificationsBanned(eq("package1"), anyInt())).thenReturn(true);
-        mSummaryProvider.setListening(true);
-        ShadowApplication.runBackgroundTasks();
-        verify(mSummaryLoader).setSummary(mSummaryProvider,
-            mContext.getResources().getQuantityString(R.plurals.notification_summary, 1, 1));
-
-        when(mBackend.getNotificationsBanned(eq("package2"), anyInt())).thenReturn(true);
-        mSummaryProvider.setListening(true);
-        ShadowApplication.runBackgroundTasks();
-        verify(mSummaryLoader).setSummary(mSummaryProvider,
-            mContext.getResources().getQuantityString(R.plurals.notification_summary, 2, 2));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java
deleted file mode 100644
index 7eacba2e2854e5f5571ed80ef7ea95afd0d6fd1f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.nullable;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-import android.view.LayoutInflater;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PhotosViewHolderControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-
-    @Mock private StorageVolumeProvider mSvp;
-    @Mock private StorageStatsSource mSource;
-
-    private Context mContext;
-    private PhotosViewHolderController mController;
-    private VolumeInfo mVolume;
-    private AppViewHolder mHolder;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mVolume = new VolumeInfo("id", 0, null, "id");
-        mController =
-                new PhotosViewHolderController(
-                        mContext, mSource, mVolume.fsUuid, new UserHandle(0));
-
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = AppViewHolder.createOrRecycle(inflater, null);
-    }
-
-    @Test
-    public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("0.00B");
-    }
-
-    @Test
-    public void storageShouldRepresentStorageStatsQuery() throws Exception {
-        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
-
-        mController.queryStats();
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("11.00B");
-    }
-
-    @Test
-    public void clickingShouldIntentIntoFilesApp() {
-        mController.onClick(mFragment);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment).startActivity(argumentCaptor.capture());
-        Intent intent = argumentCaptor.getValue();
-
-        assertThat(intent.getType()).isEqualTo("image/*");
-        assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
-        assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
deleted file mode 100644
index 6bac9a3ee67996abf9de7cf41d9cab8a862e370c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PictureInPictureDetailsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private PictureInPictureDetails mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new PictureInPictureDetails();
-    }
-
-    @Test
-    public void testIgnoredApp() {
-        for (String ignoredPackage : PictureInPictureSettings.IGNORE_PACKAGE_LIST) {
-            assertThat(checkPackageHasPictureInPictureActivities(ignoredPackage, true))
-                            .isFalse();
-        }
-    }
-
-    @Test
-    public void testNonPippableApp() {
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage")).isFalse();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
-                false, false, false)).isFalse();
-    }
-
-    @Test
-    public void testPippableApp() {
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
-                true)).isTrue();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
-                false, true)).isTrue();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
-                true, false)).isTrue();
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_PICTURE_IN_PICTURE_ALLOW), eq("app"));
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_PICTURE_IN_PICTURE_DENY), eq("app"));
-    }
-
-    private boolean checkPackageHasPictureInPictureActivities(String packageName,
-            boolean... resizeableActivityState) {
-        ActivityInfoWrapper[] activities = null;
-        if (resizeableActivityState.length > 0) {
-            activities = new ActivityInfoWrapper[resizeableActivityState.length];
-            for (int i = 0; i < activities.length; i++) {
-                activities[i] = new MockActivityInfo(resizeableActivityState[i]);
-            }
-        }
-        return PictureInPictureSettings.checkPackageHasPictureInPictureActivities(packageName,
-                activities);
-    }
-
-    private class MockActivityInfo implements ActivityInfoWrapper {
-
-        private boolean mSupportsPictureInPicture;
-
-        public MockActivityInfo(boolean supportsPictureInPicture) {
-            mSupportsPictureInPicture = supportsPictureInPicture;
-        }
-
-        @Override
-        public boolean supportsPictureInPicture() {
-            return mSupportsPictureInPicture;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
deleted file mode 100644
index 77acb462462cd0a52d2fa7ddc4138bc41a39b4d0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.UserInfo;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PictureInPictureSettingsTest {
-
-    private static final int PRIMARY_USER_ID = 0;
-    private static final int PROFILE_USER_ID = 10;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private PictureInPictureSettings mFragment;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-    @Mock
-    private UserManagerWrapper mUserManager;
-    private ArrayList<PackageInfo> mPrimaryUserPackages;
-    private ArrayList<PackageInfo> mProfileUserPackages;
-    private ArrayList<UserInfo> mUsers;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new PictureInPictureSettings(mPackageManager, mUserManager);
-        mPrimaryUserPackages = new ArrayList<>();
-        mProfileUserPackages = new ArrayList<>();
-        mUsers = new ArrayList<>();
-        when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PRIMARY_USER_ID)))
-                .thenReturn(mPrimaryUserPackages);
-        when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PROFILE_USER_ID)))
-                .thenReturn(mProfileUserPackages);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(mUsers);
-    }
-
-    @Test
-    public void testCollectPipApps() {
-        PackageInfo primaryP1 = createPackage("Calculator", true);
-        PackageInfo primaryP2 = createPackage("Clock", false);
-        PackageInfo profileP1 = createPackage("Calculator", false);
-        PackageInfo profileP2 = createPackage("Clock", true);
-
-        mPrimaryUserPackages.add(primaryP1);
-        mPrimaryUserPackages.add(primaryP2);
-        mProfileUserPackages.add(profileP1);
-        mProfileUserPackages.add(profileP2);
-
-        ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
-        assertThat(containsPackages(apps, primaryP1, profileP2));
-        assertThat(!containsPackages(apps, primaryP2, profileP1));
-    }
-
-    @Test
-    public void testAppSort() {
-        PackageInfo primaryP1 = createPackage("Android", true);
-        PackageInfo primaryP2 = createPackage("Boop", true);
-        PackageInfo primaryP3 = createPackage("Deck", true);
-        PackageInfo profileP1 = createPackage("Android", true);
-        PackageInfo profileP2 = createPackage("Cool", true);
-        PackageInfo profileP3 = createPackage("Fast", false);
-
-        mPrimaryUserPackages.add(primaryP1);
-        mPrimaryUserPackages.add(primaryP2);
-        mPrimaryUserPackages.add(primaryP3);
-        mProfileUserPackages.add(profileP1);
-        mProfileUserPackages.add(profileP2);
-        mProfileUserPackages.add(profileP3);
-
-        ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
-        Collections.sort(apps, new PictureInPictureSettings.AppComparator(null));
-        assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2));
-    }
-
-    private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps,
-            PackageInfo... packages) {
-        for (int i = 0; i < packages.length; i++) {
-            boolean found = false;
-            for (int j = 0; j < apps.size(); j++) {
-                if (apps.get(j).first == packages[i].applicationInfo) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean isOrdered(ArrayList<Pair<ApplicationInfo, Integer>> apps,
-            PackageInfo... packages) {
-        if (apps.size() != packages.length) {
-            return false;
-        }
-
-        for (int i = 0; i < packages.length; i++) {
-            if (packages[i].applicationInfo != apps.get(i).first) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private PackageInfo createPackage(String appTitle, boolean supportsPip) {
-        PackageInfo pi = new PackageInfo();
-        ActivityInfo ai = new ActivityInfo();
-        if (supportsPip) {
-            ai.flags |= ActivityInfo.FLAG_SUPPORTS_PICTURE_IN_PICTURE;
-        }
-        pi.activities = new ActivityInfo[1];
-        pi.activities[0] = ai;
-        pi.applicationInfo = new ApplicationInfo();
-        pi.applicationInfo.name = appTitle;
-        return pi;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
deleted file mode 100644
index 30ebcde0c2de9baa4cf4b67df5e13da1208a316f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PremiumSmsAccessTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private PremiumSmsAccess mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new PremiumSmsAccess();
-        mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER,
-                "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK), eq("app"));
-
-        mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW,
-                "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY), eq("app"));
-
-        mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW,
-                "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW),
-                eq("app"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
deleted file mode 100644
index 2510f201faab20b290ddd7d5d636665c585f2965..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.app.Application;
-import android.app.usage.UsageStats;
-import android.app.usage.UsageStatsManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.content.res.Configuration;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.applications.ApplicationsState;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RecentAppsPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private PreferenceCategory mCategory;
-    @Mock
-    private Preference mSeeAllPref;
-    @Mock
-    private PreferenceCategory mDivider;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    @Mock
-    private UsageStatsManager mUsageStatsManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private ApplicationsState mAppState;
-
-    private Context mContext;
-    private RecentAppsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE))
-                .thenReturn(mUsageStatsManager);
-        when(mMockContext.getSystemService(Context.USER_SERVICE))
-                .thenReturn(mUserManager);
-
-        mContext = RuntimeEnvironment.application;
-        mController = new RecentAppsPreferenceController(mContext, mAppState, null);
-        when(mScreen.findPreference(anyString())).thenReturn(mCategory);
-
-        when(mScreen.findPreference(RecentAppsPreferenceController.KEY_SEE_ALL))
-                .thenReturn(mSeeAllPref);
-        when(mScreen.findPreference(RecentAppsPreferenceController.KEY_DIVIDER))
-                .thenReturn(mDivider);
-        when(mCategory.getContext()).thenReturn(mContext);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void doNotIndexCategory() {
-        final List<String> nonIndexable = new ArrayList<>();
-
-        mController.updateNonIndexableKeys(nonIndexable);
-
-        assertThat(nonIndexable).containsAllOf(mController.getPreferenceKey(),
-                RecentAppsPreferenceController.KEY_DIVIDER);
-    }
-
-    @Test
-    public void onDisplayAndUpdateState_shouldRefreshUi() {
-        mController = spy(
-                new RecentAppsPreferenceController(mMockContext, (Application) null, null));
-
-        doNothing().when(mController).refreshUi(mContext);
-
-        mController.displayPreference(mScreen);
-        mController.updateState(mCategory);
-
-        verify(mController, times(2)).refreshUi(mContext);
-    }
-
-    @Test
-    public void display_shouldNotShowRecents_showAppInfoPreference() {
-        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
-        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
-                .thenReturn(false);
-
-        mController.displayPreference(mScreen);
-
-        verify(mCategory, never()).addPreference(any(Preference.class));
-        verify(mCategory).setTitle(null);
-        verify(mSeeAllPref).setTitle(R.string.applications_settings);
-        verify(mSeeAllPref).setIcon(null);
-        verify(mDivider).setVisible(false);
-    }
-
-    @Test
-    public void display_showRecents() {
-        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
-                .thenReturn(true);
-        final List<UsageStats> stats = new ArrayList<>();
-        final UsageStats stat1 = new UsageStats();
-        final UsageStats stat2 = new UsageStats();
-        final UsageStats stat3 = new UsageStats();
-        stat1.mLastTimeUsed = System.currentTimeMillis();
-        stat1.mPackageName = "pkg.class";
-        stats.add(stat1);
-
-        stat2.mLastTimeUsed = System.currentTimeMillis();
-        stat2.mPackageName = "com.android.settings";
-        stats.add(stat2);
-
-        stat3.mLastTimeUsed = System.currentTimeMillis();
-        stat3.mPackageName = "pkg.class2";
-        stats.add(stat3);
-
-        // stat1, stat2 are valid apps. stat3 is invalid.
-        when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
-                .thenReturn(mock(ApplicationsState.AppEntry.class));
-        when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
-                .thenReturn(mock(ApplicationsState.AppEntry.class));
-        when(mAppState.getEntry(stat3.mPackageName, UserHandle.myUserId()))
-                .thenReturn(null);
-        when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(new ResolveInfo());
-        when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
-                .thenReturn(stats);
-        final Configuration configuration = new Configuration();
-        configuration.locale = Locale.US;
-        when(mMockContext.getResources().getConfiguration()).thenReturn(configuration);
-
-        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
-        mController.displayPreference(mScreen);
-
-        verify(mCategory).setTitle(R.string.recent_app_category_title);
-        // Only add stat1. stat2 is skipped because of the package name, stat3 skipped because
-        // it's invalid app.
-        verify(mCategory, times(1)).addPreference(any(Preference.class));
-
-        verify(mSeeAllPref).setSummary(null);
-        verify(mSeeAllPref).setIcon(R.drawable.ic_chevron_right_24dp);
-        verify(mDivider).setVisible(true);
-    }
-
-    @Test
-    public void display_hasRecentButNoneDisplayable_showAppInfo() {
-        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
-                .thenReturn(true);
-        final List<UsageStats> stats = new ArrayList<>();
-        final UsageStats stat1 = new UsageStats();
-        final UsageStats stat2 = new UsageStats();
-        stat1.mLastTimeUsed = System.currentTimeMillis();
-        stat1.mPackageName = "com.android.phone";
-        stats.add(stat1);
-
-        stat2.mLastTimeUsed = System.currentTimeMillis();
-        stat2.mPackageName = "com.android.settings";
-        stats.add(stat2);
-
-        // stat1, stat2 are not displayable
-        when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
-                .thenReturn(mock(ApplicationsState.AppEntry.class));
-        when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
-                .thenReturn(mock(ApplicationsState.AppEntry.class));
-        when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(new ResolveInfo());
-        when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
-                .thenReturn(stats);
-
-        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
-        mController.displayPreference(mScreen);
-
-        verify(mCategory, never()).addPreference(any(Preference.class));
-        verify(mCategory).setTitle(null);
-        verify(mSeeAllPref).setTitle(R.string.applications_settings);
-        verify(mSeeAllPref).setIcon(null);
-    }
-
-    @Test
-    public void display_showRecents_formatSummary() {
-        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
-            .thenReturn(true);
-        final List<UsageStats> stats = new ArrayList<>();
-        final UsageStats stat1 = new UsageStats();
-        stat1.mLastTimeUsed = System.currentTimeMillis();
-        stat1.mPackageName = "pkg.class";
-        stats.add(stat1);
-
-        when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
-            .thenReturn(mock(ApplicationsState.AppEntry.class));
-        when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-            .thenReturn(new ResolveInfo());
-        when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
-            .thenReturn(stats);
-
-        when(mMockContext.getResources().getText(eq(R.string.recent_app_summary)))
-            .thenReturn(mContext.getResources().getText(R.string.recent_app_summary));
-        final Configuration configuration = new Configuration();
-        configuration.locale = Locale.US;
-        when(mMockContext.getResources().getConfiguration()).thenReturn(configuration);
-
-        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
-        mController.displayPreference(mScreen);
-
-        verify(mCategory).addPreference(argThat(summaryMatches("0m ago")));
-    }
-
-    private static ArgumentMatcher<Preference> summaryMatches(String expected) {
-        return preference -> TextUtils.equals(expected, preference.getSummary());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
deleted file mode 100644
index f17addd64bbaffff9d08f12cdfb4e4981a769e8a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.datausage.DataSaverBackend;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SpecialAppAccessPreferenceControllerTest {
-    private Context mContext;
-    @Mock
-    private DataSaverBackend mBackend;
-    @Mock
-    private Preference mPreference;
-
-    private SpecialAppAccessPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new SpecialAppAccessPreferenceController(mContext);
-        ReflectionHelpers.setField(mController, "mDataSaverBackend", mBackend);
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_shouldSetSummary() {
-        when(mBackend.getWhitelistedCount()).thenReturn(0);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(mContext.getResources().getQuantityString(
-            R.plurals.special_access_summary, 0, 0));
-
-        when(mBackend.getWhitelistedCount()).thenReturn(1);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(mContext.getResources().getQuantityString(
-            R.plurals.special_access_summary, 1, 1));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
deleted file mode 100644
index 07acb13de0233d6c27be78994bf3be920adefbbd..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.os.RemoteException;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UsageAccessDetailsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private UsageAccessDetails mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new UsageAccessDetails();
-        mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW), eq("app"));
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY), eq("app"));
-    }
-
-    @Test
-    public void refreshUi_nullPackageInfo_shouldNotCrash() throws RemoteException {
-        mFragment.mPackageInfo = null;
-        mFragment.refreshUi();
-        // should not crash
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
deleted file mode 100644
index d2f1bbddefbc146fb614e978e583963b324ebe70..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VrListenerSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private VrListenerSettings mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new VrListenerSettings();
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW), eq("app"));
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_DENY), eq("app"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
deleted file mode 100644
index a995394d0311b07969cb65b8e2aeec684243f0d1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WriteSettingsDetailsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private WriteSettingsDetails mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new WriteSettingsDetails();
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW),
-                eq("app"));
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY),
-                eq("app"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
deleted file mode 100644
index 6c8ad9ba82766cb3b0f876c14ccf12ca9d9f6006..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.assist;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AssistContextPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private TwoStatePreference mPreference;
-    @Mock
-    private AssistContextPreferenceController.SettingObserver mObserver;
-    private Context mContext;
-    private AssistContextPreferenceController mController;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mLifecycle = new Lifecycle();
-        mContext = RuntimeEnvironment.application;
-        mController = new AssistContextPreferenceController(mContext, mLifecycle);
-        ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);
-    }
-
-    @Test
-    public void isAvailable_hasAssistant_shouldReturnTrue() {
-        Settings.Secure.putString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT, "com.android.settings/assist");
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_hasNoAssistant_shouldReturnFalse() {
-        Settings.Secure.putString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT, "");
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void onResume_shouldUpdatePreference() {
-        Settings.Secure.putString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT, "com.android.settings/assist");
-        mController.displayPreference(mScreen);
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1);
-
-        mLifecycle.onResume();
-        verify(mObserver).register(any(ContentResolver.class), eq(true));
-        verify(mPreference).setChecked(true);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
deleted file mode 100644
index d68229fb9810ecaf2c63ac6ea494eafa3363b6b7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.assist;
-
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AssistFlashScreenPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private TwoStatePreference mPreference;
-    @Mock
-    private AssistFlashScreenPreferenceController.SettingObserver mObserver;
-    private Context mContext;
-    private AssistFlashScreenPreferenceController mController;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mLifecycle = new Lifecycle();
-        mContext = RuntimeEnvironment.application;
-        mController = spy(new AssistFlashScreenPreferenceController(mContext, mLifecycle));
-        mLifecycle.addObserver(mController);
-        ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);
-    }
-
-    @Test
-    @Config(shadows = {ShadowSecureSettings.class})
-    public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() {
-        ReflectionHelpers.setField(mController, "mContext", mMockContext);
-        final ContentResolver cr = mContext.getContentResolver();
-        Settings.Secure.putString(cr, Settings.Secure.ASSISTANT, "com.android.settings/assist");
-        doReturn(true).when(mController).allowDisablingAssistDisclosure();
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    @Config(shadows = {ShadowSecureSettings.class})
-    public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() {
-        ReflectionHelpers.setField(mController, "mContext", mMockContext);
-        final ContentResolver cr = mContext.getContentResolver();
-        Settings.Secure.putString(cr, Settings.Secure.ASSISTANT, "com.android.settings/assist");
-        doReturn(false).when(mController).allowDisablingAssistDisclosure();
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_hasNoAssistant_shouldReturnFalse() {
-        Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.ASSISTANT, "");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Config(shadows = {ShadowSecureSettings.class})
-    public void onResume_shouldUpdatePreference() {
-        Settings.Secure.putString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT, "com.android.settings/assist");
-        doReturn(true).when(mController).isAvailable();
-        doReturn(true).when(mController).isPreInstalledAssistant(any(ComponentName.class));
-        doReturn(true).when(mController).willShowFlash(any(ComponentName.class));
-
-        mController.displayPreference(mScreen);
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 1);
-
-        mLifecycle.onResume();
-
-        verify(mObserver).register(any(ContentResolver.class), eq(true));
-        verify(mPreference).setChecked(true);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
deleted file mode 100644
index f0956c7bade7b1770d4a1bf8ae473b3edb3627d9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.assist;
-
-
-import android.net.Uri;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AssistSettingObserverTest {
-
-    private AssistSettingObserver mObserver;
-
-    @Test
-    public void callConstructor_shouldNotCrash() {
-        mObserver = new AssistSettingObserver() {
-            @Override
-            protected List<Uri> getSettingUris() {
-                return null;
-            }
-
-            @Override
-            public void onSettingChange() {
-
-            }
-        };
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
deleted file mode 100644
index 52916f5bc959074ed1fc545d44569c0666b49e25..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.assist;
-
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAssistPickerTest {
-
-    private static final ComponentName TEST_ASSIST =
-            new ComponentName("com.android.settings", "assist");
-
-    private Context mContext;
-    private DefaultAssistPicker mPicker;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPicker = spy(new DefaultAssistPicker());
-        mPicker.onAttach(mContext);
-        doReturn(mContext).when(mPicker).getContext();
-    }
-
-    @Test
-    public void setDefaultAppKey_shouldUpdateDefaultAssist() {
-        final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
-        assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
-        ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
-        mPicker.setDefaultKey(TEST_ASSIST.flattenToString());
-
-        assertThat(Settings.Secure.getString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT))
-                .isEqualTo(TEST_ASSIST.flattenToString());
-        assertThat(mPicker.getDefaultKey())
-                .isEqualTo(TEST_ASSIST.flattenToString());
-    }
-
-    @Test
-    public void setDefaultAppKey_noAvaialbleAssit_shouldClearDefaultAssist() {
-        final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
-        ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
-        mPicker.setDefaultKey(TEST_ASSIST.flattenToString());
-
-        assertThat(Settings.Secure.getString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT))
-                .isEmpty();
-        assertThat(mPicker.getDefaultKey())
-                .isNull();
-    }
-
-    @Test
-    public void setDefaultAppKeyToNull_shouldClearDefaultAssist() {
-        final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
-        assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
-        ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
-        mPicker.setDefaultKey(null);
-
-        assertThat(Settings.Secure.getString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT))
-                .isEmpty();
-        assertThat(mPicker.getDefaultKey())
-                .isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
deleted file mode 100644
index 180abbb491ca270f8a858376683cbc0301f26e67..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.assist;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.Manifest;
-import android.app.SearchManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.provider.Settings;
-
-import com.android.internal.app.AssistUtils;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAssistPreferenceControllerTest {
-
-    private static final String TEST_KEY = "test_pref_key";
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private SearchManager mSearchManager;
-    @Mock
-    private PackageManager mPackageManager;
-    private DefaultAssistPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new DefaultAssistPreferenceController(mContext, TEST_KEY,
-                true /* showSetting */);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getPrefKey_shouldReturnKey() {
-        assertThat(mController.getPreferenceKey())
-                .isEqualTo(TEST_KEY);
-    }
-
-    @Test
-    @Config(shadows = {ShadowSecureSettings.class})
-    public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() {
-        final String flattenKey = "com.android.settings/assist";
-        Settings.Secure.putString(null, Settings.Secure.ASSISTANT, flattenKey);
-        DefaultAppInfo appInfo = mController.getDefaultAppInfo();
-
-        assertThat(appInfo.getKey()).isEqualTo(flattenKey);
-    }
-
-    @Test
-    public void getSettingIntent_noSettingsActivity_shouldNotCrash() {
-        final String flattenKey = "com.android.settings/assist";
-        Settings.Secure.putString(null, Settings.Secure.ASSISTANT, flattenKey);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        DefaultAssistPreferenceController controller = spy(
-                new DefaultAssistPreferenceController(mContext, TEST_KEY, true /* showSetting */));
-        final ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.activityInfo = new ActivityInfo();
-        resolveInfo.activityInfo.name = "assist";
-        resolveInfo.activityInfo.applicationInfo = new ApplicationInfo();
-        resolveInfo.activityInfo.applicationInfo.packageName = "com.android.settings";
-        when(mPackageManager.resolveActivityAsUser(any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(resolveInfo);
-        when(mContext.getSystemService(Context.SEARCH_SERVICE)).thenReturn(mSearchManager);
-        when(mSearchManager.getAssistIntent(anyBoolean())).thenReturn(mock(Intent.class));
-        final ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.permission = Manifest.permission.BIND_VOICE_INTERACTION;
-        resolveInfo.serviceInfo = serviceInfo;
-        final List<ResolveInfo> services = new ArrayList<>();
-        services.add(resolveInfo);
-        when(mPackageManager.queryIntentServices(any(Intent.class), anyInt())).thenReturn(services);
-        doReturn(null).when(controller).getAssistSettingsActivity(
-                ComponentName.unflattenFromString(flattenKey), resolveInfo, mPackageManager);
-
-        controller.getSettingIntent(null);
-        // should not crash
-    }
-
-    @Test
-    public void getSettingIntent_doNotShowSetting_shouldNotTryToGetSettingIntent() {
-        final AssistUtils assistUtils = mock(AssistUtils.class);
-        final DefaultAssistPreferenceController controller = new DefaultAssistPreferenceController(
-                mContext, TEST_KEY, false /* showSetting */);
-        ReflectionHelpers.setField(controller, "mAssistUtils", assistUtils);
-
-        controller.getSettingIntent(null);
-
-        verifyZeroInteractions(assistUtils);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
deleted file mode 100644
index 1b4fb09a134beb18d61f35e6374ea7b859e0b430..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.assist;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ManageAssistTest {
-
-    private ManageAssist mSettings;
-
-    @Before
-    public void setUp() {
-        mSettings = new ManageAssist();
-    }
-
-    @Test
-    public void testGetMetricsCategory() {
-        assertThat(mSettings.getMetricsCategory())
-                .isEqualTo(MetricsProto.MetricsEvent.APPLICATIONS_MANAGE_ASSIST);
-    }
-
-    @Test
-    public void testGetCategoryKey() {
-        assertThat(mSettings.getCategoryKey()).isNull();
-    }
-
-    @Test
-    public void testGetPreferenceScreenResId() {
-        assertThat(mSettings.getPreferenceScreenResId())
-                .isEqualTo(R.xml.manage_assist);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
deleted file mode 100644
index 281e70a367fc7c9dc736109d15b1ac4ce9ffa589..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.pm.PackageItemInfo;
-import android.content.pm.PackageManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAppInfoTest {
-
-    @Mock
-    private PackageItemInfo mPackageItemInfo;
-    @Mock
-    private ComponentName mComponentName;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private PackageManagerWrapper mPackageManagerWrapper;
-
-    private DefaultAppInfo mInfo;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
-    }
-
-    @Test
-    public void initInfoWithActivityInfo_shouldLoadInfo() {
-        mPackageItemInfo.packageName = "test";
-        mInfo = new DefaultAppInfo(mPackageManagerWrapper, mPackageItemInfo);
-        mInfo.loadLabel();
-        mInfo.loadIcon();
-
-        assertThat(mInfo.getKey()).isEqualTo(mPackageItemInfo.packageName);
-        verify(mPackageItemInfo).loadLabel(mPackageManager);
-        verify(mPackageItemInfo).loadIcon(mPackageManager);
-    }
-
-    @Test
-    public void initInfoWithComponent_shouldLoadInfo() {
-        when(mComponentName.getPackageName()).thenReturn("com.android.settings");
-
-        mInfo = new DefaultAppInfo(mPackageManagerWrapper, 0 /* uid */, mComponentName);
-        mInfo.getKey();
-
-        verify(mComponentName).flattenToString();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
deleted file mode 100644
index 66ec80a26c8602114f4683733af36dc59e81168d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAppPickerFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private UserManager mUserManager;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private TestFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest(mActivity);
-        mFragment = spy(new TestFragment());
-
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        doReturn(mActivity).when(mFragment).getContext();
-        doReturn(mScreen).when(mFragment).getPreferenceScreen();
-    }
-
-    @Test
-    public void clickPreference_hasConfirmation_shouldShowConfirmation() {
-        mFragment.onAttach((Context) mActivity);
-        final RadioButtonPreference pref =
-                new RadioButtonPreference(RuntimeEnvironment.application);
-        pref.setKey("TEST");
-        doReturn("confirmation_text").when(mFragment)
-                .getConfirmationMessage(any(DefaultAppInfo.class));
-        doReturn(mActivity).when(mFragment).getActivity();
-
-        mFragment.onRadioButtonClicked(pref);
-    }
-
-    @Test
-    public void onRadioButtonConfirmed_shouldLog() {
-        mFragment.onAttach((Context) mActivity);
-        mFragment.onRadioButtonConfirmed("test_pkg");
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP),
-                eq("test_pkg"),
-                any(Pair.class));
-    }
-
-    public static class TestFragment extends DefaultAppPickerFragment {
-
-        boolean setDefaultAppKeyCalled;
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-
-        @Override
-        protected List<DefaultAppInfo> getCandidates() {
-            return new ArrayList<>();
-        }
-
-        @Override
-        protected String getDefaultKey() {
-            return null;
-        }
-
-        @Override
-        protected boolean setDefaultKey(String key) {
-            setDefaultAppKeyCalled = true;
-            return true;
-        }
-
-        @Override
-        public Context getContext() {
-            return RuntimeEnvironment.application;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
deleted file mode 100644
index 120f3ae94e0fd9f738814f81d80e7f3e5cf7d820..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAppPreferenceControllerTest {
-
-    private static final String TEST_APP_NAME = "test";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Preference mPreference;
-
-    private TestPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-    }
-
-    @Test
-    public void updateState_hasDefaultApp_shouldUpdateAppName() {
-        mController = new TestPreferenceController(mContext);
-
-        when(mController.mAppInfo.loadLabel())
-                .thenReturn(TEST_APP_NAME);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(TEST_APP_NAME);
-    }
-
-    @Test
-    public void updateState_hasNoApp_shouldNotUpdateAppName() {
-        mController = new TestPreferenceController(mContext);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(R.string.app_list_preference_none);
-    }
-
-    private static class TestPreferenceController extends DefaultAppPreferenceController {
-
-        private DefaultAppInfo mAppInfo;
-
-        public TestPreferenceController(Context context) {
-            super(context);
-            mAppInfo = mock(DefaultAppInfo.class);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return true;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return "test";
-        }
-
-        @Override
-        protected DefaultAppInfo getDefaultAppInfo() {
-            return mAppInfo;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
deleted file mode 100644
index 655f693f46fcb3ffd0603db44366e10c92069474..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAutofillPickerTest {
-
-    private static final String TEST_APP_KEY = new ComponentName("foo.bar",
-            "foo.bar.Baz").flattenToString();
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-    private DefaultAutofillPicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mPicker = spy(new DefaultAutofillPicker());
-        mPicker.onAttach((Context) mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
-    }
-
-    @Test
-    public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() {
-        assertThat(mPicker.setDefaultKey(TEST_APP_KEY)).isTrue();
-        assertThat(mPicker.getDefaultKey()).isEqualTo(TEST_APP_KEY);
-    }
-
-    @Test
-    public void getConfirmationMessage_shouldNotBeNull() {
-        final DefaultAppInfo info = mock(DefaultAppInfo.class);
-        when(info.loadLabel()).thenReturn("test_app_name");
-        assertThat(mPicker.getConfirmationMessage(info)).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
deleted file mode 100644
index d6f1122451f95763b223120ae818f47142c5e89d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.view.autofill.AutofillManager;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.AutofillManagerWrapper;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultAutofillPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PackageManagerWrapper mPackageManager;
-    @Mock
-    private AutofillManagerWrapper mAutofillManager;
-
-    private DefaultAutofillPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mController = spy(new DefaultAutofillPreferenceController(mContext));
-        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
-        ReflectionHelpers.setField(mController, "mAutofillManager", mAutofillManager);
-    }
-
-    @Test
-    public void isAvailableIfHasFeatureAndSupported() {
-        when(mContext.getSystemService(AutofillManager.class)).thenReturn(null);
-        assertThat(mController.isAvailable()).isFalse();
-
-        when(mAutofillManager.hasAutofillFeature()).thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-
-        when(mAutofillManager.hasAutofillFeature()).thenReturn(true);
-        when(mAutofillManager.isAutofillSupported()).thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-
-        when(mAutofillManager.hasAutofillFeature()).thenReturn(true);
-        when(mAutofillManager.isAutofillSupported()).thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_hasNoApp_shouldNotReturnLabel() {
-        final Preference pref = mock(Preference.class);
-
-        mController.updateState(pref);
-        verify(pref).setSummary(R.string.app_list_preference_none);
-    }
-
-    @Test
-    public void getDefaultAppInfo_shouldHaveSettingsProvider() {
-        ReflectionHelpers.setField(mController, "mContext", RuntimeEnvironment.application);
-        Settings.Secure.putString(RuntimeEnvironment.application.getContentResolver(),
-                DefaultAutofillPicker.SETTING, "com.android.settings/SettingsActivity.class");
-
-        final DefaultAppInfo info = mController.getDefaultAppInfo();
-
-        assertThat(info).isNotNull();
-
-        mController.getSettingIntent(info);
-
-        verify(mPackageManager.getPackageManager()).queryIntentServices(
-                DefaultAutofillPicker.AUTOFILL_PROBE, PackageManager.GET_META_DATA);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
deleted file mode 100644
index f5dc72d5ab9eb7d04f108bf8fe06f4e59247931b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultBrowserPickerTest {
-
-    private static final String TEST_APP_KEY = "";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-
-    private DefaultBrowserPicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mPicker = new DefaultBrowserPicker();
-        mPicker.onAttach((Context) mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-    }
-
-    @Test
-    public void setDefaultAppKey_shouldUpdateDefaultBrowser() {
-        mPicker.setDefaultKey(TEST_APP_KEY);
-        verify(mPackageManager)
-                .setDefaultBrowserPackageNameAsUser(eq(TEST_APP_KEY), anyInt());
-    }
-
-    @Test
-    public void getDefaultAppKey_shouldReturnDefaultBrowser() {
-        mPicker.getDefaultKey();
-        verify(mPackageManager)
-                .getDefaultBrowserPackageNameAsUser(anyInt());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
deleted file mode 100644
index e918ee221b5137c3e340abd91953b559e2224b3c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultBrowserPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PackageManagerWrapper mPackageManager;
-
-    private DefaultBrowserPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mController = new DefaultBrowserPreferenceController(mContext);
-        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
-    }
-
-    @Test
-    public void isAvailable_noBrowser_shouldReturnFalse() {
-        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(null);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_hasBrowser_shouldReturnTrue() {
-        final List<ResolveInfo> candidates = new ArrayList<>();
-        candidates.add(new ResolveInfo());
-        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(candidates);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getSoleAppLabel_hasNoApp_shouldNotReturnLabel() {
-        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(null);
-        final Preference pref = mock(Preference.class);
-
-        mController.updateState(pref);
-        verify(pref).setSummary(R.string.app_list_preference_none);
-    }
-
-    @Test
-    public void getDefaultApp_shouldGetDefaultBrowserPackage() {
-        mController.getDefaultAppInfo();
-
-        verify(mPackageManager).getDefaultBrowserPackageNameAsUser(anyInt());
-    }
-
-    @Test
-    public void isBrowserDefault_onlyApp_shouldReturnTrue() {
-        final String testPkg = "pkg";
-        when(mPackageManager.getDefaultBrowserPackageNameAsUser(anyInt()))
-                .thenReturn(null);
-        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(new ResolveInfo()));
-
-        assertThat(mController.isBrowserDefault(testPkg, 0)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
deleted file mode 100644
index 04972ae358afaec70c1e0590e7699aa8abaa4b49..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultEmergencyPickerTest {
-
-    private static final String TEST_APP_KEY = "test_app";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-
-    private DefaultEmergencyPicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mPicker = spy(new DefaultEmergencyPicker());
-        mPicker.onAttach((Context) mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
-    }
-
-    @Test
-    public void setDefaultAppKey_shouldUpdateDefault() {
-        assertThat(mPicker.setDefaultKey(TEST_APP_KEY)).isTrue();
-        assertThat(mPicker.getDefaultKey()).isEqualTo(TEST_APP_KEY);
-    }
-
-    @Test
-    public void getDefaultAppKey_shouldReturnDefault() {
-        Settings.Secure.putString(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
-                TEST_APP_KEY);
-
-        assertThat(mPicker.getDefaultKey()).isEqualTo(TEST_APP_KEY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
deleted file mode 100644
index b50063729e3a73e4944a993a9d82805fe757254c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.Build;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultHomePickerTest {
-
-    private static final String TEST_APP_KEY = "com.android.settings/DefaultEmergencyPickerTest";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManagerWrapper mPackageManagerWrapper;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private DefaultHomePicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
-
-        mPicker = spy(new DefaultHomePicker());
-        mPicker.onAttach((Context) mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManagerWrapper);
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
-    }
-
-    @Test
-    public void setDefaultAppKey_shouldUpdateDefault() {
-        assertThat(mPicker.setDefaultKey(TEST_APP_KEY)).isTrue();
-
-        verify(mPackageManagerWrapper).replacePreferredActivity(any(IntentFilter.class),
-                anyInt(), any(ComponentName[].class), any(ComponentName.class));
-    }
-
-    @Test
-    public void getDefaultAppKey_shouldReturnDefault() {
-        final ComponentName cn = mock(ComponentName.class);
-        when(mPackageManagerWrapper.getHomeActivities(anyList()))
-                .thenReturn(cn);
-        mPicker.getDefaultKey();
-        verify(cn).flattenToString();
-    }
-
-    @Test
-    public void getCandidates_allLaunchersAvailableIfNoManagedProfile()
-            throws NameNotFoundException {
-        addLaunchers();
-        List<DefaultAppInfo> candidates = mPicker.getCandidates();
-        assertThat(candidates.size()).isEqualTo(2);
-        assertThat(candidates.get(0).summary).isNull();
-        assertThat(candidates.get(0).enabled).isTrue();
-        assertThat(candidates.get(1).summary).isNull();
-        assertThat(candidates.get(1).enabled).isTrue();
-    }
-
-    @Test
-    public void getCandidates_onlyLollipopPlusLaunchersAvailableIfManagedProfile()
-            throws NameNotFoundException {
-        createManagedProfile();
-        addLaunchers();
-        List<DefaultAppInfo> candidates = mPicker.getCandidates();
-        assertThat(candidates.size()).isEqualTo(2);
-        DefaultAppInfo lollipopPlusLauncher = candidates.get(0);
-        assertThat(lollipopPlusLauncher.summary).isNull();
-        assertThat(lollipopPlusLauncher.enabled).isTrue();
-
-        DefaultAppInfo preLollipopLauncher = candidates.get(1);
-        assertThat(preLollipopLauncher.summary).isNotNull();
-        assertThat(preLollipopLauncher.enabled).isFalse();
-    }
-
-    private void createManagedProfile() {
-        ArrayList<UserInfo> profiles = new ArrayList<UserInfo>();
-        profiles.add(new UserInfo(/*id=*/ 10, "TestUserName", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mUserManager.getProfiles(anyInt())).thenReturn(profiles);
-    }
-
-    private ResolveInfo createLauncher(
-            String packageName, String className, int targetSdk) throws NameNotFoundException {
-        ResolveInfo launcher = new ResolveInfo();
-        launcher.activityInfo = new ActivityInfo();
-        launcher.activityInfo.packageName = packageName;
-        launcher.activityInfo.name = className;
-        ApplicationInfo launcherAppInfo = new ApplicationInfo();
-        launcherAppInfo.targetSdkVersion = targetSdk;
-        when(mPackageManager.getApplicationInfo(eq(launcher.activityInfo.packageName), anyInt()))
-                .thenReturn(launcherAppInfo);
-        return launcher;
-    }
-
-    private void addLaunchers() throws NameNotFoundException {
-        doAnswer(invocation -> {
-                // The result of this method is stored in the first parameter...
-                List<ResolveInfo> parameter = (List<ResolveInfo>) invocation.getArguments()[0];
-                parameter.add(createLauncher(
-                        "package.1", "LollipopPlusLauncher", Build.VERSION_CODES.LOLLIPOP));
-                parameter.add(createLauncher(
-                        "package.2", "PreLollipopLauncher", Build.VERSION_CODES.KITKAT));
-                return null;
-                })
-                .when(mPackageManagerWrapper).getHomeActivities(anyList());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
deleted file mode 100644
index 22b30bda3bbfea399a285049e6ca752df54244e0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultHomePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PackageManagerWrapper mPackageManager;
-
-    private DefaultHomePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mController = spy(new DefaultHomePreferenceController(mContext));
-        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getDefaultApp_shouldGetDefaultBrowserPackage() {
-        assertThat(mController.getDefaultAppInfo()).isNotNull();
-
-        verify(mPackageManager).getHomeActivities(anyList());
-    }
-
-    @Test
-    public void updateState_noDefaultApp_shouldAskPackageManagerForOnlyApp() {
-        when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
-        mController.updateState(mock(Preference.class));
-
-        verify(mPackageManager, atLeastOnce()).getHomeActivities(anyList());
-    }
-
-    @Test
-    public void testIsHomeDefault_noDefaultSet_shouldReturnTrue() {
-        when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
-        assertThat(DefaultHomePreferenceController.isHomeDefault("test.pkg", mPackageManager))
-                .isTrue();
-    }
-
-    @Test
-    public void testIsHomeDefault_defaultSetToPkg_shouldReturnTrue() {
-        final String pkgName = "test.pkg";
-        final ComponentName defaultHome = new ComponentName(pkgName, "class");
-
-        when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
-
-        assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager))
-                .isTrue();
-    }
-
-    @Test
-    public void testIsHomeDefault_defaultSetToOtherPkg_shouldReturnFalse() {
-        final String pkgName = "test.pkg";
-        final ComponentName defaultHome = new ComponentName("not" + pkgName, "class");
-
-        when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
-
-        assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager))
-                .isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
deleted file mode 100644
index 6a73269a913f31a1e380d434c4b8a4f039cc28d7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.nfc.NfcAdapter;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.TestConfig;
-import com.android.settings.nfc.PaymentBackend;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultPaymentSettingsPreferenceControllerTest {
-
-    @Mock
-    private NfcAdapter mNfcAdapter;
-    @Mock
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private PaymentBackend mPaymentBackend;
-
-    private DefaultPaymentSettingsPreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mController = new DefaultPaymentSettingsPreferenceController(mContext);
-        ReflectionHelpers.setField(mController, "mNfcAdapter", mNfcAdapter);
-
-        mPreference = new Preference(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void isAvailable_hasNfc_shouldReturnTrue() {
-        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noNfcAdapter_shouldReturnFalse() {
-        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        ReflectionHelpers.setField(mController, "mNfcAdapter", null);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void updateState_shouldSetSummaryToDefaultPaymentApp() {
-        final PaymentBackend.PaymentAppInfo defaultApp = mock(PaymentBackend.PaymentAppInfo.class);
-        defaultApp.label = "test_payment_app";
-        when(mPaymentBackend.getDefaultApp()).thenReturn(defaultApp);
-        ReflectionHelpers.setField(mController, "mPaymentBackend", mPaymentBackend);
-
-        mController.updateState(mPreference);
-
-        verify(mPaymentBackend).refresh();
-        assertThat(mPreference.getSummary()).isEqualTo(defaultApp.label);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
deleted file mode 100644
index 600acb4a778c6475bc98c8695187c24d5631a82d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultPhonePickerTest {
-
-    private static final String TEST_APP_KEY = "com.android.settings/PickerTest";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private DefaultPhonePicker.DefaultKeyUpdater mDefaultKeyUpdater;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-
-    private DefaultPhonePicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mActivity.getSystemService(Context.TELECOM_SERVICE)).thenReturn(null);
-        mPicker = spy(new DefaultPhonePicker());
-        mPicker.onAttach((Context) mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-        ReflectionHelpers.setField(mPicker, "mDefaultKeyUpdater", mDefaultKeyUpdater);
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
-    }
-
-    @Test
-    public void getSystemDefaultPackage_shouldAskDefaultKeyUpdater() {
-        mPicker.getSystemDefaultKey();
-
-        verify(mDefaultKeyUpdater).getSystemDialerPackage();
-    }
-
-    @Test
-    public void setDefaultAppKey_shouldUpdateDefault() {
-        mPicker.setDefaultKey(TEST_APP_KEY);
-
-        verify(mDefaultKeyUpdater).setDefaultDialerApplication(
-                any(Context.class), eq(TEST_APP_KEY), anyInt());
-    }
-
-    @Test
-    public void getDefaultAppKey_shouldReturnDefault() {
-        mPicker.getDefaultKey();
-        verify(mDefaultKeyUpdater).getDefaultDialerApplication(any(Context.class), anyInt());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
deleted file mode 100644
index da0c325ed23b2d05cd1a54615f486ab5b8774077..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultSmsPickerTest {
-
-    private static final String TEST_APP_KEY = "com.android.settings/PickerTest";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private DefaultSmsPicker.DefaultKeyUpdater mDefaultKeyUpdater;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-
-    private DefaultSmsPicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mPicker = spy(new DefaultSmsPicker());
-        mPicker.onAttach((Context) mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-        ReflectionHelpers.setField(mPicker, "mDefaultKeyUpdater", mDefaultKeyUpdater);
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
-    }
-
-    @Test
-    public void setDefaultAppKey_shouldUpdateDefault() {
-        mPicker.setDefaultKey(TEST_APP_KEY);
-
-        verify(mDefaultKeyUpdater).setDefaultApplication(any(Context.class), eq(TEST_APP_KEY));
-    }
-
-    @Test
-    public void getDefaultAppKey_shouldReturnDefault() {
-        mPicker.getDefaultKey();
-
-        verify(mDefaultKeyUpdater).getDefaultApplication(any(Context.class));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
deleted file mode 100644
index 9e190b56e49d34c25c10f12efae38558e6ce6ddb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.instantapps;
-
-import static com.android.settings.applications.instantapps.InstantAppButtonsController
-        .ShowDialogDelegate;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.annotation.SuppressLint;
-import android.app.Fragment;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-/** Tests for the InstantAppButtonsController. */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = 23)
-public class InstantAppButtonsControllerTest {
-
-    private static final String TEST_INSTALLER_PACKAGE_NAME = "com.installer";
-    private static final String TEST_INSTALLER_ACTIVITY_NAME = "com.installer.InstallerActivity";
-    private static final ComponentName TEST_INSTALLER_COMPONENT =
-            new ComponentName(
-                    TEST_INSTALLER_PACKAGE_NAME,
-                    TEST_INSTALLER_ACTIVITY_NAME);
-    private static final String TEST_AIA_PACKAGE_NAME = "test.aia.package";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    Context mockContext;
-    @Mock
-    PackageManager mockPackageManager;
-    @Mock
-    PackageManagerWrapper mockPackageManagerWrapper;
-    @Mock
-    View mockView;
-    @Mock
-    ShowDialogDelegate mockShowDialogDelegate;
-    @Mock
-    Button mockInstallButton;
-    @Mock
-    Button mockClearButton;
-    @Mock
-    MetricsFeatureProvider mockMetricsFeatureProvider;
-    @Mock
-    ResolveInfo mockResolveInfo;
-    @Mock
-    ActivityInfo mockActivityInfo;
-
-    private PackageManager stubPackageManager;
-
-    private FakeFeatureFactory fakeFeatureFactory;
-    private TestFragment testFragment;
-    private InstantAppButtonsController controller;
-
-
-    private View.OnClickListener receivedListener;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-        testFragment = new TestFragment();
-        when(mockView.findViewById(R.id.install)).thenReturn(mockInstallButton);
-        when(mockView.findViewById(R.id.clear_data)).thenReturn(mockClearButton);
-        mockResolveInfo.activityInfo = mockActivityInfo;
-        mockActivityInfo.packageName = TEST_INSTALLER_PACKAGE_NAME;
-        mockActivityInfo.name = TEST_INSTALLER_ACTIVITY_NAME;
-        when(mockContext.getPackageManager()).thenReturn(mockPackageManager);
-        when(mockPackageManager.resolveActivity(any(), anyInt())).thenReturn(mockResolveInfo);
-        controller = new InstantAppButtonsController(
-                mockContext, testFragment, mockView, mockShowDialogDelegate);
-        controller.setPackageName(TEST_AIA_PACKAGE_NAME);
-        ReflectionHelpers.setField(
-                controller, "mPackageManagerWrapper", mockPackageManagerWrapper);
-        FakeFeatureFactory.setupForTest(mockContext);
-    }
-
-    @Test
-    public void testInstallListenerTriggersInstall() {
-        doAnswer(invocation -> {
-            receivedListener = (View.OnClickListener) invocation.getArguments()[0];
-            return null;
-        }).when(mockInstallButton).setOnClickListener(any());
-        controller.bindButtons();
-
-        assertThat(receivedListener).isNotNull();
-        receivedListener.onClick(mockInstallButton);
-        assertThat(testFragment.getStartActivityIntent()).isNotNull();
-        assertThat(testFragment.getStartActivityIntent().getComponent())
-                .isEqualTo(TEST_INSTALLER_COMPONENT);
-    }
-
-    @Test
-    public void testClearListenerShowsDialog() {
-        doAnswer(invocation -> {
-            receivedListener = (View.OnClickListener) invocation.getArguments()[0];
-            return null;
-        }).when(mockClearButton).setOnClickListener(any());
-        controller.bindButtons();
-        assertThat(receivedListener).isNotNull();
-        receivedListener.onClick(mockClearButton);
-        verify(mockShowDialogDelegate).showDialog(InstantAppButtonsController.DLG_CLEAR_APP);
-    }
-
-    @Test
-    public void testDialogInterfaceOnClick_positiveClearsApp() {
-        controller.onClick(mock(DialogInterface.class), DialogInterface.BUTTON_POSITIVE);
-        verify(mockPackageManagerWrapper)
-                .deletePackageAsUser(eq(TEST_AIA_PACKAGE_NAME), any(), anyInt(),anyInt());
-    }
-
-    @Test
-    public void testDialogInterfaceOnClick_nonPositiveDoesNothing() {
-        controller.onClick(mock(DialogInterface.class), DialogInterface.BUTTON_NEGATIVE);
-        controller.onClick(mock(DialogInterface.class), DialogInterface.BUTTON_NEUTRAL);
-        verifyZeroInteractions(mockPackageManagerWrapper);
-    }
-    @SuppressLint("ValidFragment")
-    private class TestFragment extends Fragment {
-
-        private Intent startActivityIntent;
-
-        public Intent getStartActivityIntent() {
-            return startActivityIntent;
-        }
-
-        @Override
-        public void startActivity(Intent intent) {
-            startActivityIntent = intent;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
deleted file mode 100644
index 5fc3ebcae8c9566cca97af599fbfc3adcb51a942..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.backup;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.backup.BackupManager;
-import android.content.Context;
-import android.os.RemoteException;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class})
-public class BackupSettingsActivityPreferenceControllerTest {
-    private static final String KEY_BACKUP_SETTINGS = "backup_settings";
-
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mBackupPreference;
-
-    private BackupSettingsActivityPreferenceController mController;
-
-    private static boolean mBackupEnabled;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mController = new BackupSettingsActivityPreferenceController(mContext);
-    }
-
-    @Test
-    public void updateState_backupOn() throws RemoteException {
-        mBackupEnabled = true;
-
-        mController.updateState(mBackupPreference);
-
-        verify(mBackupPreference).setSummary(R.string.accessibility_feature_state_on);
-    }
-
-    @Test
-    public void updateState_backupOff() throws RemoteException {
-        mBackupEnabled = false;
-
-        mController.updateState(mBackupPreference);
-
-        verify(mBackupPreference).setSummary(R.string.accessibility_feature_state_off);
-    }
-
-    @Test
-    public void isAvailable_systemUser() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_nonSystemUser() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void getPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_BACKUP_SETTINGS);
-    }
-
-    @Implements(BackupManager.class)
-    public static class ShadowBackupManager {
-
-        @Implementation
-        public boolean isBackupEnabled() {
-            return mBackupEnabled;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
deleted file mode 100644
index 69c8a0385f2bd3b17ce58aa793d7a7cf37e4139a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.backup;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.Application;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.UserHandle;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchIndexableRaw;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-import org.robolectric.res.builder.RobolectricPackageManager;
-import org.robolectric.util.ActivityController;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import java.util.List;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
-                BackupSettingsActivityTest.ShadowUserHandle.class})
-public class BackupSettingsActivityTest {
-    private ActivityController<BackupSettingsActivity> mActivityController;
-    private BackupSettingsActivity mActivity;
-    private Application mApplication;
-    private RobolectricPackageManager mPackageManager;
-    private static boolean mIsBackupProvidedByOEM;
-
-    @Mock
-    private FragmentManager mFragmentManager;
-
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-    @Mock
-    private static Intent mIntent;
-    @Mock
-    private ComponentName mComponent;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mApplication = RuntimeEnvironment.application;
-        mActivityController = Robolectric.buildActivity(BackupSettingsActivity.class);
-        mActivity = mActivityController.get();
-        mPackageManager = (RobolectricPackageManager) mApplication.getPackageManager();
-        doReturn(mComponent).when(mIntent).getComponent();
-    }
-
-    @Test
-    public void onCreate_launchActivity() {
-        mIsBackupProvidedByOEM = false;
-
-        // Testing the scenario when the activity is disabled
-        mPackageManager.setComponentEnabledSetting(mComponent,
-                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
-
-        mActivityController.create();
-
-        // Verify that the component to launch was enabled.
-        assertThat(mPackageManager.getComponentState(mComponent).newState)
-                .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
-
-        // Verify that the intent returned by BackupSettingsHelper.getIntentForBackupSettings()
-        // was launched.
-        assertThat(shadowOf(mApplication).getNextStartedActivity()).isEqualTo(mIntent);
-    }
-
-    @Test
-    public void onCreate_hasManufacturerIntent() {
-        mIsBackupProvidedByOEM = true;
-
-        // Fragments are tested separately, so mock out the manager.
-        mActivity.setFragmentManager(mFragmentManager);
-        doReturn(mFragmentTransaction).when(mFragmentTransaction).replace(anyInt(),
-                any(Fragment.class));
-        doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
-
-        mActivityController.create();
-
-        assertThat(shadowOf(mApplication).getNextStartedActivity()).isNull();
-        verify(mFragmentTransaction).replace(anyInt(), isA(BackupSettingsFragment.class));
-
-    }
-
-    @Test
-    public void getNonIndexableKeys_SystemUser() {
-        final List<SearchIndexableRaw> indexableRaws =
-                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
-                        mApplication.getApplicationContext(), true);
-        final List<String> nonIndexableKeys =
-                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                        mApplication.getApplicationContext());
-
-        assertThat(indexableRaws).isNotNull();
-        assertThat(indexableRaws).isNotEmpty();
-        assertThat(nonIndexableKeys).isEmpty();
-    }
-
-    @Test
-    public void getNonIndexableKeys_NonSystemUser() {
-        ShadowUserHandle.setUid(1); // Non-SYSTEM user.
-
-        final List<SearchIndexableRaw> indexableRaws =
-                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
-                        mApplication.getApplicationContext(), true);
-        final List<String> nonIndexableKeys =
-                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                        mApplication.getApplicationContext());
-
-        assertThat(indexableRaws).isNotNull();
-        assertThat(indexableRaws).isNotEmpty();
-        assertThat(nonIndexableKeys).isNotEmpty();
-    }
-
-    @After
-    public void resetShadows() {
-        ShadowUserHandle.reset();
-    }
-
-    @Implements(BackupSettingsHelper.class)
-    public static class ShadowBackupSettingsHelper {
-        @Implementation
-        public Intent getIntentForBackupSettings() {
-            return mIntent;
-        }
-
-        @Implementation
-        public boolean isBackupProvidedByManufacturer() {
-            return mIsBackupProvidedByOEM;
-        }
-    }
-
-    @Implements(UserHandle.class)
-    public static class ShadowUserHandle {
-        private static int sUid = 0; // SYSTEM by default
-
-        public static void setUid(int uid) {
-            sUid = uid;
-        }
-
-        @Implementation
-        public static int myUserId() {
-            return sUid;
-        }
-
-        @Resetter
-        public static void reset() {
-            sUid = 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
deleted file mode 100644
index 9de0c6a3c2e287b65ce7cecc0b653ca71269632f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.backup;
-
-import android.app.backup.BackupManager;
-import android.app.backup.IBackupManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.os.IBinder;
-import android.os.RemoteException;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.drawer.SettingsDrawerActivity;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {BackupSettingsHelperTest.ShadowBackupManagerStub.class})
-public class BackupSettingsHelperTest {
-
-    private static final String DEFAULT_SETTINGS_CLASSNAME =
-            "com.android.settings.Settings$PrivacySettingsActivity";
-
-    private static final int DEFAULT_SUMMARY_RESOURCE =
-            R.string.backup_configure_account_default_summary;
-
-    private static final int DEFAULT_LABEL_RESOURCE =
-            R.string.privacy_settings_title;
-
-    private static final int MANUFACTURER_INTENT_RESOURCE = R.string.config_backup_settings_intent;
-
-    private static final int MANUFACTURER_LABEL_RESOURCE = R.string.config_backup_settings_label;
-
-    private Context mContext;
-
-    private BackupSettingsHelper mBackupSettingsHelper;
-
-    @Mock
-    private static IBackupManager mBackupManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mBackupManager.getCurrentTransport()).thenReturn("test_transport");
-        mBackupSettingsHelper = new BackupSettingsHelper(mContext);
-    }
-
-    @Test
-    public void testGetIntentFromBackupTransport() throws Exception {
-        Intent intent = new Intent();
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
-
-        verify(mBackupManager).getDataManagementIntent(anyString());
-    }
-
-    @Test
-    public void testGetIntentFromBackupTransport_WithIntent() throws Exception {
-        Intent intent = mock(Intent.class);
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
-
-        assertThat(backupIntent).isEqualTo(intent);
-    }
-
-    @Test
-    public void testGetIntentFromBackupTransport_WithNullIntent() throws Exception {
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(null);
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
-
-        assertThat(backupIntent).isNull();
-    }
-
-    @Test
-    public void testGetIntentFromBackupTransport_RemoteException() throws Exception {
-        when(mBackupManager.getDataManagementIntent(anyString())).thenThrow(new RemoteException());
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
-
-        assertThat(backupIntent).isNull();
-    }
-
-    @Test
-    public void testGetIntentFromBackupTransport_BackupEnabled() throws Exception {
-        Intent intent = new Intent("test_intent");
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-        when(mBackupManager.isBackupServiceActive(anyInt())).thenReturn(true);
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
-
-        assertThat(backupIntent.getExtras().get(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE))
-                .isEqualTo(true);
-    }
-
-    @Test
-    public void testGetIntentFromBackupTransport_BackupDisabled() throws Exception {
-        Intent intent = new Intent("test_intent");
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-        when(mBackupManager.isBackupServiceActive(anyInt())).thenReturn(false);
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
-
-        assertThat(backupIntent.getExtras().get(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE))
-                .isEqualTo(false);
-    }
-
-    @Test
-    public void testGetIntentFromBackupTransport_BackupStatusException() throws Exception {
-        Intent intent = new Intent("test_intent");
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-        when(mBackupManager.isBackupServiceActive(anyInt())).thenThrow(new RemoteException());
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
-
-        assertThat(backupIntent.getExtras().get(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE))
-                .isEqualTo(false);
-    }
-
-    @Test
-    public void testIsIntentProvidedByTransport_WithNullIntent() throws Exception {
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(null);
-
-        boolean isIntentProvided = mBackupSettingsHelper.isIntentProvidedByTransport();
-
-        assertThat(isIntentProvided).isFalse();
-    }
-
-    @Test
-    public void testIsIntentProvidedByTransport_WithInvalidIntent() throws Exception {
-        Intent intent = mock(Intent.class);
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-
-        PackageManager packageManager = mock(PackageManager.class);
-        when(mContext.getPackageManager()).thenReturn(packageManager);
-        when(intent.resolveActivity(packageManager)).thenReturn(null);
-
-        boolean isIntentProvided = mBackupSettingsHelper.isIntentProvidedByTransport();
-
-        assertThat(isIntentProvided).isFalse();
-    }
-
-    @Test
-    public void testIsIntentProvidedByTransport_WithIntent() throws Exception {
-        Intent intent = mock(Intent.class);
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-
-        PackageManager packageManager = mock(PackageManager.class);
-        when(mContext.getPackageManager()).thenReturn(packageManager);
-        when(intent.resolveActivity(packageManager)).thenReturn(mock(ComponentName.class));
-
-        boolean isIntentProvided = mBackupSettingsHelper.isIntentProvidedByTransport();
-
-        assertThat(isIntentProvided).isTrue();
-    }
-
-    @Test
-    public void testGetSummaryFromBackupTransport() throws Exception {
-        String summary = "test_summary";
-
-        when(mBackupManager.getDestinationString(anyString())).thenReturn(summary);
-
-        String backupSummary = mBackupSettingsHelper.getSummaryFromBackupTransport();
-
-        assertThat(backupSummary).isEqualTo(summary);
-    }
-
-    @Test
-    public void testGetSummaryFromBackupTransport_RemoteException() throws Exception {
-        when(mBackupManager.getDestinationString(anyString())).thenThrow(new RemoteException());
-
-        String backupSummary = mBackupSettingsHelper.getSummaryFromBackupTransport();
-
-        assertThat(backupSummary).isNull();
-    }
-
-    @Test
-    public void testGetLabelBackupTransport() throws Exception {
-        String label = "test_label";
-
-        when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
-
-        String backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
-
-        assertThat(backupLabel).isEqualTo(label);
-    }
-
-    @Test
-    public void testGetLabelBackupTransport_RemoteException() throws Exception {
-        when(mBackupManager.getDataManagementLabel(anyString())).thenThrow(new RemoteException());
-
-        String backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
-
-        assertThat(backupLabel).isNull();
-    }
-
-    @Test
-    public void testGetIntentForBackupSettings_WithIntentFromTransport() throws Exception {
-        Intent intent = mock(Intent.class);
-
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(intent);
-
-        PackageManager packageManager = mock(PackageManager.class);
-        when(mContext.getPackageManager()).thenReturn(packageManager);
-        when(intent.resolveActivity(packageManager)).thenReturn(mock(ComponentName.class));
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettings();
-
-        assertThat(backupIntent).isEqualTo(intent);
-    }
-
-    @Test
-    public void testGetIntentForBackupSettings_WithoutIntentFromTransport() throws Exception {
-        when(mBackupManager.getDataManagementIntent(anyString())).thenReturn(null);
-
-        Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettings();
-
-        assertThat(backupIntent.getComponent().getClassName()).isEqualTo(
-                DEFAULT_SETTINGS_CLASSNAME);
-        assertThat(backupIntent.getExtras().getBoolean(
-                SettingsDrawerActivity.EXTRA_SHOW_MENU)).isTrue();
-    }
-
-    @Test
-    public void testGetLabelForBackupSettings_WithLabelFromTransport() throws Exception {
-        String label = "test_label";
-
-        when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
-
-        String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
-
-        assertThat(backupLabel).isEqualTo(label);
-    }
-
-    @Test
-    public void testGetLabelForBackupSettings_WithEmptyLabelFromTransport() throws Exception {
-        String label = "";
-
-        when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
-
-        String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
-
-        assertThat(backupLabel).isEqualTo(mContext.getString(DEFAULT_LABEL_RESOURCE));
-    }
-
-    @Test
-    public void testGetLabelForBackupSettings_WithoutLabelFromTransport() throws Exception {
-        when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(null);
-
-        String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
-
-        assertThat(backupLabel).isEqualTo(mContext.getString(DEFAULT_LABEL_RESOURCE));
-    }
-
-    @Test
-    public void testGetSummaryForBackupSettings_WithSummaryFromTransport() throws Exception {
-        String summary = "test_summary";
-
-        when(mBackupManager.getDestinationString(anyString())).thenReturn(summary);
-
-        String backupSummary = mBackupSettingsHelper.getSummaryForBackupSettings();
-
-        assertThat(backupSummary).isEqualTo(summary);
-    }
-
-    @Test
-    public void testGetSummaryForBackupSettings_WithoutSummaryFromTransport() throws Exception {
-        when(mBackupManager.getDestinationString(anyString())).thenReturn(null);
-
-        String backupSummary = mBackupSettingsHelper.getSummaryForBackupSettings();
-
-        assertThat(backupSummary).isEqualTo(mContext.getString(DEFAULT_SUMMARY_RESOURCE));
-    }
-
-    @Test
-    public void testIsBackupProvidedByManufacturer_WithIntent() throws Exception {
-        String intent = "test_intent";
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        Resources spiedResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(spiedResources);
-        when(spiedResources.getString(MANUFACTURER_INTENT_RESOURCE)).thenReturn(intent);
-        mBackupSettingsHelper = new BackupSettingsHelper(mContext);
-
-        boolean hasManufacturerIntent = mBackupSettingsHelper.isBackupProvidedByManufacturer();
-
-        assertThat(hasManufacturerIntent).isTrue();
-    }
-
-    @Test
-    public void testIsBackupProvidedByManufacturer_WithoutIntent() throws Exception {
-        String intent = "";
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        Resources spiedResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(spiedResources);
-        when(spiedResources.getString(MANUFACTURER_INTENT_RESOURCE)).thenReturn(intent);
-        mBackupSettingsHelper = new BackupSettingsHelper(mContext);
-
-        boolean hasManufacturerIntent = mBackupSettingsHelper.isBackupProvidedByManufacturer();
-
-        assertThat(hasManufacturerIntent).isFalse();
-    }
-
-    @Test
-    public void testGetLabelProvidedByManufacturer() throws Exception {
-        String label = "test_label";
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        Resources spiedResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(spiedResources);
-        when(spiedResources.getString(MANUFACTURER_LABEL_RESOURCE)).thenReturn(label);
-        mBackupSettingsHelper = new BackupSettingsHelper(mContext);
-
-        String manufacturerLabel = mBackupSettingsHelper.getLabelProvidedByManufacturer();
-
-        assertThat(manufacturerLabel).isEqualTo(label);
-    }
-
-    @Test
-    public void testGetIntentProvidedByManufacturer() throws Exception {
-        String intent = "test_intent";
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        Resources spiedResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(spiedResources);
-        when(spiedResources.getString(MANUFACTURER_INTENT_RESOURCE)).thenReturn(intent);
-        mBackupSettingsHelper = new BackupSettingsHelper(mContext);
-
-        Intent manufacturerIntent = mBackupSettingsHelper.getIntentProvidedByManufacturer();
-
-        assertThat(manufacturerIntent).isNotNull();
-    }
-
-    @Implements(IBackupManager.Stub.class)
-    public static class ShadowBackupManagerStub {
-        @Implementation
-        public static IBackupManager asInterface(IBinder iBinder) {
-            return mBackupManager;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
deleted file mode 100644
index 3ad49e7cc5ef3e89694b3239ee588b11b6e045ea..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.backup;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class})
-public class BackupSettingsPreferenceControllerTest {
-    private static final String BACKUP_SETTINGS = "backup_settings";
-    private static final String MANUFACTURER_SETTINGS = "manufacturer_backup";
-
-    private Context mContext;
-
-    @Mock
-    private BackupSettingsHelper mBackupHelper;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mBackupPreference;
-    @Mock
-    private Preference mManufacturerPreference;
-
-    @Mock
-    private static Intent mBackupIntent;
-
-    private static String mBackupLabel = "Test Backup Label";
-    private static String mBackupSummary = "Test Backup Summary";
-    private static String mManufacturerLabel = "Test Manufacturer Label";
-
-    @Mock
-    private static Intent mManufacturerIntent;
-
-    private BackupSettingsPreferenceController mController;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        mController = new BackupSettingsPreferenceController(mContext);
-    }
-
-    @Test
-    public void testDisplayPreference() {
-        when(mScreen.findPreference(BACKUP_SETTINGS)).thenReturn(mBackupPreference);
-        when(mScreen.findPreference(MANUFACTURER_SETTINGS)).thenReturn(mManufacturerPreference);
-
-        mController.displayPreference(mScreen);
-
-        verify(mBackupPreference).setIntent(mBackupIntent);
-        verify(mBackupPreference).setTitle(mBackupLabel);
-        verify(mBackupPreference).setSummary(mBackupSummary);
-        verify(mManufacturerPreference).setIntent(mManufacturerIntent);
-        verify(mManufacturerPreference).setTitle(mManufacturerLabel);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getPreferenceKey_shouldReturnNull() {
-        assertThat(mController.getPreferenceKey()).isNull();
-    }
-
-    @Implements(BackupSettingsHelper.class)
-    public static class ShadowBackupSettingsHelper {
-
-        @Implementation
-        public Intent getIntentForBackupSettings() {
-            return mBackupIntent;
-        }
-
-        @Implementation
-        public String getLabelForBackupSettings() {
-            return mBackupLabel;
-        }
-
-        @Implementation
-        public String getSummaryForBackupSettings() {
-            return mBackupSummary;
-        }
-
-        @Implementation
-        public Intent getIntentProvidedByManufacturer() {
-            return mManufacturerIntent;
-        }
-
-        @Implementation
-        public String getLabelProvidedByManufacturer() {
-            return mManufacturerLabel;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
deleted file mode 100644
index fd46b4b37270f68272341e209290e41b8b592cc2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AlwaysDiscoverableTest {
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-
-    @Mock
-    private Context mContext;
-
-    private AlwaysDiscoverable mAlwaysDiscoverable;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mAlwaysDiscoverable = new AlwaysDiscoverable(mContext, mLocalAdapter);
-    }
-
-    @Test
-    public void isStartedWithoutStart() {
-        assertThat(mAlwaysDiscoverable.mStarted).isFalse();
-    }
-
-    @Test
-    public void isStartedWithStart() {
-        mAlwaysDiscoverable.start();
-        assertThat(mAlwaysDiscoverable.mStarted).isTrue();
-    }
-
-    @Test
-    public void isStartedWithStartStop() {
-        mAlwaysDiscoverable.start();
-        mAlwaysDiscoverable.stop();
-        assertThat(mAlwaysDiscoverable.mStarted).isFalse();
-    }
-
-    @Test
-    public void stopWithoutStart() {
-        mAlwaysDiscoverable.stop();
-        // expect no crash
-        verify(mLocalAdapter, never()).setScanMode(anyInt());
-    }
-
-    @Test
-    public void startSetsModeAndRegistersReceiver() {
-        when(mLocalAdapter.getScanMode()).thenReturn(BluetoothAdapter.SCAN_MODE_NONE);
-        mAlwaysDiscoverable.start();
-        verify(mLocalAdapter).setScanMode(eq(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE));
-        verify(mContext).registerReceiver(eq(mAlwaysDiscoverable), any());
-    }
-
-    @Test
-    public void stopUnregistersReceiver() {
-        mAlwaysDiscoverable.start();
-        mAlwaysDiscoverable.stop();
-        verify(mContext).unregisterReceiver(mAlwaysDiscoverable);
-    }
-
-    @Test
-    public void resetsToDiscoverableModeWhenScanModeChanges() {
-        mAlwaysDiscoverable.start();
-        verify(mLocalAdapter, times(1)).setScanMode(
-                BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-
-        sendScanModeChangedIntent(BluetoothAdapter.SCAN_MODE_CONNECTABLE,
-                BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-
-        verify(mLocalAdapter, times(2)).setScanMode(
-                BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-    }
-
-    private void sendScanModeChangedIntent(int newMode, int previousMode) {
-        when(mLocalAdapter.getScanMode()).thenReturn(newMode);
-        Intent intent = new Intent(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
-        intent.putExtra(BluetoothAdapter.EXTRA_SCAN_MODE, newMode);
-        intent.putExtra(BluetoothAdapter.EXTRA_PREVIOUS_SCAN_MODE, previousMode);
-        mAlwaysDiscoverable.onReceive(mContext, intent);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
deleted file mode 100644
index 7af2b85195332429247b028630943c396b1f8ea7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = SettingsShadowBluetoothDevice.class)
-public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase {
-    private BluetoothDetailsButtonsController mController;
-    private LayoutPreference mLayoutPreference;
-    private Button mLeftButton;
-    private Button mRightButton;
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new BluetoothDetailsButtonsController(mContext, mFragment, mCachedDevice,
-                mLifecycle);
-        mLeftButton = new Button(mContext);
-        mRightButton = new Button(mContext);
-        mLayoutPreference = new LayoutPreference(mContext, R.layout.app_action_buttons);
-        mLayoutPreference.setKey(mController.getPreferenceKey());
-        mScreen.addPreference(mLayoutPreference);
-        mLeftButton = (Button) mLayoutPreference.findViewById(R.id.left_button);
-        mRightButton = (Button) mLayoutPreference.findViewById(R.id.right_button);
-        setupDevice(mDeviceConfig);
-        when(mCachedDevice.isBusy()).thenReturn(false);
-    }
-
-    @Test
-    public void connected() {
-        showScreen(mController);
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_disconnect));
-        assertThat(mRightButton.getText()).isEqualTo(mContext.getString(R.string.forget));
-    }
-
-    @Test
-    public void clickOnDisconnect() {
-        showScreen(mController);
-        mLeftButton.callOnClick();
-        verify(mCachedDevice).disconnect();
-    }
-
-    @Test
-    public void clickOnConnect() {
-        when(mCachedDevice.isConnected()).thenReturn(false);
-        showScreen(mController);
-
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_connect));
-
-        mLeftButton.callOnClick();
-        verify(mCachedDevice).connect(eq(true));
-    }
-
-    @Test
-    public void becomeDisconnected() {
-        showScreen(mController);
-        // By default we start out with the device connected.
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_disconnect));
-
-        // Now make the device appear to have changed to disconnected.
-        when(mCachedDevice.isConnected()).thenReturn(false);
-        mController.onDeviceAttributesChanged();
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_connect));
-
-        // Click the button and make sure that connect (not disconnect) gets called.
-        mLeftButton.callOnClick();
-        verify(mCachedDevice).connect(eq(true));
-    }
-
-    @Test
-    public void becomeConnected() {
-        // Start out with the device disconnected.
-        when(mCachedDevice.isConnected()).thenReturn(false);
-        showScreen(mController);
-
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_connect));
-
-        // Now make the device appear to have changed to connected.
-        when(mCachedDevice.isConnected()).thenReturn(true);
-        mController.onDeviceAttributesChanged();
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_disconnect));
-
-        // Click the button and make sure that disconnnect (not connect) gets called.
-        mLeftButton.callOnClick();
-        verify(mCachedDevice).disconnect();
-    }
-
-    @Test
-    public void forgetDialog() {
-        showScreen(mController);
-        FragmentManager fragmentManager = mock(FragmentManager.class);
-        when(mFragment.getFragmentManager()).thenReturn(fragmentManager);
-        FragmentTransaction ft = mock(FragmentTransaction.class);
-        when(fragmentManager.beginTransaction()).thenReturn(ft);
-        mRightButton.callOnClick();
-
-        ArgumentCaptor<ForgetDeviceDialogFragment> dialogCaptor =
-                ArgumentCaptor.forClass(ForgetDeviceDialogFragment.class);
-        verify(ft).add(dialogCaptor.capture(), anyString());
-
-        ForgetDeviceDialogFragment dialogFragment = dialogCaptor.getValue();
-        assertThat(dialogFragment).isNotNull();
-    }
-
-    @Test
-    public void startsOutBusy() {
-        when(mCachedDevice.isBusy()).thenReturn(true);
-        showScreen(mController);
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_disconnect));
-        assertThat(mRightButton.getText()).isEqualTo(mContext.getString(R.string.forget));
-        assertThat(mLeftButton.isEnabled()).isFalse();
-
-        // Now pretend the device became non-busy.
-        when(mCachedDevice.isBusy()).thenReturn(false);
-        mController.onDeviceAttributesChanged();
-        assertThat(mLeftButton.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void becomesBusy() {
-        showScreen(mController);
-        assertThat(mLeftButton.isEnabled()).isTrue();
-
-        when(mCachedDevice.isBusy()).thenReturn(true);
-        mController.onDeviceAttributesChanged();
-        assertThat(mLeftButton.isEnabled()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
deleted file mode 100644
index 240ece1f9d739694e870438d34a0ed90e3810143..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows=SettingsShadowBluetoothDevice.class)
-public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {
-
-    static class TestController extends BluetoothDetailsController {
-        public TestController(Context context, PreferenceFragment fragment,
-                CachedBluetoothDevice device,
-                Lifecycle lifecycle) {
-            super(context, fragment, device, lifecycle);
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return null;
-        }
-
-        @Override
-        protected void init(PreferenceScreen screen) {}
-
-        @Override
-        protected void refresh() {}
-    }
-
-    @Test
-    public void pauseResumeEvents() {
-
-        TestController controller = spy(new TestController(mContext, mFragment, mCachedDevice,
-                mLifecycle));
-        verify(mLifecycle).addObserver(any(BluetoothDetailsController.class));
-
-        showScreen(controller);
-        verify(mCachedDevice, times(1)).registerCallback(controller);
-        verify(controller, times(1)).refresh();
-
-        controller.onPause();
-        verify(controller, times(1)).refresh();
-        verify(mCachedDevice).unregisterCallback(controller);
-
-        controller.onResume();
-        verify(controller, times(2)).refresh();
-        verify(mCachedDevice, times(2)).registerCallback(controller);
-
-        // The init function should only have been called once
-        verify(controller, times(1)).init(mScreen);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
deleted file mode 100644
index 3b8db0465791debb9069d417761025646ae5cf29..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.bluetooth;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothManager;
-import android.content.Context;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-public class BluetoothDetailsControllerTestBase {
-    protected Context mContext = RuntimeEnvironment.application;
-    protected Lifecycle mLifecycle;
-    protected DeviceConfig mDeviceConfig;
-    protected BluetoothDevice mDevice;
-    protected BluetoothManager mBluetoothManager;
-    protected BluetoothAdapter mBluetoothAdapter;
-    protected PreferenceScreen mScreen;
-    protected PreferenceManager mPreferenceManager;
-
-    @Mock
-    protected BluetoothDeviceDetailsFragment mFragment;
-    @Mock
-    protected CachedBluetoothDevice mCachedDevice;
-    @Mock
-    protected Activity mActivity;
-    @Mock
-    protected BluetoothClass mBluetoothDeviceClass;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPreferenceManager = new PreferenceManager(mContext);
-        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
-        mDeviceConfig = makeDefaultDeviceConfig();
-        when(mFragment.getActivity()).thenReturn(mActivity);
-        when(mActivity.getApplicationContext()).thenReturn(mContext);
-        when(mFragment.getContext()).thenReturn(mContext);
-        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        mLifecycle = spy(new Lifecycle());
-        mBluetoothManager = new BluetoothManager(mContext);
-        mBluetoothAdapter = mBluetoothManager.getAdapter();
-    }
-
-    protected static class DeviceConfig {
-        private String name;
-        private String address;
-        private int majorDeviceClass;
-        private boolean connected;
-        private String connectionSummary;
-
-        public DeviceConfig setName(String newValue) {
-            this.name = newValue;
-            return this;
-        }
-
-        public DeviceConfig setAddress(String newValue) {
-            this.address = newValue;
-            return this;
-        }
-
-        public DeviceConfig setMajorDeviceClass(int newValue) {
-            this.majorDeviceClass = newValue;
-            return this;
-        }
-
-        public DeviceConfig setConnected(boolean newValue) {
-            this.connected = newValue;
-            return this;
-        }
-        public DeviceConfig setConnectionSummary(String connectionSummary) {
-            this.connectionSummary = connectionSummary;
-            return this;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getAddress() {
-            return address;
-        }
-
-        public int getMajorDeviceClass() {
-            return majorDeviceClass;
-        }
-
-        public boolean isConnected() {
-            return connected;
-        }
-
-        public String getConnectionSummary() {
-            return connectionSummary;
-        }
-    }
-
-    protected DeviceConfig makeDefaultDeviceConfig() {
-        return new DeviceConfig()
-                .setName("Mock Device")
-                .setAddress("B4:B0:34:B5:3B:1B")
-                .setMajorDeviceClass(BluetoothClass.Device.Major.AUDIO_VIDEO)
-                .setConnected(true)
-                .setConnectionSummary(mContext.getString(R.string.bluetooth_connected));
-    }
-
-    /**
-     * Sets up the device mock to return various state based on a test config.
-     * @param config
-     */
-    protected void setupDevice(DeviceConfig config) {
-        when(mCachedDevice.getName()).thenReturn(config.getName());
-        when(mBluetoothDeviceClass.getMajorDeviceClass()).thenReturn(config.getMajorDeviceClass());
-        when(mCachedDevice.isConnected()).thenReturn(config.isConnected());
-        when(mCachedDevice.getConnectionSummary()).thenReturn(config.getConnectionSummary());
-
-        mDevice = mBluetoothAdapter.getRemoteDevice(config.getAddress());
-        when(mCachedDevice.getDevice()).thenReturn(mDevice);
-        when(mCachedDevice.getAddress()).thenReturn(config.getAddress());
-    }
-
-    /**
-     * Convenience method to call displayPreference and onResume.
-     */
-    protected void showScreen(BluetoothDetailsController controller) {
-        controller.displayPreference(mScreen);
-        controller.onResume();
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
deleted file mode 100644
index 98a3580a3619d6104b22930f3cd9ba968a6a2a20..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.graphics.drawable.Drawable;
-
-import com.android.settings.R;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows={SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class,
-                SettingsShadowResources.class})
-public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase {
-    private BluetoothDetailsHeaderController mController;
-    private LayoutPreference mPreference;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private EntityHeaderController mHeaderController;
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        FakeFeatureFactory.setupForTest(spy(mContext));
-        ShadowEntityHeaderController.setUseMock(mHeaderController);
-        mController = new BluetoothDetailsHeaderController(mContext, mFragment, mCachedDevice,
-                mLifecycle);
-        mPreference = new LayoutPreference(mContext, R.layout.settings_entity_header);
-        mPreference.setKey(mController.getPreferenceKey());
-        mScreen.addPreference(mPreference);
-        setupDevice(mDeviceConfig);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowEntityHeaderController.reset();
-    }
-
-    /**
-     * Test to verify the current test context object works so that we are not checking null
-     * against null
-     */
-    @Test
-    public void testContextMock() {
-        assertThat(mContext.getString(R.string.bluetooth_connected)).isEqualTo("Connected");
-    }
-
-    @Test
-    public void header() {
-        showScreen(mController);
-
-        verify(mHeaderController).setLabel(mDeviceConfig.getName());
-        verify(mHeaderController).setIcon(any(Drawable.class));
-        verify(mHeaderController).setIconContentDescription(any(String.class));
-        verify(mHeaderController).setSummary(any(String.class));
-        verify(mHeaderController).done(mActivity, true);
-    }
-
-    @Test
-    public void connectionStatusChangesWhileScreenOpen() {
-        InOrder inOrder = inOrder(mHeaderController);
-        when(mCachedDevice.getConnectionSummary()).thenReturn(
-                mContext.getString(R.string.bluetooth_connected));
-        showScreen(mController);
-        inOrder.verify(mHeaderController).setSummary(
-                mContext.getString(R.string.bluetooth_connected));
-
-        when(mCachedDevice.getConnectionSummary()).thenReturn(null);
-        mController.onDeviceAttributesChanged();
-        inOrder.verify(mHeaderController).setSummary((CharSequence) null);
-
-        when(mCachedDevice.getConnectionSummary()).thenReturn(
-                mContext.getString(R.string.bluetooth_connecting));
-        mController.onDeviceAttributesChanged();
-        inOrder.verify(mHeaderController).setSummary(
-                mContext.getString(R.string.bluetooth_connecting));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
deleted file mode 100644
index 24b28a19e83c1015d38d793a3570f0a00113cd27..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
-import com.android.settingslib.widget.FooterPreference;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows=SettingsShadowBluetoothDevice.class)
-public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
-    private BluetoothDetailsMacAddressController mController;
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice,
-                mLifecycle);
-        setupDevice(mDeviceConfig);
-    }
-
-    @Test
-    public void macAddress() {
-        showScreen(mController);
-        FooterPreference footer = (FooterPreference) mScreen.findPreference(
-                mController.getPreferenceKey());
-        assertThat(footer.getTitle().toString()).endsWith(mDeviceConfig.getAddress());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
deleted file mode 100644
index 445e4e37417655ce82f343c8cd86f3dbb2f4ac3a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceCategory;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
-import com.android.settingslib.bluetooth.A2dpProfile;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.bluetooth.LocalBluetoothProfile;
-import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
-import com.android.settingslib.bluetooth.MapProfile;
-import com.android.settingslib.bluetooth.PbapServerProfile;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows=SettingsShadowBluetoothDevice.class)
-public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase {
-    private BluetoothDetailsProfilesController mController;
-    private List<LocalBluetoothProfile> mConnectableProfiles;
-    private PreferenceCategory mProfiles;
-
-    @Mock
-    private LocalBluetoothManager mLocalManager;
-    @Mock
-    private LocalBluetoothProfileManager mProfileManager;
-
-    @Override
-    public void setUp() {
-        super.setUp();
-
-        mProfiles = spy(new PreferenceCategory(mContext));
-        when(mProfiles.getPreferenceManager()).thenReturn(mPreferenceManager);
-
-        mConnectableProfiles = new ArrayList<>();
-        when(mLocalManager.getProfileManager()).thenReturn(mProfileManager);
-        when(mCachedDevice.getConnectableProfiles()).thenAnswer(invocation ->
-            new ArrayList<>(mConnectableProfiles)
-        );
-
-        setupDevice(mDeviceConfig);
-        mController = new BluetoothDetailsProfilesController(mContext, mFragment, mLocalManager,
-                mCachedDevice, mLifecycle);
-        mProfiles.setKey(mController.getPreferenceKey());
-        mScreen.addPreference(mProfiles);
-    }
-
-    static class FakeBluetoothProfile implements LocalBluetoothProfile {
-        protected HashSet<BluetoothDevice> mConnectedDevices;
-        protected HashMap<BluetoothDevice, Boolean> mPreferred;
-        protected Context mContext;
-        protected int mNameResourceId;
-
-        public FakeBluetoothProfile(Context context, int nameResourceId) {
-            mConnectedDevices = new HashSet<>();
-            mPreferred = new HashMap<>();
-            mContext = context;
-            mNameResourceId = nameResourceId;
-        }
-
-        @Override
-        public String toString() {
-            return mContext.getString(mNameResourceId);
-        }
-
-        @Override
-        public boolean isConnectable() {
-            return true;
-        }
-
-        @Override
-        public boolean isAutoConnectable() {
-            return true;
-        }
-
-        @Override
-        public boolean connect(BluetoothDevice device) {
-            mConnectedDevices.add(device);
-            return true;
-        }
-
-        @Override
-        public boolean disconnect(BluetoothDevice device) {
-            mConnectedDevices.remove(device);
-            return false;
-        }
-
-        @Override
-        public int getConnectionStatus(BluetoothDevice device) {
-            if (mConnectedDevices.contains(device)) {
-                return BluetoothProfile.STATE_CONNECTED;
-            } else {
-                return BluetoothProfile.STATE_DISCONNECTED;
-            }
-        }
-
-        @Override
-        public boolean isPreferred(BluetoothDevice device) {
-            return mPreferred.getOrDefault(device, false);
-        }
-
-        @Override
-        public int getPreferred(BluetoothDevice device) {
-            return isPreferred(device) ?
-                    BluetoothProfile.PRIORITY_ON : BluetoothProfile.PRIORITY_OFF;
-        }
-
-        @Override
-        public void setPreferred(BluetoothDevice device, boolean preferred) {
-            mPreferred.put(device, preferred);
-        }
-
-        @Override
-        public boolean isProfileReady() {
-            return true;
-        }
-
-        @Override
-        public int getOrdinal() {
-            return 0;
-        }
-
-        @Override
-        public int getNameResource(BluetoothDevice device) {
-            return mNameResourceId;
-        }
-
-        @Override
-        public int getSummaryResourceForDevice(BluetoothDevice device) {
-            return Utils.getConnectionStateSummary(getConnectionStatus(device));
-        }
-
-        @Override
-        public int getDrawableResource(BluetoothClass btClass) {
-            return 0;
-        }
-    }
-
-    /**
-     * Creates and adds a mock LocalBluetoothProfile to the list of connectable profiles for the
-     * device.
-     @param profileNameResId  the resource id for the name used by this profile
-     @param deviceIsPreferred  whether this profile should start out as enabled for the device
-     */
-    private LocalBluetoothProfile addFakeProfile(int profileNameResId,
-            boolean deviceIsPreferred) {
-        LocalBluetoothProfile profile = new FakeBluetoothProfile(mContext, profileNameResId);
-        profile.setPreferred(mDevice, deviceIsPreferred);
-        mConnectableProfiles.add(profile);
-        when(mProfileManager.getProfileByName(eq(profile.toString()))).thenReturn(profile);
-        return profile;
-    }
-
-    /** Returns the list of SwitchPreference objects added to the screen - there should be one per
-     *  Bluetooth profile.
-     */
-    private List<SwitchPreference> getProfileSwitches(boolean expectOnlyMConnectable) {
-        if (expectOnlyMConnectable) {
-            assertThat(mConnectableProfiles).isNotEmpty();
-            assertThat(mProfiles.getPreferenceCount()).isEqualTo(mConnectableProfiles.size());
-        }
-        ArrayList<SwitchPreference> result = new ArrayList<>();
-        for (int i = 0; i < mProfiles.getPreferenceCount(); i++) {
-            result.add((SwitchPreference)mProfiles.getPreference(i));
-        }
-        return result;
-    }
-
-     private void verifyProfileSwitchTitles(List<SwitchPreference> switches) {
-        for (int i = 0; i < switches.size(); i++) {
-            String expectedTitle = mContext.getString(
-                    mConnectableProfiles.get(i).getNameResource(mDevice));
-            assertThat(switches.get(i).getTitle()).isEqualTo(expectedTitle);
-        }
-    }
-
-    @Test
-    public void oneProfile() {
-        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
-        showScreen(mController);
-        verifyProfileSwitchTitles(getProfileSwitches(true));
-    }
-
-    @Test
-    public void multipleProfiles() {
-        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
-        addFakeProfile(R.string.bluetooth_profile_headset, false);
-        showScreen(mController);
-        List<SwitchPreference> switches = getProfileSwitches(true);
-        verifyProfileSwitchTitles(switches);
-        assertThat(switches.get(0).isChecked()).isTrue();
-        assertThat(switches.get(1).isChecked()).isFalse();
-
-        // Both switches should be enabled.
-        assertThat(switches.get(0).isEnabled()).isTrue();
-        assertThat(switches.get(1).isEnabled()).isTrue();
-
-        // Make device busy.
-        when(mCachedDevice.isBusy()).thenReturn(true);
-        mController.onDeviceAttributesChanged();
-
-        // There should have been no new switches added.
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
-
-        // Make sure both switches got disabled.
-        assertThat(switches.get(0).isEnabled()).isFalse();
-        assertThat(switches.get(1).isEnabled()).isFalse();
-    }
-
-    @Test
-    public void disableThenReenableOneProfile() {
-        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
-        addFakeProfile(R.string.bluetooth_profile_headset, true);
-        showScreen(mController);
-        List<SwitchPreference> switches = getProfileSwitches(true);
-        SwitchPreference pref = switches.get(0);
-
-        // Clicking the pref should cause the profile to become not-preferred.
-        assertThat(pref.isChecked()).isTrue();
-        pref.performClick();
-        assertThat(pref.isChecked()).isFalse();
-        assertThat(mConnectableProfiles.get(0).isPreferred(mDevice)).isFalse();
-
-        // Make sure no new preferences were added.
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
-
-        // Clicking the pref again should make the profile once again preferred.
-        pref.performClick();
-        assertThat(pref.isChecked()).isTrue();
-        assertThat(mConnectableProfiles.get(0).isPreferred(mDevice)).isTrue();
-
-        // Make sure we still haven't gotten any new preferences added.
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
-    }
-
-    @Test
-    public void disconnectedDeviceOneProfile() {
-        setupDevice(makeDefaultDeviceConfig().setConnected(false).setConnectionSummary(null));
-        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
-        showScreen(mController);
-        verifyProfileSwitchTitles(getProfileSwitches(true));
-    }
-
-    @Test
-    public void pbapProfileStartsEnabled() {
-        setupDevice(makeDefaultDeviceConfig());
-        when(mCachedDevice.getPhonebookPermissionChoice()).thenReturn(
-                CachedBluetoothDevice.ACCESS_ALLOWED);
-        PbapServerProfile psp = mock(PbapServerProfile.class);
-        when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
-        when(psp.toString()).thenReturn(PbapServerProfile.NAME);
-        when(mProfileManager.getPbapProfile()).thenReturn(psp);
-
-        showScreen(mController);
-        List<SwitchPreference> switches = getProfileSwitches(false);
-        assertThat(switches.size()).isEqualTo(1);
-        SwitchPreference pref = switches.get(0);
-        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_pbap));
-        assertThat(pref.isChecked()).isTrue();
-
-        pref.performClick();
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
-        verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
-    }
-
-    @Test
-    public void pbapProfileStartsDisabled() {
-        setupDevice(makeDefaultDeviceConfig());
-        when(mCachedDevice.getPhonebookPermissionChoice()).thenReturn(
-                CachedBluetoothDevice.ACCESS_REJECTED);
-        PbapServerProfile psp = mock(PbapServerProfile.class);
-        when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
-        when(psp.toString()).thenReturn(PbapServerProfile.NAME);
-        when(mProfileManager.getPbapProfile()).thenReturn(psp);
-
-        showScreen(mController);
-        List<SwitchPreference> switches = getProfileSwitches(false);
-        assertThat(switches.size()).isEqualTo(1);
-        SwitchPreference pref = switches.get(0);
-        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_pbap));
-        assertThat(pref.isChecked()).isFalse();
-
-        pref.performClick();
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
-        verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
-    }
-
-    @Test
-    public void mapProfile() {
-        setupDevice(makeDefaultDeviceConfig());
-        MapProfile mapProfile = mock(MapProfile.class);
-        when(mapProfile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_map);
-        when(mProfileManager.getMapProfile()).thenReturn(mapProfile);
-        when(mProfileManager.getProfileByName(eq(mapProfile.toString()))).thenReturn(mapProfile);
-        when(mCachedDevice.getMessagePermissionChoice()).thenReturn(
-                CachedBluetoothDevice.ACCESS_REJECTED);
-        showScreen(mController);
-        List<SwitchPreference> switches = getProfileSwitches(false);
-        assertThat(switches.size()).isEqualTo(1);
-        SwitchPreference pref = switches.get(0);
-        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_map));
-        assertThat(pref.isChecked()).isFalse();
-
-        pref.performClick();
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
-        verify(mCachedDevice).setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
-    }
-
-    private A2dpProfile addMockA2dpProfile(boolean preferred, boolean supportsHighQualityAudio,
-            boolean highQualityAudioEnabled) {
-        A2dpProfile profile = mock(A2dpProfile.class);
-        when(mProfileManager.getProfileByName(eq(profile.toString()))).thenReturn(profile);
-        when(profile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_a2dp);
-        when(profile.getHighQualityAudioOptionLabel(mDevice)).thenReturn(mContext.getString(
-                R.string.bluetooth_profile_a2dp_high_quality_unknown_codec));
-        when(profile.supportsHighQualityAudio(mDevice)).thenReturn(supportsHighQualityAudio);
-        when(profile.isHighQualityAudioEnabled(mDevice)).thenReturn(highQualityAudioEnabled);
-        when(profile.isPreferred(mDevice)).thenReturn(preferred);
-        mConnectableProfiles.add(profile);
-        return profile;
-    }
-
-    private SwitchPreference getHighQualityAudioPref() {
-        return (SwitchPreference) mScreen.findPreference(
-                BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
-    }
-
-    @Test
-    public void highQualityAudio_prefIsPresentWhenSupported() {
-        setupDevice(makeDefaultDeviceConfig());
-        addMockA2dpProfile(true, true, true);
-        showScreen(mController);
-        SwitchPreference pref = getHighQualityAudioPref();
-        assertThat(pref.getKey()).isEqualTo(
-                BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
-
-        // Make sure the preference works when clicked on.
-        pref.performClick();
-        A2dpProfile profile = (A2dpProfile) mConnectableProfiles.get(0);
-        verify(profile).setHighQualityAudioEnabled(mDevice, false);
-        pref.performClick();
-        verify(profile).setHighQualityAudioEnabled(mDevice, true);
-    }
-
-    @Test
-    public void highQualityAudio_prefIsAbsentWhenNotSupported() {
-        setupDevice(makeDefaultDeviceConfig());
-        addMockA2dpProfile(true, false, false);
-        showScreen(mController);
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
-        SwitchPreference pref = (SwitchPreference) mProfiles.getPreference(0);
-        assertThat(pref.getKey()).isNotEqualTo(
-                BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
-        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_a2dp));
-    }
-
-    @Test
-    public void highQualityAudio_busyDeviceDisablesSwitch() {
-        setupDevice(makeDefaultDeviceConfig());
-        addMockA2dpProfile(true, true, true);
-        when(mCachedDevice.isBusy()).thenReturn(true);
-        showScreen(mController);
-        SwitchPreference pref = getHighQualityAudioPref();
-        assertThat(pref.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void highQualityAudio_mediaAudioDisabledAndReEnabled() {
-        setupDevice(makeDefaultDeviceConfig());
-        A2dpProfile audioProfile = addMockA2dpProfile(true, true, true);
-        showScreen(mController);
-        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
-
-        // Disabling media audio should cause the high quality audio switch to disappear, but not
-        // the regular audio one.
-        SwitchPreference audioPref = (SwitchPreference) mScreen.findPreference(
-                audioProfile.toString());
-        audioPref.performClick();
-        verify(audioProfile).setPreferred(mDevice, false);
-        when(audioProfile.isPreferred(mDevice)).thenReturn(false);
-        mController.onDeviceAttributesChanged();
-        assertThat(audioPref.isVisible()).isTrue();
-        SwitchPreference highQualityAudioPref = getHighQualityAudioPref();
-        assertThat(highQualityAudioPref.isVisible()).isFalse();
-
-        // And re-enabling media audio should make high quality switch to reappear.
-        audioPref.performClick();
-        verify(audioProfile).setPreferred(mDevice, true);
-        when(audioProfile.isPreferred(mDevice)).thenReturn(true);
-        mController.onDeviceAttributesChanged();
-        highQualityAudioPref = getHighQualityAudioPref();
-        assertThat(highQualityAudioPref.isVisible()).isTrue();
-    }
-
-    @Test
-    public void highQualityAudio_mediaAudioStartsDisabled() {
-        setupDevice(makeDefaultDeviceConfig());
-        A2dpProfile audioProfile = addMockA2dpProfile(false, true, true);
-        showScreen(mController);
-        SwitchPreference audioPref = (SwitchPreference) mScreen.findPreference(
-                audioProfile.toString());
-        SwitchPreference highQualityAudioPref = getHighQualityAudioPref();
-        assertThat(audioPref).isNotNull();
-        assertThat(audioPref.isChecked()).isFalse();
-        assertThat(highQualityAudioPref).isNotNull();
-        assertThat(highQualityAudioPref.isVisible()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
deleted file mode 100644
index 544b5903c9c7102453450f25c7de78a354a47e10..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.fakes.RoboMenu;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothDeviceDetailsFragmentTest {
-    private BluetoothDeviceDetailsFragment mFragment;
-    private Context mContext;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private CachedBluetoothDevice mCachedDevice;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LocalBluetoothManager mLocalManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        FakeFeatureFactory.setupForTest(mContext);
-
-        String deviceAddress = "55:66:77:88:99:AA";
-        mFragment = spy(BluetoothDeviceDetailsFragment.newInstance(deviceAddress));
-        doReturn(mLocalManager).when(mFragment).getLocalBluetoothManager(any());
-        doReturn(mCachedDevice).when(mFragment).getCachedDevice(any());
-
-        when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
-        Bundle args = new Bundle();
-        args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, deviceAddress);
-        mFragment.setArguments(args);
-        mFragment.onAttach(mContext);
-    }
-
-    @Test
-    public void renameControlGetsAdded() {
-        RoboMenu menu = new RoboMenu(mContext);
-        MenuInflater inflater = new MenuInflater(mContext);
-        mFragment.onCreateOptionsMenu(menu, inflater);
-        MenuItem item = menu.getItem(0);
-        assertThat(item.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_rename_button));
-        assertThat(item.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_mode_edit));
-    }
-
-    @Test
-    public void renameControlClicked() {
-        RoboMenu menu = new RoboMenu(mContext);
-        MenuInflater inflater = new MenuInflater(mContext);
-        mFragment.onCreateOptionsMenu(menu, inflater);
-        MenuItem item = menu.getItem(0);
-        assertThat(item.getItemId()).isEqualTo(
-                BluetoothDeviceDetailsFragment.EDIT_DEVICE_NAME_ITEM_ID);
-
-        FragmentManager fragmentManager = mock(FragmentManager.class);
-        when(mFragment.getFragmentManager()).thenReturn(fragmentManager);
-        FragmentTransaction ft = mock(FragmentTransaction.class);
-        when(fragmentManager.beginTransaction()).thenReturn(ft);
-
-        ArgumentCaptor<Fragment> captor = ArgumentCaptor.forClass(Fragment.class);
-        mFragment.onOptionsItemSelected(item);
-        verify(ft).add(captor.capture(), eq(RemoteDeviceNameDialogFragment.TAG));
-        RemoteDeviceNameDialogFragment dialog = (RemoteDeviceNameDialogFragment) captor.getValue();
-        assertThat(dialog).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
deleted file mode 100644
index 2e094e24071d5be78d6846673a664978680e7357..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothDeviceNamePreferenceControllerTest {
-    private static final String DEVICE_NAME = "Nightshade";
-    private static final int ORDER = 1;
-
-    private Context mContext;
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    private Preference mPreference;
-
-    private BluetoothDeviceNamePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-
-        doReturn(mContext).when(mPreferenceScreen).getContext();
-        mPreference = new Preference(mContext);
-        mPreference.setKey(BluetoothDeviceNamePreferenceController.KEY_DEVICE_NAME);
-        mController = new BluetoothDeviceNamePreferenceController(
-                mContext, mLocalAdapter);
-    }
-
-    @Test
-    public void testUpdateDeviceName_showSummaryWithDeviceName() {
-        mController.updateDeviceName(mPreference, DEVICE_NAME);
-
-        final CharSequence summary = mPreference.getSummary();
-
-        assertThat(summary.toString())
-                .isEqualTo("Visible as \u201CNightshade\u201D to other devices");
-        assertThat(mPreference.isSelectable()).isFalse();
-    }
-
-    @Test
-    public void testCreateBluetoothDeviceNamePreference() {
-        Preference preference = mController.createBluetoothDeviceNamePreference(mPreferenceScreen,
-                ORDER);
-
-        assertThat(preference.getKey()).isEqualTo(mController.KEY_DEVICE_NAME);
-        assertThat(preference.getOrder()).isEqualTo(ORDER);
-        verify(mPreferenceScreen).addPreference(preference);
-    }
-
-    @Test
-    public void testOnStart_receiverRegistered() {
-        mController.onStart();
-        verify(mContext).registerReceiver(eq(mController.mReceiver), any());
-    }
-
-    @Test
-    public void testOnStop_receiverUnregistered() {
-        // register it first
-        mContext.registerReceiver(mController.mReceiver, null);
-
-        mController.onStop();
-        verify(mContext).unregisterReceiver(mController.mReceiver);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
deleted file mode 100644
index ac0720a246f38c6de6b0059586e3e6093f64aa4f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = SettingsShadowResources.class)
-public class BluetoothDevicePreferenceTest {
-
-    private Context mContext;
-    @Mock
-    private CachedBluetoothDevice mCachedBluetoothDevice;
-    @Mock
-    private DeviceListPreferenceFragment mDeviceListPreferenceFragment;
-
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-    private BluetoothDevicePreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        FakeFeatureFactory.setupForTest(mContext);
-        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                mDeviceListPreferenceFragment);
-    }
-
-    @Test
-    public void onClicked_deviceConnected_shouldLogBluetoothDisconnectEvent() {
-        when(mCachedBluetoothDevice.isConnected()).thenReturn(true);
-
-        mPreference.onClicked();
-
-        verify(mMetricsFeatureProvider).action(
-                mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);
-    }
-
-    @Test
-    public void onClicked_deviceBonded_shouldLogBluetoothConnectEvent() {
-        when(mCachedBluetoothDevice.isConnected()).thenReturn(false);
-        when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
-
-        mPreference.onClicked();
-
-        verify(mMetricsFeatureProvider).action(
-                mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT);
-    }
-
-    @Test
-    public void onClicked_deviceNotBonded_shouldLogBluetoothPairEvent() {
-        when(mCachedBluetoothDevice.isConnected()).thenReturn(false);
-        when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
-        when(mCachedBluetoothDevice.startPairing()).thenReturn(true);
-        when(mCachedBluetoothDevice.hasHumanReadableName()).thenReturn(true);
-
-        mPreference.onClicked();
-
-        verify(mMetricsFeatureProvider).action(
-                mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
-        verify(mMetricsFeatureProvider, never()).action(mContext,
-                MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
-    }
-
-    @Test
-    public void onClicked_deviceNotBonded_shouldLogBluetoothPairEventAndPairWithoutNameEvent() {
-        when(mCachedBluetoothDevice.isConnected()).thenReturn(false);
-        when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
-        when(mCachedBluetoothDevice.startPairing()).thenReturn(true);
-        when(mCachedBluetoothDevice.hasHumanReadableName()).thenReturn(false);
-
-        mPreference.onClicked();
-
-        verify(mMetricsFeatureProvider).action(
-                mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
-        verify(mMetricsFeatureProvider).action(mContext,
-                MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
-    }
-
-    @Test
-    public void getSecondTargetResource_shouldBeGearIconLayout() {
-        assertThat(mPreference.getSecondTargetResId()).isEqualTo(R.layout.preference_widget_gear);
-    }
-
-    @Test
-    public void shouldHideSecondTarget_noDevice_shouldReturnTrue() {
-        ReflectionHelpers.setField(mPreference, "mCachedDevice", null);
-
-        assertThat(mPreference.shouldHideSecondTarget()).isTrue();
-    }
-
-    @Test
-    public void shouldHideSecondTarget_notBond_shouldReturnTrue() {
-        when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
-
-        assertThat(mPreference.shouldHideSecondTarget()).isTrue();
-    }
-
-    @Test
-    public void shouldHideSecondTarget_hasUserRestriction_shouldReturnTrue() {
-        final UserManager um = mock(UserManager.class);
-        ReflectionHelpers.setField(mPreference, "mUserManager", um);
-        when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH))
-                .thenReturn(true);
-
-        assertThat(mPreference.shouldHideSecondTarget()).isTrue();
-    }
-
-    @Test
-    public void shouldHideSecondTarget_hasBoundDeviceAndNoRestriction_shouldReturnFalse() {
-        when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
-        final UserManager um = mock(UserManager.class);
-        ReflectionHelpers.setField(mPreference, "mUserManager", um);
-        when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH))
-                .thenReturn(false);
-
-        assertThat(mPreference.shouldHideSecondTarget()).isFalse();
-    }
-
-    @Test
-    public void imagingDeviceIcon_isICSettingsPrint() {
-        when(mCachedBluetoothDevice.getBatteryLevel()).thenReturn(
-                BluetoothDevice.BATTERY_LEVEL_UNKNOWN);
-        when(mCachedBluetoothDevice.getBtClass()).thenReturn(
-                new BluetoothClass(BluetoothClass.Device.Major.IMAGING));
-
-        mPreference.onDeviceAttributesChanged();
-        assertThat(mPreference.getIcon()).isEqualTo(
-                mContext.getDrawable(R.drawable.ic_settings_print));
-    }
-
-    @Test
-    public void testVisible_notVisibleThenVisible() {
-        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(false);
-        final boolean[] humanReadableName = {false};
-        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
-                .hasHumanReadableName();
-        BluetoothDevicePreference preference =
-                new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                        mDeviceListPreferenceFragment);
-        assertThat(preference.isVisible()).isFalse();
-        humanReadableName[0] = true;
-        preference.onDeviceAttributesChanged();
-        assertThat(preference.isVisible()).isTrue();
-    }
-
-    @Test
-    public void testVisible_visibleThenNotVisible() {
-        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(false);
-        final boolean[] humanReadableName = {true};
-        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
-                .hasHumanReadableName();
-        BluetoothDevicePreference preference =
-                new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                        mDeviceListPreferenceFragment);
-        assertThat(preference.isVisible()).isTrue();
-        humanReadableName[0] = false;
-        preference.onDeviceAttributesChanged();
-        assertThat(preference.isVisible()).isFalse();
-    }
-
-    @Test
-    public void testVisible_alwaysVisibleWhenEnabled() {
-        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(true);
-        final boolean[] humanReadableName = {true};
-        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
-                .hasHumanReadableName();
-        BluetoothDevicePreference preference =
-                new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                        mDeviceListPreferenceFragment);
-        assertThat(preference.isVisible()).isTrue();
-        humanReadableName[0] = false;
-        preference.onDeviceAttributesChanged();
-        assertThat(preference.isVisible()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
deleted file mode 100644
index cde95cd5b169e3934cdc57c0cee26ef2113813fc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothDeviceRenamePreferenceControllerTest {
-
-    private static final String DEVICE_NAME = "Nightshade";
-
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-    @Mock
-    private PreferenceScreen mScreen;
-    private Context mContext;
-    private Preference mPreference;
-    private BluetoothDeviceRenamePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mPreference = new Preference(mContext);
-        mPreference.setKey(BluetoothDeviceRenamePreferenceController.PREF_KEY);
-
-        mController = new BluetoothDeviceRenamePreferenceController(
-                mContext, mFragment, mLocalAdapter);
-    }
-
-    @Test
-    public void testUpdateDeviceName_showSummaryWithDeviceName() {
-        mController.updateDeviceName(mPreference, DEVICE_NAME);
-
-        final CharSequence summary = mPreference.getSummary();
-
-        assertThat(summary.toString()).isEqualTo(DEVICE_NAME);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_startDialogFragment() {
-        when(mFragment.getFragmentManager().beginTransaction()).thenReturn(mFragmentTransaction);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        verify(mFragmentTransaction).add(any(), anyString());
-        verify(mFragmentTransaction).commit();
-    }
-
-    @Test
-    public void displayPreference_shouldFindPreferenceWithMatchingPrefKey() {
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mController.mPreference.getKey()).isEqualTo(mController.getPreferenceKey());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
deleted file mode 100644
index 8fa8f06a7effaf1206cf54fd38ec5050a67e2743..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.UserManager;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.View;
-import android.widget.Switch;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.MasterSwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
-        SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class
-})
-public class BluetoothEnablerTest {
-
-    private static final EnforcedAdmin FAKE_ENFORCED_ADMIN =
-            new EnforcedAdmin(new ComponentName("test.package", "test.Class"), 10);
-
-    @Mock
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-    @Mock
-    private RestrictionUtils mRestrictionUtils;
-    @Mock
-    private LocalBluetoothManager mBluetoothManager;
-    @Mock
-    private LocalBluetoothAdapter mBluetoothAdapter;
-
-    private Context mContext;
-    Switch mSwitch;
-    private MasterSwitchPreference mMasterSwitchPreference;
-    private MasterSwitchController mMasterSwitchController;
-    private BluetoothEnabler mBluetoothEnabler;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mBluetoothManager.getBluetoothAdapter()).thenReturn(mBluetoothAdapter);
-
-        mSwitch = new Switch(mContext);
-        mMasterSwitchPreference = new MasterSwitchPreference(mContext);
-        mMasterSwitchController = spy(new MasterSwitchController(mMasterSwitchPreference));
-        mBluetoothEnabler = new BluetoothEnabler(
-                mContext,
-                mMasterSwitchController,
-                mMetricsFeatureProvider,
-                mBluetoothManager,
-                123,
-                mRestrictionUtils);
-        PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(mock(View.class));
-        when(holder.findViewById(R.id.switchWidget)).thenReturn(mSwitch);
-        mMasterSwitchPreference.onBindViewHolder(holder);
-    }
-
-    @Test
-    public void onSwitchToggled_shouldLogActionWithSuppliedEvent() {
-        // WHEN the switch is toggled...
-        mBluetoothEnabler.onSwitchToggled(false);
-
-        // THEN the corresponding metrics action is logged.
-        verify(mMetricsFeatureProvider).action(mContext, 123, false);
-    }
-
-    @Test
-    public void maybeEnforceRestrictions_noRestrictions() {
-        // GIVEN there are no restrictions set...
-        when(mRestrictionUtils.checkIfRestrictionEnforced(any(Context.class), any(String.class)))
-                .thenReturn(null);
-
-        // WHEN the maybeEnforceRestrictions is called...
-        // THEN false is returned to indicate there was no restriction to enforce
-        assertThat(mBluetoothEnabler.maybeEnforceRestrictions()).isFalse();
-
-        // THEN a null EnfoceAdmin is set.
-        verify(mMasterSwitchController).setDisabledByAdmin(null);
-        // THEN the state of the switch isn't changed.
-        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
-    }
-
-    @Test
-    public void maybeEnforceRestrictions_disallowBluetoothRestrictionSet() {
-        // GIVEN Bluetooth has been disallowed...
-        when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(FAKE_ENFORCED_ADMIN);
-        when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(null);
-
-        // WHEN the maybeEnforceRestrictions is called...
-        // THEN true is returned to indicate there was a restriction to enforce.
-        assertThat(mBluetoothEnabler.maybeEnforceRestrictions()).isTrue();
-
-        // THEN the expected EnfoceAdmin is set.
-        verify(mMasterSwitchController).setDisabledByAdmin(FAKE_ENFORCED_ADMIN);
-
-        // THEN the switch is unchecked.
-        verify(mMasterSwitchController).setChecked(false);
-    }
-
-    @Test
-    public void maybeEnforceRestrictions_disallowConfigBluetoothRestrictionSet() {
-        // GIVEN configuring Bluetooth has been disallowed...
-        when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(null);
-        when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(FAKE_ENFORCED_ADMIN);
-
-        // WHEN the maybeEnforceRestrictions is called...
-        // THEN true is returned to indicate there was a restriction to enforce.
-        assertThat(mBluetoothEnabler.maybeEnforceRestrictions()).isTrue();
-
-        // THEN the expected EnfoceAdmin is set.
-        verify(mMasterSwitchController).setDisabledByAdmin(FAKE_ENFORCED_ADMIN);
-
-        // THEN the switch is unchecked.
-        verify(mMasterSwitchController).setChecked(false);
-    }
-
-    @Test
-    public void maybeEnforceRestrictions_disallowBluetoothNotOverriden() {
-        // GIVEN Bluetooth has been disallowed...
-        when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(FAKE_ENFORCED_ADMIN);
-        when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(null);
-
-        mBluetoothEnabler.resume(mContext);
-
-        verify(mMasterSwitchController, never()).setEnabled(true);
-    }
-
-    @Test
-    public void startWithBluetoothOff_switchIsOff() {
-        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_OFF);
-        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
-        mBluetoothEnabler.resume(mContext);
-        verify(mMasterSwitchController, never()).setChecked(true);
-    }
-
-    @Test
-    public void startWithBluetoothOn_switchIsOn() {
-        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);
-        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
-        mBluetoothEnabler.resume(mContext);
-        verify(mMasterSwitchController, never()).setChecked(false);
-        verify(mMasterSwitchController).setChecked(true);
-    }
-
-    @Test
-    public void bluetoothTurnsOff_switchTurnsOff() {
-        // Start up with bluetooth turned on. The switch should get turned on.
-        assertThat(mSwitch.isChecked()).isFalse();
-        ArgumentCaptor<BroadcastReceiver> captor = ArgumentCaptor.forClass(BroadcastReceiver.class);
-        when(mContext.registerReceiver(captor.capture(), any(IntentFilter.class))).thenReturn(null);
-        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);
-        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
-        mBluetoothEnabler.resume(mContext);
-        verify(mMasterSwitchController, never()).setChecked(false);
-        verify(mMasterSwitchController).setChecked(true);
-
-        // Now simulate bluetooth being turned off via an event.
-        BroadcastReceiver receiver = captor.getValue();
-        Intent turningOff = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
-        turningOff.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_TURNING_OFF);
-        receiver.onReceive(mContext, turningOff);
-        Intent off = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
-        off.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
-        receiver.onReceive(mContext, off);
-
-        // Make sure the switch was turned off.
-        verify(mMasterSwitchController).setChecked(false);
-        assertThat(mSwitch.isChecked()).isFalse();
-    }
-
-    @Test
-    public void bluetoothTurnsOn_switchTurnsOn() {
-        // Start up with bluetooth turned on. The switch should be left off.
-        assertThat(mSwitch.isChecked()).isFalse();
-        ArgumentCaptor<BroadcastReceiver> captor = ArgumentCaptor.forClass(BroadcastReceiver.class);
-        when(mContext.registerReceiver(captor.capture(), any(IntentFilter.class))).thenReturn(null);
-        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_OFF);
-        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
-        mBluetoothEnabler.resume(mContext);
-        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
-
-        // Now simulate bluetooth being turned on via an event.
-        BroadcastReceiver receiver = captor.getValue();
-        Intent turningOn = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
-        turningOn.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_TURNING_ON);
-        receiver.onReceive(mContext, turningOn);
-        Intent on = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
-        on.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_ON);
-        receiver.onReceive(mContext, on);
-
-        // Make sure the switch was turned on.
-        verify(mMasterSwitchController).setChecked(true);
-        assertThat(mSwitch.isChecked()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
deleted file mode 100644
index 7713aaf8fb1cf05fe5f632920225c22e3c3ab3c3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothFilesPreferenceControllerTest {
-    private Context mContext;
-    private BluetoothFilesPreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mController = new BluetoothFilesPreferenceController(mContext);
-        mPreference = new Preference(mContext);
-        mPreference.setKey(BluetoothFilesPreferenceController.KEY_RECEIVED_FILES);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_sendBroadcast() {
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
-        assertThat(intent).isNotNull();
-        assertThat(intent.getAction()).isEqualTo(
-                BluetoothFilesPreferenceController.ACTION_OPEN_FILES);
-
-        final Bundle bundle = intent.getExtras();
-        assertThat(bundle.getInt(BluetoothFilesPreferenceController.EXTRA_DIRECTION)).isEqualTo(1);
-        assertThat(bundle.getBoolean(
-                BluetoothFilesPreferenceController.EXTRA_SHOW_ALL_FILES)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
deleted file mode 100644
index 9634661c9befb8d97ece27cc0042d6744c1ba20d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
-import com.android.settingslib.bluetooth.BluetoothCallback;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothMasterSwitchPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LocalBluetoothManager mBluetoothManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private MasterSwitchPreference mPreference;
-    @Mock
-    private RestrictionUtils mRestrictionUtils;
-    @Mock
-    private Fragment mFragment;
-    @Mock
-    private SettingsActivity mActivity;
-
-    private Context mContext;
-    private BluetoothMasterSwitchPreferenceController mController;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        mController = new BluetoothMasterSwitchPreferenceController(
-                mContext, mBluetoothManager, mRestrictionUtils, mFragment, mActivity);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void onResume_shouldRegisterCallback() {
-        mController.onResume();
-
-        verify(mBluetoothManager.getEventManager()).registerCallback(any(BluetoothCallback.class));
-    }
-
-    @Test
-    public void onPause_shouldUnregisterCallback() {
-        mController.onPause();
-
-        verify(mBluetoothManager.getEventManager()).unregisterCallback(
-                any(BluetoothCallback.class));
-    }
-
-    @Test
-    public void onStart_shouldRegisterPreferenceChangeListener() {
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        verify(mPreference).setOnPreferenceChangeListener(any(OnPreferenceChangeListener.class));
-    }
-
-    @Test
-    public void onStop_shouldRegisterPreferenceChangeListener() {
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        mController.onStop();
-
-        verify(mPreference).setOnPreferenceChangeListener(null);
-    }
-
-    @Test
-    public void onSummaryUpdated_shouldUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-
-        mController.onSummaryChanged("test summary");
-
-        verify(mPreference).setSummary("test summary");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
deleted file mode 100644
index d1d493544030058e2a5ca760763f06218e1132b3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.UserManager;
-import android.support.v7.preference.PreferenceGroup;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.widget.FooterPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothPairingDetailTest {
-
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Resources mResource;
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LocalBluetoothManager mLocalManager;
-    @Mock
-    private PreferenceGroup mPreferenceGroup;
-    private BluetoothPairingDetail mFragment;
-    private Context mContext;
-    private BluetoothProgressCategory mAvailableDevicesCategory;
-    private FooterPreference mFooterPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mFragment = spy(new BluetoothPairingDetail());
-        doReturn(mContext).when(mFragment).getContext();
-        doReturn(mResource).when(mFragment).getResources();
-
-        mAvailableDevicesCategory = spy(new BluetoothProgressCategory(mContext));
-        mFooterPreference = new FooterPreference(mContext);
-
-        mFragment.mLocalAdapter = mLocalAdapter;
-        mFragment.mLocalManager = mLocalManager;
-        mFragment.mDeviceListGroup = mPreferenceGroup;
-        mFragment.mAlwaysDiscoverable = new AlwaysDiscoverable(mContext, mLocalAdapter);
-    }
-
-    @Test
-    public void testInitPreferencesFromPreferenceScreen_findPreferences() {
-        doReturn(mAvailableDevicesCategory).when(mFragment).findPreference(
-                BluetoothPairingDetail.KEY_AVAIL_DEVICES);
-        doReturn(mFooterPreference).when(mFragment).findPreference(
-                BluetoothPairingDetail.KEY_FOOTER_PREF);
-
-        mFragment.initPreferencesFromPreferenceScreen();
-
-        assertThat(mFragment.mAvailableDevicesCategory).isEqualTo(mAvailableDevicesCategory);
-        assertThat(mFragment.mFooterPreference).isEqualTo(mFooterPreference);
-    }
-
-    @Test
-    public void testStartScanning_startScanAndRemoveDevices() {
-        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
-        mFragment.mDeviceListGroup = mAvailableDevicesCategory;
-
-        mFragment.enableScanning();
-
-        verify(mLocalAdapter).startScanning(true);
-        verify(mAvailableDevicesCategory).removeAll();
-    }
-
-    @Test
-    public void testUpdateContent_stateOn_addDevices() {
-        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
-        mFragment.mFooterPreference = mFooterPreference;
-        doNothing().when(mFragment).addDeviceCategory(any(), anyInt(), any(), anyBoolean());
-
-        mFragment.updateContent(BluetoothAdapter.STATE_ON);
-
-        verify(mFragment).addDeviceCategory(mAvailableDevicesCategory,
-                R.string.bluetooth_preference_found_devices,
-                BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, false);
-        verify(mLocalAdapter).setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-    }
-
-    @Test
-    public void testUpdateContent_stateOff_finish() {
-        mFragment.updateContent(BluetoothAdapter.STATE_OFF);
-
-        verify(mFragment).finish();
-    }
-
-    @Test
-    public void testOnScanningStateChanged_restartScanAfterInitialScanning() {
-        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
-        mFragment.mFooterPreference = mFooterPreference;
-        mFragment.mDeviceListGroup = mAvailableDevicesCategory;
-        doNothing().when(mFragment).addDeviceCategory(any(), anyInt(), any(), anyBoolean());
-
-        // Initial Bluetooth ON will trigger scan enable, list clear and scan start
-        mFragment.updateContent(BluetoothAdapter.STATE_ON);
-        verify(mFragment).enableScanning();
-        assertThat(mAvailableDevicesCategory.getPreferenceCount()).isEqualTo(0);
-        verify(mLocalAdapter).startScanning(true);
-
-        // Subsequent scan started event will not trigger start/stop nor list clear
-        mFragment.onScanningStateChanged(true);
-        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
-        verify(mAvailableDevicesCategory, times(1)).setProgress(true);
-
-        // Subsequent scan finished event will trigger scan start without list clean
-        mFragment.onScanningStateChanged(false);
-        verify(mLocalAdapter, times(2)).startScanning(true);
-        verify(mAvailableDevicesCategory, times(2)).setProgress(true);
-
-        // Subsequent scan started event will not trigger any change
-        mFragment.onScanningStateChanged(true);
-        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
-        verify(mAvailableDevicesCategory, times(3)).setProgress(true);
-        verify(mLocalAdapter, never()).stopScanning();
-
-        // Disable scanning will trigger scan stop
-        mFragment.disableScanning();
-        verify(mLocalAdapter, times(1)).stopScanning();
-
-        // Subsequent scan start event will not trigger any change besides progress circle
-        mFragment.onScanningStateChanged(true);
-        verify(mAvailableDevicesCategory, times(4)).setProgress(true);
-
-        // However, subsequent scan finished event won't trigger new scan start and will stop
-        // progress circle from spinning
-        mFragment.onScanningStateChanged(false);
-        verify(mAvailableDevicesCategory, times(1)).setProgress(false);
-        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
-        verify(mLocalAdapter, times(1)).stopScanning();
-
-        // Verify that clean up only happen once at initialization
-        verify(mAvailableDevicesCategory, times(1)).removeAll();
-    }
-
-
-
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
deleted file mode 100644
index 80b481062557602a15f9eed133d1677778a740b3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.FragmentTestUtil;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows=ShadowEventLogWriter.class)
-public class BluetoothPairingDialogTest {
-
-    private static final String FILLER = "text that goes in a view";
-    private static final String FAKE_DEVICE_NAME = "Fake Bluetooth Device";
-
-    @Mock
-    private BluetoothPairingController controller;
-
-    @Mock
-    private BluetoothPairingDialog dialogActivity;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        doNothing().when(dialogActivity).dismiss();
-    }
-
-    @Test
-    public void dialogUpdatesControllerWithUserInput() {
-        // set the correct dialog type
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-
-        // we don't care about these for this test
-        when(controller.getDeviceVariantMessageId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-        when(controller.getDeviceVariantMessageHintId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        // build fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // test that controller is updated on text change
-        frag.afterTextChanged(new SpannableStringBuilder(FILLER));
-        verify(controller, times(1)).updateUserInput(any());
-    }
-
-    @Test
-    public void dialogEnablesSubmitButtonOnValidationFromController() {
-        // set the correct dialog type
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-
-        // we don't care about these for this test
-        when(controller.getDeviceVariantMessageId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-        when(controller.getDeviceVariantMessageHintId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        // force the controller to say that any passkey is valid
-        when(controller.isPasskeyValid(any())).thenReturn(true);
-
-        // build fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // test that the positive button is enabled when passkey is valid
-        frag.afterTextChanged(new SpannableStringBuilder(FILLER));
-        View button = frag.getmDialog().getButton(AlertDialog.BUTTON_POSITIVE);
-        assertThat(button).isNotNull();
-        assertThat(button.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void dialogDoesNotAskForPairCodeOnConsentVariant() {
-        // set the dialog variant to confirmation/consent
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // check that the input field used by the entry dialog fragment does not exist
-        View view = frag.getmDialog().findViewById(R.id.text);
-        assertThat(view).isNull();
-    }
-
-    @Test
-    public void dialogAsksForPairCodeOnUserEntryVariant() {
-        // set the dialog variant to user entry
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-
-        // we don't care about these for this test
-        when(controller.getDeviceVariantMessageId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-        when(controller.getDeviceVariantMessageHintId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        Context context = spy(ShadowApplication.getInstance().getApplicationContext());
-        InputMethodManager imm = mock(InputMethodManager.class);
-        doReturn(imm).when(context).getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = spy(new BluetoothPairingDialogFragment());
-        when(frag.getContext()).thenReturn(context);
-        setupFragment(frag);
-        AlertDialog alertDialog = frag.getmDialog();
-
-        // check that the pin/passkey input field is visible to the user
-        View view = alertDialog.findViewById(R.id.text);
-        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
-
-        // check that showSoftInput was called to make input method appear when the dialog was shown
-        assertThat(view.isFocused()).isTrue();
-        assertThat(imm.isActive());
-        verify(imm).showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-    }
-
-    @Test
-    public void dialogDisplaysPairCodeOnDisplayPasskeyVariant() {
-        // set the dialog variant to display passkey
-        when(controller.getDialogType())
-                .thenReturn(BluetoothPairingController.DISPLAY_PASSKEY_DIALOG);
-
-        // ensure that the controller returns good values to indicate a passkey needs to be shown
-        when(controller.isDisplayPairingKeyVariant()).thenReturn(true);
-        when(controller.hasPairingContent()).thenReturn(true);
-        when(controller.getPairingContent()).thenReturn(FILLER);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // get the relevant views
-        View messagePairing = frag.getmDialog().findViewById(R.id.pairing_code_message);
-        TextView pairingViewContent =
-                (TextView) frag.getmDialog().findViewById(R.id.pairing_subhead);
-        View pairingViewCaption = frag.getmDialog().findViewById(R.id.pairing_caption);
-
-        // check that the relevant views are visible and that the passkey is shown
-        assertThat(messagePairing.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(pairingViewCaption.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(pairingViewContent.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(TextUtils.equals(FILLER, pairingViewContent.getText())).isTrue();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void dialogThrowsExceptionIfNoControllerSet() {
-        // instantiate a fragment
-        BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
-
-        // this should throw an error
-        FragmentTestUtil.startFragment(frag);
-        fail("Starting the fragment with no controller set should have thrown an exception.");
-    }
-
-    @Test
-    public void dialogCallsHookOnPositiveButtonPress() {
-        // set the dialog variant to confirmation/consent
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
-
-        // we don't care what this does, just that it is called
-        doNothing().when(controller).onDialogPositiveClick(any());
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // click the button and verify that the controller hook was called
-        frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_POSITIVE);
-        verify(controller, times(1)).onDialogPositiveClick(any());
-    }
-
-    @Test
-    public void dialogCallsHookOnNegativeButtonPress() {
-        // set the dialog variant to confirmation/consent
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
-
-        // we don't care what this does, just that it is called
-        doNothing().when(controller).onDialogNegativeClick(any());
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // click the button and verify that the controller hook was called
-        frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_NEGATIVE);
-        verify(controller, times(1)).onDialogNegativeClick(any());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void dialogDoesNotAllowSwappingController() {
-        // instantiate a fragment
-        BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
-        frag.setPairingController(controller);
-
-        // this should throw an error
-        frag.setPairingController(controller);
-        fail("Setting the controller multiple times should throw an exception.");
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void dialogDoesNotAllowSwappingActivity() {
-        // instantiate a fragment
-        BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
-        frag.setPairingDialogActivity(dialogActivity);
-
-        // this should throw an error
-        frag.setPairingDialogActivity(dialogActivity);
-        fail("Setting the dialog activity multiple times should throw an exception.");
-    }
-
-    @Test
-    public void dialogPositiveButtonDisabledWhenUserInputInvalid() {
-        // set the correct dialog type
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-
-        // we don't care about these for this test
-        when(controller.getDeviceVariantMessageId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-        when(controller.getDeviceVariantMessageHintId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        // force the controller to say that any passkey is valid
-        when(controller.isPasskeyValid(any())).thenReturn(false);
-
-        // build fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // test that the positive button is enabled when passkey is valid
-        frag.afterTextChanged(new SpannableStringBuilder(FILLER));
-        View button = frag.getmDialog().getButton(AlertDialog.BUTTON_POSITIVE);
-        assertThat(button).isNotNull();
-        assertThat(button.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void dialogShowsContactSharingCheckboxWhenBluetoothProfileNotReady() {
-        // set the dialog variant to confirmation/consent
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
-
-        // set a fake device name and pretend the profile has not been set up for it
-        when(controller.getDeviceName()).thenReturn(FAKE_DEVICE_NAME);
-        when(controller.isProfileReady()).thenReturn(false);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // verify that the checkbox is visible and that the device name is correct
-        CheckBox sharingCheckbox = (CheckBox) frag.getmDialog()
-                .findViewById(R.id.phonebook_sharing_message_confirm_pin);
-        assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void dialogHidesContactSharingCheckboxWhenBluetoothProfileIsReady() {
-        // set the dialog variant to confirmation/consent
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
-
-        // set a fake device name and pretend the profile has been set up for it
-        when(controller.getDeviceName()).thenReturn(FAKE_DEVICE_NAME);
-        when(controller.isProfileReady()).thenReturn(true);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // verify that the checkbox is gone
-        CheckBox sharingCheckbox = (CheckBox) frag.getmDialog()
-                .findViewById(R.id.phonebook_sharing_message_confirm_pin);
-        assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void dialogShowsMessageOnPinEntryView() {
-        // set the correct dialog type
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-
-        // Set the message id to something specific to verify later
-        when(controller.getDeviceVariantMessageId()).thenReturn(R.string.cancel);
-        when(controller.getDeviceVariantMessageHintId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // verify message is what we expect it to be and is visible
-        TextView message = (TextView) frag.getmDialog().findViewById(R.id.message_below_pin);
-        assertThat(message.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(TextUtils.equals(frag.getString(R.string.cancel), message.getText())).isTrue();
-    }
-
-    @Test
-    public void dialogShowsMessageHintOnPinEntryView() {
-        // set the correct dialog type
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-
-        // Set the message id hint to something specific to verify later
-        when(controller.getDeviceVariantMessageHintId()).thenReturn(R.string.cancel);
-        when(controller.getDeviceVariantMessageId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // verify message is what we expect it to be and is visible
-        TextView hint = (TextView) frag.getmDialog().findViewById(R.id.pin_values_hint);
-        assertThat(hint.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(TextUtils.equals(frag.getString(R.string.cancel), hint.getText())).isTrue();
-    }
-
-    @Test
-    public void dialogHidesMessageAndHintWhenNotProvidedOnPinEntryView() {
-        // set the correct dialog type
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-
-        // Set the id's to what is returned when it is not provided
-        when(controller.getDeviceVariantMessageHintId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-        when(controller.getDeviceVariantMessageId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // verify message is what we expect it to be and is visible
-        TextView hint = (TextView) frag.getmDialog().findViewById(R.id.pin_values_hint);
-        assertThat(hint.getVisibility()).isEqualTo(View.GONE);
-        TextView message = (TextView) frag.getmDialog().findViewById(R.id.message_below_pin);
-        assertThat(message.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void pairingStringIsFormattedCorrectly() {
-        final String device = "test_device";
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        assertThat(context.getString(R.string.bluetooth_pb_acceptance_dialog_text, device, device))
-                .contains(device);
-    }
-
-    @Test
-    public void pairingDialogDismissedOnPositiveClick() {
-        // set the dialog variant to confirmation/consent
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
-
-        // we don't care what this does, just that it is called
-        doNothing().when(controller).onDialogPositiveClick(any());
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // click the button and verify that the controller hook was called
-        frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_POSITIVE);
-
-        verify(controller, times(1)).onDialogPositiveClick(any());
-        verify(dialogActivity, times(1)).dismiss();
-    }
-
-    @Test
-    public void pairingDialogDismissedOnNegativeClick() {
-        // set the dialog variant to confirmation/consent
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
-
-        // we don't care what this does, just that it is called
-        doNothing().when(controller).onDialogNegativeClick(any());
-
-        // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
-
-        // click the button and verify that the controller hook was called
-        frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_NEGATIVE);
-
-        verify(controller, times(1)).onDialogNegativeClick(any());
-        verify(dialogActivity, times(1)).dismiss();
-    }
-
-    @Test
-    public void rotateDialog_nullPinText_okButtonEnabled() {
-        userEntryDialogExistingTextTest(null);
-    }
-
-    @Test
-    public void rotateDialog_emptyPinText_okButtonEnabled() {
-        userEntryDialogExistingTextTest("");
-    }
-
-    @Test
-    public void rotateDialog_nonEmptyPinText_okButtonEnabled() {
-        userEntryDialogExistingTextTest("test");
-    }
-
-    // Runs a test simulating the user entry dialog type in a situation like device rotation, where
-    // the dialog fragment gets created and we already have some existing text entered into the
-    // pin field.
-    private void userEntryDialogExistingTextTest(CharSequence existingText) {
-        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
-        when(controller.getDeviceVariantMessageHintId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-        when(controller.getDeviceVariantMessageId())
-                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
-
-        BluetoothPairingDialogFragment fragment = spy(new BluetoothPairingDialogFragment());
-        when(fragment.getPairingViewText()).thenReturn(existingText);
-        setupFragment(fragment);
-        AlertDialog dialog = ShadowAlertDialog.getLatestAlertDialog();
-        boolean expected = !TextUtils.isEmpty(existingText);
-        assertThat(dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled()).isEqualTo(expected);
-    }
-
-    private void setupFragment(BluetoothPairingDialogFragment frag) {
-        assertThat(frag.isPairingControllerSet()).isFalse();
-        frag.setPairingController(controller);
-        assertThat(frag.isPairingDialogActivitySet()).isFalse();
-        frag.setPairingDialogActivity(dialogActivity);
-        FragmentTestUtil.startFragment(frag);
-        assertThat(frag.getmDialog()).isNotNull();
-        assertThat(frag.isPairingControllerSet()).isTrue();
-        assertThat(frag.isPairingDialogActivitySet()).isTrue();
-    }
-
-    private BluetoothPairingDialogFragment makeFragment() {
-        BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
-        setupFragment(frag);
-        return frag;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
deleted file mode 100644
index 4459f6197e489b7eb3678ed0cd6a9f6d729f9e7f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.R;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothPairingPreferenceControllerTest {
-    private static final int ORDER = 1;
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceFragment mFragment;
-    @Mock
-    private Lifecycle mLifecycle;
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private SettingsActivity mSettingsActivity;
-    private Preference mPreference;
-
-    private BluetoothPairingPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        when(mFragment.getPreferenceScreen().getContext()).thenReturn(mContext);
-
-        mPreference = new Preference(mContext);
-        mPreference.setKey(BluetoothPairingPreferenceController.KEY_PAIRING);
-
-        mController = new BluetoothPairingPreferenceController(mContext, mFragment,
-                mSettingsActivity);
-    }
-
-    @Test
-    public void testCreateBluetoothPairingPreference() {
-        Preference pref = mController.createBluetoothPairingPreference(ORDER);
-
-        assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING);
-        assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_add));
-        assertThat(pref.getOrder()).isEqualTo(ORDER);
-        assertThat(pref.getTitle()).isEqualTo(
-                mContext.getString(R.string.bluetooth_pairing_pref_title));
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_startFragment() {
-        mController.handlePreferenceTreeClick(mPreference);
-
-        verify(mSettingsActivity).startPreferencePanelAsUser(eq(mFragment), anyString(), any(),
-                anyInt(), any(), any());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
deleted file mode 100644
index 0061ee52ea1ca577be9a711be876ac5d9aae2293..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothSettingsSummaryProviderTest {
-
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LocalBluetoothManager mBluetoothManager;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-
-    private BluetoothSettings.SummaryProvider mSummaryProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application.getApplicationContext();
-        mSummaryProvider = new BluetoothSettings.SummaryProvider(mContext, mSummaryLoader,
-                mBluetoothManager);
-    }
-
-    @Test
-    public void setListening_shouldRegister() {
-        mSummaryProvider.setListening(true);
-
-        verify(mBluetoothManager.getEventManager()).registerCallback(
-            mSummaryProvider.mSummaryUpdater);
-    }
-
-    @Test
-    public void setNotListening_shouldUnregister() {
-        mSummaryProvider.setListening(false);
-
-        verify(mBluetoothManager.getEventManager()).unregisterCallback(
-            mSummaryProvider.mSummaryUpdater);
-    }
-
-    @Test
-    public void onSummaryChanged_shouldSetSummary() {
-        final String summary = "Bluetooth summary";
-        mSummaryProvider.onSummaryChanged(summary);
-
-        verify(mSummaryLoader).setSummary(mSummaryProvider, summary);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
deleted file mode 100644
index c772560d717499d9621041b6457e16b1c83cd736..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.widget.FooterPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothSettingsTest {
-    private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
-
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Resources mResource;
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private PreferenceGroup mPairedDevicesCategory;
-    @Mock
-    private BluetoothPairingPreferenceController mPairingPreferenceController;
-    private Context mContext;
-    private BluetoothSettings mFragment;
-    private FakeFeatureFactory mFeatureFactory;
-    private Preference mFooterPreference;
-    private TextView mEmptyMessage;
-    private View mContainer;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        mFragment = spy(new BluetoothSettings());
-
-        doReturn(mContext).when(mFragment).getContext();
-        doReturn(mResource).when(mFragment).getResources();
-        doReturn(mActivity).when(mFragment).getActivity();
-
-        mContainer = new View(mContext);
-        mEmptyMessage = new TextView(mContext);
-        doReturn(mContainer).when(mActivity).findViewById(android.R.id.list_container);
-        doReturn(mEmptyMessage).when(mActivity).findViewById(android.R.id.empty);
-
-        mFooterPreference = new FooterPreference(RuntimeEnvironment.application);
-        mFragment.setLocalBluetoothAdapter(mLocalAdapter);
-        mFragment.mPairingPrefController = mPairingPreferenceController;
-    }
-
-    @Test
-    public void setTextSpan_notSpannable_shouldNotCrash() {
-        final String str = "test";
-        mFragment.setTextSpan(str, "hello");
-    }
-
-    @Test
-    public void setUpdateMyDevicePreference_setTitleCorrectly() {
-        doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
-                eq(R.string.bluetooth_footer_mac_message), any());
-
-        mFragment.updateFooterPreference(mFooterPreference);
-
-        assertThat(mFooterPreference.getTitle()).isEqualTo(FOOTAGE_MAC_STRING);
-    }
-
-    @Test
-    public void testDisplayEmptyMessage_showEmptyMessage() {
-        mFragment.displayEmptyMessage(true);
-
-        assertThat(mContainer.getVisibility()).isEqualTo(View.INVISIBLE);
-        assertThat(mEmptyMessage.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void testDisplayEmptyMessage_hideEmptyMessage() {
-        mFragment.displayEmptyMessage(false);
-
-        assertThat(mContainer.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mEmptyMessage.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testInitPreferencesFromPreferenceScreen() {
-        doReturn(mPairedDevicesCategory).when(mFragment).findPreference(
-                BluetoothSettings.KEY_PAIRED_DEVICES);
-        doReturn(mFooterPreference).when(mFragment).findPreference(
-                BluetoothSettings.KEY_FOOTER_PREF);
-
-        mFragment.initPreferencesFromPreferenceScreen();
-
-        assertThat(mFragment.mPairedDevicesCategory).isEqualTo(mPairedDevicesCategory);
-        assertThat(mFragment.mFooterPreference).isEqualTo(mFooterPreference);
-    }
-
-    @Test
-    public void testSearchIndexProvider_pairPageEnabled_keyNotAdded() {
-        doReturn(true).when(mFeatureFactory.bluetoothFeatureProvider).isPairingPageEnabled();
-
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).doesNotContain(BluetoothSettings.DATA_KEY_REFERENCE);
-    }
-
-    @Test
-    public void testSearchIndexProvider_pairPageDisabled_keyAdded() {
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).contains(BluetoothSettings.DATA_KEY_REFERENCE);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
deleted file mode 100644
index 0c27412c55133a3975a1300c4566e75e05048478..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.Context;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothSummaryUpdaterTest {
-    private static final String DEVICE_NAME = "Nightshade";
-    private static final String DEVICE_KEYBOARD_NAME = "Bluetooth Keyboard";
-
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LocalBluetoothManager mBluetoothManager;
-    @Mock
-    private LocalBluetoothAdapter mBtAdapter;
-    @Mock
-    private BluetoothDevice mConnectedDevice;
-    @Mock
-    private BluetoothDevice mConnectedKeyBoardDevice;
-    @Mock
-    private SummaryListener mListener;
-
-    // Disabled by default
-    private final boolean[] mAdapterEnabled = {false};
-    // Not connected by default
-    private final int[] mAdapterConnectionState = {BluetoothAdapter.STATE_DISCONNECTED};
-    // Not connected by default
-    private final boolean[] mDeviceConnected = {false, false};
-    private final Set<BluetoothDevice> mBondedDevices = new HashSet<>();
-    private BluetoothSummaryUpdater mSummaryUpdater;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application.getApplicationContext();
-        doCallRealMethod().when(mListener).onSummaryChanged(anyString());
-        // Setup mock adapter
-        when(mBluetoothManager.getBluetoothAdapter()).thenReturn(mBtAdapter);
-        doAnswer(invocation -> mAdapterEnabled[0]).when(mBtAdapter).isEnabled();
-        doAnswer(invocation -> mAdapterConnectionState[0]).when(mBtAdapter).getConnectionState();
-        mSummaryUpdater = new BluetoothSummaryUpdater(mContext, mListener, mBluetoothManager);
-        // Setup first device
-        doReturn(DEVICE_NAME).when(mConnectedDevice).getName();
-        doAnswer(invocation -> mDeviceConnected[0]).when(mConnectedDevice).isConnected();
-        // Setup second device
-        doReturn(DEVICE_KEYBOARD_NAME).when(mConnectedKeyBoardDevice).getName();
-        doAnswer(invocation -> mDeviceConnected[1]).when(mConnectedKeyBoardDevice)
-                .isConnected();
-        doReturn(mBondedDevices).when(mBtAdapter).getBondedDevices();
-    }
-
-    @Test
-    public void register_true_shouldRegisterListener() {
-        mSummaryUpdater.register(true);
-
-        verify(mBluetoothManager.getEventManager()).registerCallback(mSummaryUpdater);
-    }
-
-    @Test
-    public void register_false_shouldUnregisterListener() {
-        mSummaryUpdater.register(false);
-
-        verify(mBluetoothManager.getEventManager()).unregisterCallback(mSummaryUpdater);
-    }
-
-    @Test
-    public void register_true_shouldSendSummaryChange() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        mDeviceConnected[0] = true;
-
-        mSummaryUpdater.register(true);
-
-        verify(mListener).onSummaryChanged(
-                mContext.getString(R.string.bluetooth_connected_summary, DEVICE_NAME));
-    }
-
-    @Test
-    public void onBluetoothStateChanged_btDisabled_shouldSendDisabledSummary() {
-        // These states should be ignored
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        mDeviceConnected[0] = true;
-
-        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
-
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disabled));
-    }
-
-    @Test
-    public void onBluetoothStateChanged_btEnabled_connected_shouldSendConnectedSummary() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        mDeviceConnected[0] = true;
-
-        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
-
-        verify(mListener).onSummaryChanged(
-                mContext.getString(R.string.bluetooth_connected_summary, DEVICE_NAME));
-    }
-
-    @Test
-    public void onBluetoothStateChanged_btEnabled_connectedMisMatch_shouldSendNotConnected() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        // State mismatch
-        mDeviceConnected[0] = false;
-
-        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
-
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
-    }
-
-    @Test
-    public void onBluetoothStateChanged_btEnabled_notConnected_shouldSendDisconnectedMessage() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        // This should be ignored
-        mDeviceConnected[0] = true;
-
-        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_TURNING_ON);
-
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
-    }
-
-    @Test
-    public void onBluetoothStateChanged_ConnectedDisabledEnabled_shouldSendDisconnectedSummary() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        mDeviceConnected[0] = false;
-
-        mSummaryUpdater.register(true);
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
-
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
-        mDeviceConnected[0] = true;
-        mSummaryUpdater.onConnectionStateChanged(null /* device */,
-                BluetoothAdapter.STATE_CONNECTED);
-        verify(mListener).onSummaryChanged(
-                mContext.getString(R.string.bluetooth_connected_summary, DEVICE_NAME));
-
-        mAdapterEnabled[0] = false;
-        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disabled));
-
-        // Turning ON means not enabled
-        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_TURNING_ON);
-        // There should still be only one invocation of disabled message
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disabled));
-
-        mAdapterEnabled[0] = true;
-        mDeviceConnected[0] = false;
-        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
-        verify(mListener, times(2)).onSummaryChanged(mContext.getString(R.string.disconnected));
-        verify(mListener, times(4)).onSummaryChanged(anyString());
-    }
-
-    @Test
-    public void onConnectionStateChanged_connected_shouldSendConnectedMessage() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        mDeviceConnected[0] = true;
-
-        mSummaryUpdater.onConnectionStateChanged(null /* device */,
-                BluetoothAdapter.STATE_CONNECTED);
-
-        verify(mListener).onSummaryChanged(
-                mContext.getString(R.string.bluetooth_connected_summary, DEVICE_NAME));
-    }
-
-    @Test
-    public void onConnectionStateChanged_inconsistentState_shouldSendDisconnectedMessage() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTED;
-        mBondedDevices.add(mConnectedDevice);
-        mDeviceConnected[0] = false;
-
-        mSummaryUpdater.onConnectionStateChanged(null /* device */,
-                BluetoothAdapter.STATE_CONNECTED);
-
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
-    }
-
-    @Test
-    public void onConnectionStateChanged_noBondedDevice_shouldSendDisconnectedMessage() {
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
-
-        mSummaryUpdater.onConnectionStateChanged(null /* device */,
-                BluetoothAdapter.STATE_CONNECTED);
-
-        verify(mListener).onSummaryChanged(
-                mContext.getString(R.string.disconnected));
-    }
-
-    @Test
-    public void onConnectionStateChanged_connecting_shouldSendConnectingMessage() {
-        // No need for bonded devices
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTING;
-
-        mSummaryUpdater.onConnectionStateChanged(null /* device */,
-                BluetoothAdapter.STATE_CONNECTING);
-
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_connecting));
-    }
-
-    @Test
-    public void onConnectionStateChanged_disconnecting_shouldSendDisconnectingMessage() {
-        // No need for bonded devices
-        mAdapterEnabled[0] = true;
-        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTING;
-
-        mSummaryUpdater.onConnectionStateChanged(null /* device */,
-                BluetoothAdapter.STATE_DISCONNECTING);
-
-        verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disconnecting));
-    }
-
-    @Test
-    public void getConnectedDeviceSummary_hasConnectedDevice_returnOneDeviceSummary() {
-        mBondedDevices.add(mConnectedDevice);
-        mDeviceConnected[0] = true;
-        final String expectedSummary = mContext.getString(R.string.bluetooth_connected_summary,
-                DEVICE_NAME);
-
-        assertThat(mSummaryUpdater.getConnectedDeviceSummary()).isEqualTo(expectedSummary);
-    }
-
-    @Test
-    public void getConnectedDeviceSummary_multipleDevices_returnMultipleDevicesSummary() {
-        mBondedDevices.add(mConnectedDevice);
-        mBondedDevices.add(mConnectedKeyBoardDevice);
-        mDeviceConnected[0] = true;
-        mDeviceConnected[1] = true;
-        final String expectedSummary = mContext.getString(
-                R.string.bluetooth_connected_multiple_devices_summary);
-
-        assertThat(mSummaryUpdater.getConnectedDeviceSummary()).isEqualTo(expectedSummary);
-    }
-
-    private class SummaryListener implements OnSummaryChangeListener {
-        String summary;
-
-        @Override
-        public void onSummaryChanged(String summary) {
-            this.summary = summary;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
deleted file mode 100644
index 49efecbc42c9f85dfbaa33559b343b4c17075c30..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DeviceListPreferenceFragmentTest {
-    private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
-
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Resources mResource;
-    @Mock
-    private Context mContext;
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-    private TestFragment mFragment;
-    private Preference mMyDevicePreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mFragment = spy(new TestFragment());
-        doReturn(mContext).when(mFragment).getContext();
-        doReturn(mResource).when(mFragment).getResources();
-        mFragment.mLocalAdapter = mLocalAdapter;
-
-        mMyDevicePreference = new Preference(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void setUpdateMyDevicePreference_setTitleCorrectly() {
-        doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
-                eq(R.string.bluetooth_footer_mac_message), any());
-
-        mFragment.updateFooterPreference(mMyDevicePreference);
-
-        assertThat(mMyDevicePreference.getTitle()).isEqualTo(FOOTAGE_MAC_STRING);
-    }
-
-    @Test
-    public void testEnableDisableScanning_testStateAfterEanbleDisable() {
-        mFragment.enableScanning();
-        verify(mLocalAdapter).startScanning(true);
-        assertThat(mFragment.mScanEnabled).isTrue();
-
-        mFragment.disableScanning();
-        verify(mLocalAdapter).stopScanning();
-        assertThat(mFragment.mScanEnabled).isFalse();
-    }
-
-    @Test
-    public void testScanningStateChanged_testScanStarted() {
-        mFragment.enableScanning();
-        assertThat(mFragment.mScanEnabled).isTrue();
-        verify(mLocalAdapter).startScanning(true);
-
-        mFragment.onScanningStateChanged(true);
-        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
-    }
-
-    @Test
-    public void testScanningStateChanged_testScanFinished() {
-        // Could happen when last scanning not done while current scan gets enabled
-        mFragment.enableScanning();
-        verify(mLocalAdapter).startScanning(true);
-        assertThat(mFragment.mScanEnabled).isTrue();
-
-        mFragment.onScanningStateChanged(false);
-        verify(mLocalAdapter, times(2)).startScanning(true);
-    }
-
-    @Test
-    public void testScanningStateChanged_testScanStateMultiple() {
-        // Could happen when last scanning not done while current scan gets enabled
-        mFragment.enableScanning();
-        assertThat(mFragment.mScanEnabled).isTrue();
-        verify(mLocalAdapter).startScanning(true);
-
-        mFragment.onScanningStateChanged(true);
-        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
-
-        mFragment.onScanningStateChanged(false);
-        verify(mLocalAdapter, times(2)).startScanning(true);
-
-        mFragment.onScanningStateChanged(true);
-        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
-
-        mFragment.disableScanning();
-        verify(mLocalAdapter).stopScanning();
-
-        mFragment.onScanningStateChanged(false);
-        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
-
-        mFragment.onScanningStateChanged(true);
-        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
-    }
-
-    @Test
-    public void testScanningStateChanged_testScanFinishedAfterDisable() {
-        mFragment.enableScanning();
-        verify(mLocalAdapter).startScanning(true);
-        assertThat(mFragment.mScanEnabled).isTrue();
-
-        mFragment.disableScanning();
-        verify(mLocalAdapter).stopScanning();
-        assertThat(mFragment.mScanEnabled).isFalse();
-
-        mFragment.onScanningStateChanged(false);
-        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
-    }
-
-    @Test
-    public void testScanningStateChanged_testScanStartedAfterDisable() {
-        mFragment.enableScanning();
-        verify(mLocalAdapter).startScanning(true);
-        assertThat(mFragment.mScanEnabled).isTrue();
-
-        mFragment.disableScanning();
-        verify(mLocalAdapter).stopScanning();
-        assertThat(mFragment.mScanEnabled).isFalse();
-
-        mFragment.onScanningStateChanged(true);
-        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
-    }
-
-    /**
-     * Fragment to test since {@code DeviceListPreferenceFragment} is abstract
-     */
-    public static class TestFragment extends DeviceListPreferenceFragment {
-
-        public TestFragment() {
-            super("");
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-
-        @Override
-        public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {}
-
-        @Override
-        void initPreferencesFromPreferenceScreen() {}
-
-        @Override
-        public String getDeviceListKey() {
-            return null;
-        }
-
-        @Override
-        protected String getLogTag() {
-            return null;
-        }
-
-        @Override
-        protected int getPreferenceScreenResId() {
-            return 0;
-        }
-
-        @Override
-        protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
-            return null;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
deleted file mode 100644
index 3294ffd04057ac07f118f4508c1ff382577daa39..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static org.mockito.Mockito.verify;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DevicePickerFragmentTest {
-    @Mock
-    private LocalBluetoothAdapter mLocalAdapter;
-    @Mock
-    private BluetoothProgressCategory mAvailableDevicesCategory;
-    private DevicePickerFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mFragment = new DevicePickerFragment();
-
-        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
-    }
-
-    @Test
-    public void testScanningStateChanged_started_setProgressStarted() {
-        mFragment.mScanEnabled = true;
-
-        mFragment.onScanningStateChanged(true);
-
-        verify(mAvailableDevicesCategory).setProgress(true);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
deleted file mode 100644
index a6793bb20df0811a6fdbfdfeb3620c64999f5cbb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settingslib.R;
-import com.android.settingslib.bluetooth.A2dpProfile;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.bluetooth.LocalBluetoothProfile;
-import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.FragmentTestUtil;
-import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.RuntimeEnvironment;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-
-import java.util.ArrayList;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
-        ShadowEventLogWriter.class
-})
-public class DeviceProfilesSettingsTest {
-    Context mContext;
-    @Mock Activity mActivity;
-    @Mock LocalBluetoothManager mManager;
-    @Mock LocalBluetoothAdapter mAdapter;
-    @Mock LocalBluetoothProfileManager mProfileManager;
-    @Mock CachedBluetoothDeviceManager mDeviceManager;
-    @Mock CachedBluetoothDevice mCachedDevice;
-    @Mock A2dpProfile mProfile;
-
-    ArrayList<LocalBluetoothProfile> mProfiles;
-    DeviceProfilesSettings mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-
-        when(mProfile.getNameResource(any())).thenReturn(R.string.bluetooth_profile_a2dp);
-        mProfiles = new ArrayList<>();
-        mProfiles.add(mProfile);
-        when(mCachedDevice.getConnectableProfiles()).thenReturn(mProfiles);
-
-        mFragment = new DeviceProfilesSettings();
-        mFragment.setArguments(new Bundle());
-
-        ReflectionHelpers.setStaticField(LocalBluetoothManager.class, "sInstance", mManager);
-        when(mManager.getCachedDeviceManager()).thenReturn(mDeviceManager);
-        when(mManager.getBluetoothAdapter()).thenReturn(mAdapter);
-        when(mManager.getProfileManager()).thenReturn(mProfileManager);
-        when(mProfileManager.getMapProfile()).thenReturn(null);
-        when(mDeviceManager.findDevice(any())).thenReturn(mCachedDevice);
-    }
-
-    @Test
-    public void deviceHasHighQualityAudio() {
-        when(mProfile.supportsHighQualityAudio(any())).thenReturn(true);
-        when(mProfile.isHighQualityAudioEnabled(any())).thenReturn(true);
-        when(mProfile.isPreferred(any())).thenReturn(true);
-        FragmentTestUtil.startFragment(mFragment);
-
-        ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
-        CheckBox box = (CheckBox) profilesGroup.findViewWithTag(
-                DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
-        assertThat(box).isNotNull();
-        assertThat(box.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(box.isEnabled()).isTrue();
-        assertThat(box.isChecked()).isTrue();
-
-        box.performClick();
-        verify(mProfile).setHighQualityAudioEnabled(any(), eq(false));
-        box.performClick();
-        verify(mProfile).setHighQualityAudioEnabled(any(), eq(true));
-    }
-
-    @Test
-    public void busyDeviceDisablesControl() {
-        when(mProfile.supportsHighQualityAudio(any())).thenReturn(true);
-        when(mProfile.isHighQualityAudioEnabled(any())).thenReturn(true);
-        when(mProfile.isPreferred(any())).thenReturn(true);
-        when(mCachedDevice.isBusy()).thenReturn(true);
-        FragmentTestUtil.startFragment(mFragment);
-
-        // Make sure that the high quality audio option is present but disabled when the device
-        // is busy.
-        ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
-        CheckBox box = (CheckBox) profilesGroup.findViewWithTag(
-                DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
-        assertThat(box).isNotNull();
-        assertThat(box.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(box.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void mediaAudioGetsDisabledAndReEnabled() {
-        when(mProfile.supportsHighQualityAudio(any())).thenReturn(true);
-        when(mProfile.isHighQualityAudioEnabled(any())).thenReturn(true);
-        when(mProfile.isPreferred(any())).thenReturn(true);
-        FragmentTestUtil.startFragment(mFragment);
-
-        ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
-        CheckBox audioBox = profilesGroup.findViewWithTag(mProfile.toString());
-        CheckBox highQualityAudioBox = profilesGroup.findViewWithTag(
-                DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
-        assertThat(audioBox).isNotNull();
-        assertThat(audioBox.isChecked()).isTrue();
-        assertThat(highQualityAudioBox).isNotNull();
-        assertThat(highQualityAudioBox.isChecked()).isTrue();
-
-        // Disabling media audio should cause the high quality audio box to disappear.
-        when(mProfile.isPreferred(any())).thenReturn(false);
-        mFragment.onDeviceAttributesChanged();
-        audioBox = profilesGroup.findViewWithTag(mProfile.toString());
-        highQualityAudioBox = profilesGroup.findViewWithTag(
-                DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
-        assertThat(audioBox).isNotNull();
-        assertThat(audioBox.isChecked()).isFalse();
-        assertThat(highQualityAudioBox).isNotNull();
-        assertThat(highQualityAudioBox.getVisibility()).isEqualTo(View.GONE);
-
-        // And re-enabling media audio should make it reappear.
-        when(mProfile.isPreferred(any())).thenReturn(true);
-        mFragment.onDeviceAttributesChanged();
-        audioBox = profilesGroup.findViewWithTag(mProfile.toString());
-        highQualityAudioBox = profilesGroup.findViewWithTag(
-                DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
-        assertThat(audioBox).isNotNull();
-        assertThat(audioBox.isChecked()).isTrue();
-        assertThat(highQualityAudioBox).isNotNull();
-        assertThat(highQualityAudioBox.isChecked()).isTrue();
-    }
-
-    @Test
-    public void mediaAudioStartsDisabled() {
-        when(mProfile.supportsHighQualityAudio(any())).thenReturn(true);
-        when(mProfile.isHighQualityAudioEnabled(any())).thenReturn(true);
-        when(mProfile.isPreferred(any())).thenReturn(false);
-
-        FragmentTestUtil.startFragment(mFragment);
-        ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
-        CheckBox audioBox = profilesGroup.findViewWithTag(mProfile.toString());
-        CheckBox highQualityAudioBox = profilesGroup.findViewWithTag(
-                DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
-
-        assertThat(audioBox).isNotNull();
-        assertThat(audioBox.isChecked()).isFalse();
-        assertThat(highQualityAudioBox).isNotNull();
-        assertThat(highQualityAudioBox.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void deviceDoesntHaveHighQualityAudio() {
-        when(mProfile.supportsHighQualityAudio(any())).thenReturn(false);
-        when(mProfile.isPreferred(any())).thenReturn(true);
-        FragmentTestUtil.startFragment(mFragment);
-
-        // A device that doesn't support high quality audio shouldn't have the checkbox for
-        // high quality audio support.
-        ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
-        CheckBox box = (CheckBox) profilesGroup.findViewWithTag(
-                DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
-        assertThat(box).isNull();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
deleted file mode 100644
index 21bc868ed4928c589fd06d03877af3ff902012c4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowDialog;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ForgetDeviceDialogFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private CachedBluetoothDevice mCachedDevice;
-
-    private ForgetDeviceDialogFragment mFragment;
-    private Context mContext;
-    private Activity mActivity;
-    private AlertDialog mDialog;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        FakeFeatureFactory.setupForTest(mContext);
-        String deviceAddress = "55:66:77:88:99:AA";
-        when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
-        mFragment = spy(ForgetDeviceDialogFragment.newInstance(deviceAddress));
-        doReturn(mCachedDevice).when(mFragment).getDevice(any());
-        mActivity = Robolectric.setupActivity(Activity.class);
-        mActivity.getFragmentManager().beginTransaction().add(mFragment, null).commit();
-        mDialog = (AlertDialog) ShadowDialog.getLatestDialog();
-    }
-
-    @Test
-    public void cancelDialog() {
-        mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick();
-        verify(mCachedDevice, never()).unpair();
-        assertThat(mActivity.isFinishing()).isFalse();
-    }
-
-    @Test
-    public void confirmDialog() {
-        mDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
-        verify(mCachedDevice).unpair();
-        assertThat(mActivity.isFinishing()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
deleted file mode 100644
index a8ef4e6df5cb8878791f8ca23dca2788378a7a9e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.widget.Button;
-import android.widget.EditText;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowDialog;
-import org.robolectric.util.FragmentTestUtil;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RemoteDeviceNameDialogFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private CachedBluetoothDevice mCachedDevice;
-
-    private RemoteDeviceNameDialogFragment mFragment;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        FakeFeatureFactory.setupForTest(mContext);
-
-        String deviceAddress = "55:66:77:88:99:AA";
-        when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
-        mFragment = spy(RemoteDeviceNameDialogFragment.newInstance(mCachedDevice));
-        doReturn(mCachedDevice).when(mFragment).getDevice(any());
-    }
-
-    /**
-     * Helper method to set the mock device's name and show the dialog.
-     *
-     * @param deviceName what name to set
-     * @return the dialog created
-     */
-    AlertDialog startDialog(String deviceName) {
-        when(mCachedDevice.getName()).thenReturn(deviceName);
-        FragmentTestUtil.startFragment(mFragment);
-        return (AlertDialog) ShadowDialog.getLatestDialog();
-    }
-
-    @Test
-    public void deviceNameDisplayIsCorrect() {
-        String deviceName = "ABC Corp Headphones";
-        AlertDialog dialog = startDialog(deviceName);
-        EditText editText = (EditText) dialog.findViewById(R.id.edittext);
-        assertThat(editText.getText().toString()).isEqualTo(deviceName);
-
-        // Make sure that the "rename" button isn't enabled since the text hasn't changed yet, but
-        // the "cancel" button should be enabled.
-        Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        assertThat(positiveButton.isEnabled()).isFalse();
-        Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
-        assertThat(negativeButton.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void deviceNameEditSucceeds() {
-        String deviceNameInitial = "ABC Corp Headphones";
-        String deviceNameModified = "My Headphones";
-        AlertDialog dialog = startDialog(deviceNameInitial);
-
-        // Before modifying the text the "rename" button should be disabled but the cancel button
-        // should be enabled.
-        Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
-        assertThat(negativeButton.isEnabled()).isTrue();
-        assertThat(positiveButton.isEnabled()).isFalse();
-
-        // Once we modify the text, the positive button should be clickable, and clicking it should
-        // cause a call to change the name.
-        EditText editText = (EditText) dialog.findViewById(R.id.edittext);
-        editText.setText(deviceNameModified);
-        assertThat(positiveButton.isEnabled()).isTrue();
-        positiveButton.performClick();
-        verify(mCachedDevice).setName(deviceNameModified);
-    }
-
-    @Test
-    public void deviceNameEditThenCancelDoesntRename() {
-        String deviceNameInitial = "ABC Corp Headphones";
-        String deviceNameModified = "My Headphones";
-        AlertDialog dialog = startDialog(deviceNameInitial);
-
-        // Modifying the text but then hitting cancel should not cause the name to change.
-        Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
-        assertThat(negativeButton.isEnabled()).isTrue();
-        EditText editText = (EditText) dialog.findViewById(R.id.edittext);
-        editText.setText(deviceNameModified);
-        negativeButton.performClick();
-        verify(mCachedDevice, never()).setName(anyString());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
deleted file mode 100644
index 220d8299f629feef5410998028a6dfc5b17ac4c3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.bluetooth;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.bluetooth.BluetoothDevice;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = SettingsShadowResources.class)
-public class UtilsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private LocalBluetoothManager mLocalBluetoothManager;
-
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-    }
-
-    @Test
-    public void testShowConnectingError_shouldLogBluetoothConnectError() {
-        when(mContext.getString(anyInt(), anyString())).thenReturn("testMessage");
-        Utils.showConnectingError(mContext, "testName", mock(LocalBluetoothManager.class));
-
-        verify(mMetricsFeatureProvider).visible(eq(mContext), anyInt(),
-                eq(MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR));
-    }
-
-    @Test
-    public void testGetBluetoothDrawable_noBatteryLevel_returnSimpleDrawable() {
-        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,
-                R.drawable.ic_bt_laptop, BluetoothDevice.BATTERY_LEVEL_UNKNOWN, 1 /* iconScale */);
-
-        assertThat(drawable).isNotInstanceOf(BluetoothDeviceLayerDrawable.class);
-    }
-
-    @Test
-    public void testGetBluetoothDrawable_hasBatteryLevel_returnLayerDrawable() {
-        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,
-                R.drawable.ic_bt_laptop, 10 /* batteryLevel */, 1 /* iconScale */);
-
-        assertThat(drawable).isInstanceOf(BluetoothDeviceLayerDrawable.class);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
deleted file mode 100644
index 4cb853eb820e1f7df7e67e830df671049a729c1c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.connecteddevice;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcManager;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settingslib.drawer.CategoryKey;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static android.content.Context.NFC_SERVICE;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ConnectedDeviceDashboardFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    Context mContext;
-
-    @Mock
-    private PackageManager mManager;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private SmsMirroringFeatureProvider mFeatureProvider;
-    private ConnectedDeviceDashboardFragment mFragment;
-    private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController;
-
-    private static final class TestSmsMirroringPreferenceController
-            extends SmsMirroringPreferenceController implements PreferenceControllerMixin {
-
-        private boolean mIsAvailable;
-
-        public TestSmsMirroringPreferenceController(Context context) {
-            super(context);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return mIsAvailable;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider;
-
-        mFragment = new ConnectedDeviceDashboardFragment();
-        when(mContext.getPackageManager()).thenReturn(mManager);
-
-        mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext);
-        when(mFeatureProvider.getController(mContext)).thenReturn(
-                mSmsMirroringPreferenceController);
-    }
-
-    @Test
-    public void testCategory_isConnectedDevice() {
-        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
-    }
-
-    @Test
-    public void testSearchIndexProvider_NoNfc_KeyAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).contains(NfcPreferenceController.KEY_TOGGLE_NFC);
-        assertThat(keys).contains(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
-    }
-
-    @Test
-    public void testSearchIndexProvider_NFC_KeyNotAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_TOGGLE_NFC);
-        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
-    }
-
-    @Test
-    public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() {
-        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false);
-        mSmsMirroringPreferenceController.mIsAvailable = false;
-
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey());
-    }
-
-    @Test
-    public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() {
-        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true);
-        mSmsMirroringPreferenceController.mIsAvailable = true;
-
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey());
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
-        final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-        final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-
-    @Test
-    public void testSummaryProvider_hasNfc_shouldReturnNfcSummary() {
-        final NfcManager nfcManager = mock(NfcManager.class);
-        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(NFC_SERVICE)).thenReturn(nfcManager);
-        when(nfcManager.getDefaultAdapter()).thenReturn(mock(NfcAdapter.class));
-
-        SummaryLoader.SummaryProvider provider =
-                new ConnectedDeviceDashboardFragment.SummaryProvider(mContext, summaryLoader);
-
-        provider.setListening(false);
-
-        verifyZeroInteractions(summaryLoader);
-
-        provider.setListening(true);
-
-        verify(mContext).getString(R.string.connected_devices_dashboard_summary);
-    }
-
-    @Test
-    public void testSummaryProvider_noNfc_shouldReturnNoNfcSummary() {
-        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(NFC_SERVICE)).thenReturn(null);
-
-        SummaryLoader.SummaryProvider provider =
-                new ConnectedDeviceDashboardFragment.SummaryProvider(mContext, summaryLoader);
-
-        provider.setListening(false);
-
-        verifyZeroInteractions(summaryLoader);
-
-        provider.setListening(true);
-
-        verify(mContext).getString(R.string.connected_devices_dashboard_no_nfc_summary);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
deleted file mode 100644
index 7edde6e064bace9702a3863f6671578433ded2c0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.android.settings.connecteddevice;
-
-import android.content.Context;
-import android.content.Intent;
-import android.hardware.usb.UsbManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.deviceinfo.UsbBackend;
-import com.android.settings.deviceinfo.UsbModeChooserActivity;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UsbModePreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private UsbBackend mUsbBackend;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private Context mContext;
-    private UsbModePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        mController = new UsbModePreferenceController(mContext, mUsbBackend);
-    }
-
-    @Test
-    public void testGetSummary_chargeDevice() {
-        assertThat(mController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[0]))
-                .isEqualTo(R.string.usb_summary_charging_only);
-    }
-
-    @Test
-    public void testGetSummary_supplyPower() {
-        assertThat(mController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[1]))
-                .isEqualTo(R.string.usb_summary_power_only);
-    }
-
-    @Test
-    public void testGetSummary_TransferFiles() {
-        assertThat(mController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[2]))
-                .isEqualTo(R.string.usb_summary_file_transfers);
-    }
-
-    @Test
-    public void testGetSummary_TransferPhoto() {
-        assertThat(mController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[3]))
-                .isEqualTo(R.string.usb_summary_photo_transfers);
-    }
-
-    @Test
-    public void testGetSummary_MIDI() {
-        assertThat(mController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[4]))
-                .isEqualTo(R.string.usb_summary_MIDI);
-    }
-
-    @Test
-    public void testPreferenceSummary_usbDisconnected() {
-        final Preference preference = new Preference(mContext);
-        preference.setKey("usb_mode");
-        preference.setEnabled(true);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo(
-                mContext.getString(R.string.disconnected));
-    }
-
-    @Test
-    public void testUsbBoradcastReceiver_usbConnected_shouldUpdateSummary() {
-        final Preference preference = new Preference(mContext);
-        preference.setKey("usb_mode");
-        preference.setEnabled(true);
-        when(mUsbBackend.getCurrentMode()).thenReturn(UsbModeChooserActivity.DEFAULT_MODES[0]);
-        when(mScreen.findPreference("usb_mode")).thenReturn(preference);
-
-        mController.displayPreference(mScreen);
-        mController.onResume();
-        final Intent intent = new Intent(UsbManager.ACTION_USB_STATE);
-        intent.putExtra(UsbManager.USB_CONNECTED, true);
-        mContext.sendStickyBroadcast(intent);
-
-        assertThat(preference.getSummary()).isEqualTo(
-                mContext.getString(R.string.usb_summary_charging_only));
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
deleted file mode 100644
index 9bf73cea278850da50eed24c60dadbfa35b11aa5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link DynamicAvailabilityPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class DynamicAvailabilityPreferenceControllerTest {
-
-    private final String PREFERENCE_KEY = "preference_key";
-
-    private @Mock Context mContext;
-    private @Mock Preference mPreference;
-    private @Mock PreferenceScreen mScreen;
-    private @Mock Lifecycle mLifecycle;
-    private @Mock PreferenceAvailabilityObserver mObserver;
-
-    private boolean mIsAvailable;
-    private Preference mUpdatedPreference = null;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
-        when(mScreen.findPreference(PREFERENCE_KEY)).thenReturn(mPreference);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-    }
-
-    @Test
-    public void testAvailableToUnavailable() {
-        mIsAvailable = true;
-
-        final DynamicAvailabilityPreferenceController controller
-                = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
-        verify(mLifecycle).addObserver(controller);
-
-        controller.displayPreference(mScreen);
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-
-        controller.onResume();
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isEqualTo(mPreference);
-
-        mUpdatedPreference = null;
-        mIsAvailable = false;
-        controller.onResume();
-        verify(mScreen).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-    }
-
-    @Test
-    public void testUnavailableToAvailable() {
-        mIsAvailable = false;
-
-        final DynamicAvailabilityPreferenceController controller
-                = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
-        verify(mLifecycle).addObserver(controller);
-
-        controller.displayPreference(mScreen);
-        verify(mScreen).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-
-        reset(mScreen);
-        controller.onResume();
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-
-        mIsAvailable = true;
-        controller.onResume();
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isEqualTo(mPreference);
-    }
-
-    @Test
-    public void testNotifyOnAvailabilityUpdate() {
-        final DynamicAvailabilityPreferenceController controller
-                = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
-        controller.setAvailabilityObserver(mObserver);
-        assertThat(controller.getAvailabilityObserver()).isEqualTo(mObserver);
-
-        mIsAvailable = false;
-        controller.isAvailable();
-        verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, false);
-
-        mIsAvailable = true;
-        controller.isAvailable();
-        verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, true);
-    }
-
-    private class DynamicAvailabilityPreferenceControllerTestable
-            extends DynamicAvailabilityPreferenceController {
-        public DynamicAvailabilityPreferenceControllerTestable(Lifecycle lifecycle) {
-            super(DynamicAvailabilityPreferenceControllerTest.this.mContext, lifecycle);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            notifyOnAvailabilityUpdate(mIsAvailable);
-            return mIsAvailable;
-        }
-
-        @Override
-        public void updateState(Preference preference) {
-            mUpdatedPreference = preference;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return PREFERENCE_KEY;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java b/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
deleted file mode 100644
index 09af870fdfd476d3d431c1d8519918af9efacff0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.codeinspection;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * Scans and builds all classes in current classloader.
- */
-public class ClassScanner {
-
-    private static final String CLASS_SUFFIX = ".class";
-
-    public List<Class<?>> getClassesForPackage(String packageName)
-            throws ClassNotFoundException {
-        final List<Class<?>> classes = new ArrayList<>();
-
-        try {
-            final Enumeration<URL> resources = Thread.currentThread().getContextClassLoader()
-                    .getResources(packageName.replace('.', '/'));
-            if (!resources.hasMoreElements()) {
-                return classes;
-            }
-            URL url = resources.nextElement();
-            while (url != null) {
-                final URLConnection connection = url.openConnection();
-
-                if (connection instanceof JarURLConnection) {
-                    loadClassFromJar((JarURLConnection) connection, packageName,
-                            classes);
-                } else {
-                    loadClassFromDirectory(new File(URLDecoder.decode(url.getPath(), "UTF-8")),
-                            packageName, classes);
-                }
-                if (resources.hasMoreElements()) {
-                    url = resources.nextElement();
-                } else {
-                    break;
-                }
-            }
-        } catch (final IOException e) {
-            throw new ClassNotFoundException("Error when parsing " + packageName, e);
-        }
-        return classes;
-    }
-
-    private void loadClassFromDirectory(File directory, String packageName, List<Class<?>> classes)
-            throws ClassNotFoundException {
-        if (directory.exists() && directory.isDirectory()) {
-            final String[] files = directory.list();
-
-            for (final String file : files) {
-                if (file.endsWith(CLASS_SUFFIX)) {
-                    try {
-                        classes.add(Class.forName(
-                                packageName + '.' + file.substring(0, file.length() - 6),
-                                false /* init */,
-                                Thread.currentThread().getContextClassLoader()));
-                    } catch (NoClassDefFoundError e) {
-                        // do nothing. this class hasn't been found by the
-                        // loader, and we don't care.
-                    }
-                } else {
-                    final File tmpDirectory = new File(directory, file);
-                    if (tmpDirectory.isDirectory()) {
-                        loadClassFromDirectory(tmpDirectory, packageName + "." + file, classes);
-                    }
-                }
-            }
-        }
-    }
-
-    private void loadClassFromJar(JarURLConnection connection, String packageName,
-            List<Class<?>> classes) throws ClassNotFoundException, IOException {
-        final JarFile jarFile = connection.getJarFile();
-        final Enumeration<JarEntry> entries = jarFile.entries();
-        String name;
-        if (!entries.hasMoreElements()) {
-            return;
-        }
-        JarEntry jarEntry = entries.nextElement();
-        while (jarEntry != null) {
-            name = jarEntry.getName();
-
-            if (name.contains(CLASS_SUFFIX)) {
-                name = name.substring(0, name.length() - CLASS_SUFFIX.length()).replace('/', '.');
-
-                if (name.startsWith(packageName)) {
-                    try {
-                        classes.add(Class.forName(name,
-                                false /* init */,
-                                Thread.currentThread().getContextClassLoader()));
-                    } catch (NoClassDefFoundError e) {
-                        // do nothing. this class hasn't been found by the
-                        // loader, and we don't care.
-                    }
-                }
-            }
-            if (entries.hasMoreElements()) {
-                jarEntry = entries.nextElement();
-            } else {
-                break;
-            }
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
deleted file mode 100644
index d05bee6c8302431a4d6793f7f1f13facd32fd0ca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.codeinspection;
-
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
-import com.android.settings.search.SearchIndexProviderCodeInspector;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-/**
- * Test suite that scans all class in app package, and perform different types of code inspection
- * for conformance.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        assetDir = "/tests/robotests/assets")
-public class CodeInspectionTest {
-
-    private List<Class<?>> mClasses;
-
-    @Before
-    public void setUp() throws Exception {
-        mClasses = new ClassScanner().getClassesForPackage(CodeInspector.PACKAGE_NAME);
-    }
-
-    @Test
-    public void runCodeInspections() {
-        new InstrumentableFragmentCodeInspector(mClasses).run();
-        new SearchIndexProviderCodeInspector(mClasses).run();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
deleted file mode 100644
index 91046fe51d0eb3b3ffcb891cc457b91a540e2437..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.codeinspection;
-
-import org.robolectric.shadows.ShadowApplication;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-/**
- * Inspector takes a list of class objects and perform static code analysis in its {@link #run()}
- * method.
- */
-public abstract class CodeInspector {
-
-    protected static final String PACKAGE_NAME = "com.android.settings";
-
-    protected static final String TEST_CLASS_SUFFIX = "Test";
-    private static final String TEST_INNER_CLASS_SIGNATURE = "Test$";
-
-    protected final List<Class<?>> mClasses;
-
-    public CodeInspector(List<Class<?>> classes) {
-        mClasses = classes;
-    }
-
-    /**
-     * Code inspection runner method.
-     */
-    public abstract void run();
-
-    protected void assertNoObsoleteInGrandfatherList(String listName, List<String> list) {
-        final StringBuilder obsoleteGrandfatherItems = new StringBuilder(
-                listName + " contains item that should not be grandfathered.\n");
-        for (String c : list) {
-            obsoleteGrandfatherItems.append(c).append("\n");
-        }
-        assertWithMessage(obsoleteGrandfatherItems.toString())
-                .that(list)
-                .isEmpty();
-    }
-
-    protected boolean isConcreteSettingsClass(Class clazz) {
-        // Abstract classes
-        if (Modifier.isAbstract(clazz.getModifiers())) {
-            return false;
-        }
-        final String packageName = clazz.getPackage().getName();
-        // Classes that are not in Settings
-        if (!packageName.contains(PACKAGE_NAME + ".") && !packageName.endsWith(PACKAGE_NAME)) {
-            return false;
-        }
-        final String className = clazz.getName();
-        // Classes from tests
-        if (className.endsWith(TEST_CLASS_SUFFIX)) {
-            return false;
-        }
-        if (className.contains(TEST_INNER_CLASS_SIGNATURE)) {
-            return false;
-        }
-        return true;
-    }
-
-    public static void initializeGrandfatherList(List<String> grandfather, String filename) {
-        try {
-            final InputStream in = ShadowApplication.getInstance().getApplicationContext()
-                    .getAssets()
-                    .open(filename);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                grandfather.add(line);
-            }
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Error initializing grandfather " + filename, e);
-        }
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
deleted file mode 100644
index 4455549db12b7034f2dc487411174d48f7d0eb15..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.instrumentation;
-
-import android.app.Fragment;
-import android.util.ArraySet;
-
-import com.android.settings.core.codeinspection.CodeInspector;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-/**
- * {@link CodeInspector} that verifies all fragments implements Instrumentable.
- */
-public class InstrumentableFragmentCodeInspector extends CodeInspector {
-
-    private final List<String> grandfather_notImplementingInstrumentable;
-
-    public InstrumentableFragmentCodeInspector(List<Class<?>> classes) {
-        super(classes);
-        grandfather_notImplementingInstrumentable = new ArrayList<>();
-        initializeGrandfatherList(grandfather_notImplementingInstrumentable,
-                "grandfather_not_implementing_instrumentable");
-    }
-
-    @Override
-    public void run() {
-        final Set<String> broken = new ArraySet<>();
-
-        for (Class clazz : mClasses) {
-            if (!isConcreteSettingsClass(clazz)) {
-                continue;
-            }
-            final String className = clazz.getName();
-            // If it's a fragment, it must also be instrumentable.
-            final boolean whitelisted =
-                    grandfather_notImplementingInstrumentable.remove(className);
-            if (Fragment.class.isAssignableFrom(clazz)
-                    && !Instrumentable.class.isAssignableFrom(clazz)
-                    && !whitelisted) {
-                broken.add(className);
-            }
-        }
-        final StringBuilder sb = new StringBuilder(
-                "All fragment should implement Instrumentable, but the following are not:\n");
-        for (String c : broken) {
-            sb.append(c).append("\n");
-        }
-        assertWithMessage(sb.toString())
-                .that(broken.isEmpty())
-                .isTrue();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_instrumentable",
-                grandfather_notImplementingInstrumentable);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
deleted file mode 100644
index a9273065c7bde0e9b63fe93f2f54347260821763..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.instrumentation;
-
-import android.os.Bundle;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InstrumentedDialogFragmentTest {
-
-    public static class TestDialogFragment extends InstrumentedDialogFragment {
-        static final int TEST_METRIC = 1234;
-
-        public MetricsFeatureProvider getMetricsFeatureProvider() {
-            return mMetricsFeatureProvider;
-        }
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            assertThat(mMetricsFeatureProvider).isNotNull();
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return TEST_METRIC;
-        }
-    }
-
-    @Test
-    public void runThroughFragmentLifecycles_shouldHaveMetricsFeatureProviderOnAttach() {
-        final TestDialogFragment fragment = new TestDialogFragment();
-
-        // Precondition: no metrics feature
-        assertThat(fragment.getMetricsFeatureProvider()).isNull();
-
-        fragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
-
-        // Verify: has metrics feature
-        assertThat(fragment.getMetricsFeatureProvider()).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
deleted file mode 100644
index ea33c83391f5c7f4edd5123b0a019e8f0ff20832..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.instrumentation;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.overlay.FeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class MetricsFeatureProviderTest {
-
-    @Mock
-    private LogWriter mLogWriter;
-    private Context mContext;
-    private MetricsFeatureProvider mProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mProvider = new MetricsFeatureProvider();
-        List<LogWriter> writers = new ArrayList<>();
-        writers.add(mLogWriter);
-        ReflectionHelpers.setField(mProvider, "mLoggerWriters", writers);
-    }
-
-    @Test
-    public void getFactory_shouldReuseCachedInstance() {
-        MetricsFeatureProvider feature1 =
-                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
-        MetricsFeatureProvider feature2 =
-                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
-
-        assertThat(feature1 == feature2).isTrue();
-    }
-
-    @Test
-    public void logDashboardStartIntent_intentEmpty_shouldNotLog() {
-        mProvider.logDashboardStartIntent(mContext, null /* intent */,
-                MetricsEvent.SETTINGS_GESTURES);
-
-        verifyNoMoreInteractions(mLogWriter);
-    }
-
-    @Test
-    public void logDashboardStartIntent_intentHasNoComponent_shouldLog() {
-        final Intent intent = new Intent(Intent.ACTION_ASSIST);
-
-        mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
-
-        verify(mLogWriter).action(
-                eq(mContext),
-                eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
-                anyString(),
-                eq(Pair.create(MetricsEvent.FIELD_CONTEXT, MetricsEvent.SETTINGS_GESTURES)));
-    }
-
-    @Test
-    public void logDashboardStartIntent_intentIsExternal_shouldLog() {
-        final Intent intent = new Intent().setComponent(new ComponentName("pkg", "cls"));
-
-        mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
-
-        verify(mLogWriter).action(
-                eq(mContext),
-                eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
-                anyString(),
-                eq(Pair.create(MetricsEvent.FIELD_CONTEXT, MetricsEvent.SETTINGS_GESTURES)));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
deleted file mode 100644
index bb41cf0d4f4060d3c5d300f5d37ad61f7a949673..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.instrumentation;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.Pair;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import com.google.common.truth.Platform;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .ACTION_SETTINGS_PREFERENCE_CHANGE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SharedPreferenceLoggerTest {
-
-    private static final String TEST_TAG = "tag";
-    private static final String TEST_KEY = "key";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private ArgumentMatcher<Pair<Integer, Object>> mNamePairMatcher;
-    private FakeFeatureFactory mFactory;
-    private MetricsFeatureProvider mMetricsFeature;
-    private SharedPreferencesLogger mSharedPrefLogger;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mMetricsFeature = mFactory.metricsFeatureProvider;
-
-        mSharedPrefLogger = new SharedPreferencesLogger(mContext, TEST_TAG);
-        mNamePairMatcher = pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, String.class);
-    }
-
-    @Test
-    public void putInt_shouldNotLogInitialPut() {
-        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
-        editor.putInt(TEST_KEY, 1);
-        editor.putInt(TEST_KEY, 1);
-        editor.putInt(TEST_KEY, 1);
-        editor.putInt(TEST_KEY, 2);
-        editor.putInt(TEST_KEY, 2);
-        editor.putInt(TEST_KEY, 2);
-        editor.putInt(TEST_KEY, 2);
-
-        verify(mMetricsFeature, times(6)).action(any(Context.class), anyInt(),
-                argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.class)));
-    }
-
-    @Test
-    public void putBoolean_shouldNotLogInitialPut() {
-        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
-        editor.putBoolean(TEST_KEY, true);
-        editor.putBoolean(TEST_KEY, true);
-        editor.putBoolean(TEST_KEY, false);
-        editor.putBoolean(TEST_KEY, false);
-        editor.putBoolean(TEST_KEY, false);
-
-
-        verify(mMetricsFeature).action(any(Context.class), anyInt(),
-                argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, true)));
-        verify(mMetricsFeature, times(3)).action(any(Context.class), anyInt(),
-                argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, false)));
-    }
-
-    @Test
-    public void putLong_shouldNotLogInitialPut() {
-        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
-        editor.putLong(TEST_KEY, 1);
-        editor.putLong(TEST_KEY, 1);
-        editor.putLong(TEST_KEY, 1);
-        editor.putLong(TEST_KEY, 1);
-        editor.putLong(TEST_KEY, 2);
-
-        verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.class)));
-    }
-
-    @Test
-    public void putLong_biggerThanIntMax_shouldLogIntMax() {
-        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
-        final long veryBigNumber = 500L + Integer.MAX_VALUE;
-        editor.putLong(TEST_KEY, 1);
-        editor.putLong(TEST_KEY, veryBigNumber);
-
-        verify(mMetricsFeature).action(any(Context.class), anyInt(),
-                argThat(mNamePairMatcher),
-                argThat(pairMatches(
-                        FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.MAX_VALUE)));
-    }
-
-    @Test
-    public void putLong_smallerThanIntMin_shouldLogIntMin() {
-        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
-        final long veryNegativeNumber = -500L + Integer.MIN_VALUE;
-        editor.putLong(TEST_KEY, 1);
-        editor.putLong(TEST_KEY, veryNegativeNumber);
-
-        verify(mMetricsFeature).action(any(Context.class), anyInt(),
-                argThat(mNamePairMatcher),
-                argThat(pairMatches(
-                        FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.MIN_VALUE)));
-    }
-
-    @Test
-    public void putFloat_shouldNotLogInitialPut() {
-        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
-        editor.putFloat(TEST_KEY, 1);
-        editor.putFloat(TEST_KEY, 1);
-        editor.putFloat(TEST_KEY, 1);
-        editor.putFloat(TEST_KEY, 1);
-        editor.putFloat(TEST_KEY, 2);
-
-        verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE, Float.class)));
-    }
-
-    @Test
-    public void logPackage_shouldUseLogPackageApi() {
-        mSharedPrefLogger.logPackageName("key", "com.android.settings");
-        verify(mMetricsFeature).action(any(Context.class),
-                eq(ACTION_SETTINGS_PREFERENCE_CHANGE),
-                eq("com.android.settings"),
-                any(Pair.class));
-    }
-
-    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, Class clazz) {
-        return pair -> pair.first == tag && Platform.isInstanceOfType(pair.second, clazz);
-    }
-
-    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, boolean bool) {
-        return pair -> pair.first == tag
-                && Platform.isInstanceOfType(pair.second, Integer.class)
-                && pair.second.equals((bool ? 1 : 0));
-    }
-
-    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, int val) {
-        return pair -> pair.first == tag
-                && Platform.isInstanceOfType(pair.second, Integer.class)
-                && pair.second.equals(val);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
deleted file mode 100644
index 1a47a66f25ee2ee2953a3f494ec8fa46b2dd5f32..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.instrumentation;
-
-import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VisibilityLoggerMixinTest {
-
-    @Mock
-    private MetricsFeatureProvider mMetricsFeature;
-
-    private VisibilityLoggerMixin mMixin;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-        mMixin = new VisibilityLoggerMixin(TestInstrumentable.TEST_METRIC, mMetricsFeature);
-    }
-
-    @Test
-    public void shouldLogVisibleOnResume() {
-        mMixin.onResume();
-
-        verify(mMetricsFeature, times(1))
-                .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.VIEW_UNKNOWN),
-                        eq(TestInstrumentable.TEST_METRIC));
-    }
-
-    @Test
-    public void shouldLogVisibleWithSource() {
-        final Intent sourceIntent = new Intent()
-                .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
-                        MetricsProto.MetricsEvent.SETTINGS_GESTURES);
-        final Activity activity = mock(Activity.class);
-        when(activity.getIntent()).thenReturn(sourceIntent);
-        mMixin.setSourceMetricsCategory(activity);
-        mMixin.onResume();
-
-        verify(mMetricsFeature, times(1))
-                .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES),
-                        eq(TestInstrumentable.TEST_METRIC));
-    }
-
-    @Test
-    public void shouldLogHideOnPause() {
-        mMixin.onPause();
-
-        verify(mMetricsFeature, times(1))
-                .hidden(nullable(Context.class), eq(TestInstrumentable.TEST_METRIC));
-    }
-
-    @Test
-    public void shouldNotLogIfMetricsFeatureIsNull() {
-        mMixin = new VisibilityLoggerMixin(TestInstrumentable.TEST_METRIC);
-        mMixin.onResume();
-        mMixin.onPause();
-
-        verify(mMetricsFeature, never())
-                .hidden(nullable(Context.class), anyInt());
-    }
-
-    @Test
-    public void shouldNotLogIfMetricsCategoryIsUnknown() {
-        mMixin = new VisibilityLoggerMixin(METRICS_CATEGORY_UNKNOWN, mMetricsFeature);
-
-        mMixin.onResume();
-        mMixin.onPause();
-
-        verify(mMetricsFeature, never())
-                .hidden(nullable(Context.class), anyInt());
-    }
-
-    private final class TestInstrumentable implements Instrumentable {
-
-        public static final int TEST_METRIC = 12345;
-
-        @Override
-        public int getMetricsCategory() {
-            return TEST_METRIC;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
deleted file mode 100644
index 4b345d072d720812b02630ff5e46d731ba922cb4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Icon;
-import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
-import android.util.DisplayMetrics;
-import android.util.Pair;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.RelativeLayout;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.dashboard.conditional.ConditionAdapter;
-import com.android.settings.dashboard.suggestions.SuggestionAdapter;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-        })
-public class DashboardAdapterTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SettingsActivity mContext;
-    @Mock
-    private View mView;
-    @Mock
-    private Condition mCondition;
-    @Mock
-    private Resources mResources;
-    @Captor
-    private ArgumentCaptor<Integer> mActionCategoryCaptor = ArgumentCaptor.forClass(Integer.class);
-    @Captor
-    private ArgumentCaptor<String> mActionPackageCaptor = ArgumentCaptor.forClass(String.class);
-    @Captor
-    private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
-    private FakeFeatureFactory mFactory;
-    private DashboardAdapter mDashboardAdapter;
-    private DashboardAdapter.SuggestionAndConditionHeaderHolder mSuggestionHolder;
-    private DashboardData.SuggestionConditionHeaderData mSuggestionHeaderData;
-    private List<Condition> mConditionList;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        when(mFactory.dashboardFeatureProvider.shouldTintIcon()).thenReturn(true);
-        when(mFactory.suggestionsFeatureProvider
-                .getSuggestionIdentifier(any(Context.class), any(Tile.class)))
-                .thenAnswer(invocation -> {
-                    final Object[] args = invocation.getArguments();
-                    return ((Tile)args[1]).intent.getComponent().getPackageName();
-                });
-
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getQuantityString(any(int.class), any(int.class), any()))
-                .thenReturn("");
-
-        mConditionList = new ArrayList<>();
-        mConditionList.add(mCondition);
-        when(mCondition.shouldShow()).thenReturn(true);
-        mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null);
-        mSuggestionHeaderData = new DashboardData.SuggestionConditionHeaderData(mConditionList, 1);
-        when(mView.getTag()).thenReturn(mCondition);
-    }
-
-    @Test
-    public void testSuggestionsLogs_NotExpanded() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        verify(mFactory.metricsFeatureProvider, times(2)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg2");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_NotExpandedAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(4)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg1", "pkg2");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_Expanded() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(3)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(6)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedAfterPause() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(7)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(10)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(1)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(2)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(3)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
-        setupSuggestions(makeSuggestions("pkg1"));
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(4)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg1", "pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_SmartSuggestionEnabled() {
-        when(mFactory.suggestionsFeatureProvider
-                .isSmartSuggestionEnabled(any(Context.class))).thenReturn(true);
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(2)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
-    }
-
-    @Test
-    public void testSuggestionsLogs_nullSuggestionsList_shouldNotCrash() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5"));
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-
-        // set suggestions to null
-        final DashboardData prevData = mDashboardAdapter.mDashboardData;
-        mDashboardAdapter.mDashboardData = new DashboardData.Builder(prevData)
-                .setSuggestions(null)
-                .build();
-
-        mSuggestionHolder.itemView.callOnClick();
-        // no crash
-    }
-
-    @Test
-    public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
-        final DashboardAdapter adapter =
-                spy(new DashboardAdapter(mContext, null, null, null, null));
-        final List<Tile> suggestions = makeSuggestions("pkg1", "pkg2", "pkg3");
-        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
-
-        final RecyclerView data = mock(RecyclerView.class);
-        when(data.getResources()).thenReturn(mResources);
-        when(data.getContext()).thenReturn(mContext);
-        when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
-        final View itemView = mock(View.class);
-        when(itemView.findViewById(R.id.data)).thenReturn(data);
-        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
-                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
-
-        adapter.onBindConditionAndSuggestion(
-                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
-
-        final DashboardData dashboardData = adapter.mDashboardData;
-        reset(adapter); // clear interactions tracking
-
-        final Tile suggestionToRemove = suggestions.get(1);
-        adapter.onSuggestionDismissed(suggestionToRemove);
-
-        assertThat(adapter.mDashboardData).isEqualTo(dashboardData);
-        assertThat(suggestions.size()).isEqualTo(2);
-        assertThat(suggestions.contains(suggestionToRemove)).isFalse();
-        verify(adapter, never()).notifyDashboardDataChanged(any());
-    }
-
-    @Test
-    public void testSuggestionDismissed_moreThanTwoSuggestions_defaultMode_shouldNotCrash() {
-        final RecyclerView data = new RecyclerView(RuntimeEnvironment.application);
-        final View itemView = mock(View.class);
-        when(itemView.findViewById(R.id.data)).thenReturn(data);
-        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
-                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
-        final List<Tile> suggestions =
-                makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4");
-        final DashboardAdapter adapter = spy(new DashboardAdapter(mContext, null /*savedInstance */,
-                null /* conditions */, null /* suggestionParser */, null /* callback */));
-        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
-        adapter.onBindConditionAndSuggestion(
-                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
-        // default mode, only displaying 2 suggestions
-
-        adapter.onSuggestionDismissed(suggestions.get(1));
-
-        // verify operations that access the lists will not cause ConcurrentModificationException
-        assertThat(holder.data.getAdapter().getItemCount()).isEqualTo(1);
-        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
-        // should not crash
-    }
-
-    @Test
-    public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
-        DashboardAdapter adapter =
-                spy(new DashboardAdapter(mContext, null, null, null, null));
-        final List<Tile> suggestions = makeSuggestions("pkg1");
-        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
-        final DashboardData dashboardData = adapter.mDashboardData;
-        reset(adapter); // clear interactions tracking
-
-        adapter.onSuggestionDismissed(suggestions.get(0));
-
-        assertThat(adapter.mDashboardData).isNotEqualTo(dashboardData);
-        verify(adapter).notifyDashboardDataChanged(any());
-    }
-
-    @Test
-    public void testSetCategoriesAndSuggestions_iconTinted() {
-        TypedArray mockTypedArray = mock(TypedArray.class);
-        doReturn(mockTypedArray).when(mContext).obtainStyledAttributes(any(int[].class));
-        doReturn(0x89000000).when(mockTypedArray).getColor(anyInt(), anyInt());
-
-        List<Tile> packages = makeSuggestions("pkg1");
-        Icon mockIcon = mock(Icon.class);
-        packages.get(0).isIconTintable = true;
-        packages.get(0).icon = mockIcon;
-
-        mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, packages);
-
-        verify(mockIcon).setTint(eq(0x89000000));
-    }
-
-    @Test
-    public void testSetCategories_iconTinted() {
-        TypedArray mockTypedArray = mock(TypedArray.class);
-        doReturn(mockTypedArray).when(mContext).obtainStyledAttributes(any(int[].class));
-        doReturn(0x89000000).when(mockTypedArray).getColor(anyInt(), anyInt());
-
-        final DashboardCategory category = mock(DashboardCategory.class);
-        final List<Tile> tiles = new ArrayList<>();
-        final Icon mockIcon = mock(Icon.class);
-        final Tile tile = new Tile();
-        tile.isIconTintable = true;
-        tile.icon = mockIcon;
-        tiles.add(tile);
-        category.tiles = tiles;
-
-        mDashboardAdapter.setCategory(category);
-
-        verify(mockIcon).setTint(eq(0x89000000));
-    }
-
-    @Test
-    public void testSetCategoriesAndSuggestions_limitSuggestionSize() {
-        List<Tile> packages =
-                makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5", "pkg6", "pkg7");
-        mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, packages);
-
-        assertThat(mDashboardAdapter.mDashboardData.getSuggestions().size())
-                .isEqualTo(DashboardAdapter.MAX_SUGGESTION_TO_SHOW);
-    }
-
-    @Test
-    public void testBindConditionAndSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
-        mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
-        final List<Tile> suggestions = makeSuggestions("pkg1");
-        final DashboardCategory category = mock(DashboardCategory.class);
-        final List<Tile> tiles = new ArrayList<>();
-        tiles.add(mock(Tile.class));
-        category.tiles = tiles;
-
-        mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
-
-        final RecyclerView data = mock(RecyclerView.class);
-        when(data.getResources()).thenReturn(mResources);
-        when(data.getContext()).thenReturn(mContext);
-        when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
-        final View itemView = mock(View.class);
-        when(itemView.findViewById(R.id.data)).thenReturn(data);
-        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
-                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
-
-        mDashboardAdapter.onBindConditionAndSuggestion(
-                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
-
-        verify(data).setAdapter(any(SuggestionAdapter.class));
-        // should not crash
-    }
-
-    @Test
-    public void testBindConditionAndSuggestion_emptySuggestion_shouldSetConditionAdpater() {
-        final Bundle savedInstance = new Bundle();
-        savedInstance.putInt(DashboardAdapter.STATE_SUGGESTION_CONDITION_MODE,
-                DashboardData.HEADER_MODE_FULLY_EXPANDED);
-        mDashboardAdapter = new DashboardAdapter(mContext, savedInstance, mConditionList,
-                null /* SuggestionParser */, null /* SuggestionDismissController.Callback */);
-
-        final List<Tile> suggestions = new ArrayList<>();
-        final DashboardCategory category = mock(DashboardCategory.class);
-        final List<Tile> tiles = new ArrayList<>();
-        tiles.add(mock(Tile.class));
-        category.tiles = tiles;
-        mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
-
-        final RecyclerView data = mock(RecyclerView.class);
-        when(data.getResources()).thenReturn(mResources);
-        when(data.getContext()).thenReturn(mContext);
-        when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
-        final View itemView = mock(View.class);
-        when(itemView.findViewById(R.id.data)).thenReturn(data);
-        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
-                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
-
-        mDashboardAdapter.onBindConditionAndSuggestion(
-                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
-
-        verify(data).setAdapter(any(ConditionAdapter.class));
-    }
-
-    private List<Tile> makeSuggestions(String... pkgNames) {
-        final List<Tile> suggestions = new ArrayList<>();
-        for (String pkgName : pkgNames) {
-            Tile suggestion = new Tile();
-            suggestion.intent = new Intent("action");
-            suggestion.intent.setComponent(new ComponentName(pkgName, "cls"));
-            suggestions.add(suggestion);
-        }
-        return suggestions;
-    }
-
-    private void setupSuggestions(List<Tile> suggestions) {
-        mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, suggestions);
-        final Context context = RuntimeEnvironment.application;
-        mSuggestionHolder = new DashboardAdapter.SuggestionAndConditionHeaderHolder(
-                LayoutInflater.from(context).inflate(
-                        R.layout.suggestion_condition_header, new RelativeLayout(context), true));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
deleted file mode 100644
index cc4f7417902178a70c5daae7c5a1b63b77ac0dcd..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_CONTAINER;
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONDITION_FOOTER;
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.support.annotation.NonNull;
-import android.support.v7.util.DiffUtil;
-import android.support.v7.util.ListUpdateCallback;
-import android.widget.RemoteViews;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.conditional.AirplaneModeCondition;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DashboardDataTest {
-    private static final String TEST_SUGGESTION_TITLE = "Use fingerprint";
-    private static final String TEST_CATEGORY_TILE_TITLE = "Display";
-
-    private DashboardData mDashboardDataWithOneConditions;
-    private DashboardData mDashboardDataWithTwoConditions;
-    private DashboardData mDashboardDataWithNoItems;
-    @Mock
-    private Tile mTestCategoryTile;
-    @Mock
-    private Tile mTestSuggestion;
-    @Mock
-    private DashboardCategory mDashboardCategory;
-    @Mock
-    private Condition mTestCondition;
-    @Mock
-    private Condition mSecondCondition; // condition used to test insert in DiffUtil
-
-    @Before
-    public void SetUp() {
-        MockitoAnnotations.initMocks(this);
-
-        // Build suggestions
-        final List<Tile> suggestions = new ArrayList<>();
-        mTestSuggestion.title = TEST_SUGGESTION_TITLE;
-        suggestions.add(mTestSuggestion);
-
-        // Build oneItemConditions
-        final List<Condition> oneItemConditions = new ArrayList<>();
-        when(mTestCondition.shouldShow()).thenReturn(true);
-        oneItemConditions.add(mTestCondition);
-
-        // Build twoItemConditions
-        final List<Condition> twoItemsConditions = new ArrayList<>();
-        when(mSecondCondition.shouldShow()).thenReturn(true);
-        twoItemsConditions.add(mTestCondition);
-        twoItemsConditions.add(mSecondCondition);
-
-        // Build category
-        mTestCategoryTile.title = TEST_CATEGORY_TILE_TITLE;
-        mDashboardCategory.title = "test";
-        mDashboardCategory.tiles = new ArrayList<>();
-        mDashboardCategory.tiles.add(mTestCategoryTile);
-
-        // Build DashboardData
-        mDashboardDataWithOneConditions = new DashboardData.Builder()
-                .setConditions(oneItemConditions)
-                .setCategory(mDashboardCategory)
-                .setSuggestions(suggestions)
-                .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
-                .build();
-
-        mDashboardDataWithTwoConditions = new DashboardData.Builder()
-                .setConditions(twoItemsConditions)
-                .setCategory(mDashboardCategory)
-                .setSuggestions(suggestions)
-                .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
-                .build();
-
-        mDashboardDataWithNoItems = new DashboardData.Builder()
-                .setConditions(null)
-                .setCategory(null)
-                .setSuggestions(null)
-                .build();
-    }
-
-    @Test
-    public void testBuildItemsData_shouldSetstableId() {
-        final List<DashboardData.Item> items = mDashboardDataWithOneConditions.getItemList();
-
-        // Header, suggestion, condition, footer, 1 tile
-        assertThat(items).hasSize(4);
-
-        assertThat(items.get(0).id).isEqualTo(STABLE_ID_SUGGESTION_CONTAINER);
-        assertThat(items.get(1).id).isEqualTo(STABLE_ID_CONDITION_CONTAINER);
-        assertThat(items.get(2).id).isEqualTo(STABLE_ID_SUGGESTION_CONDITION_FOOTER);
-        assertThat(items.get(3).id).isEqualTo(Objects.hash(mTestCategoryTile.title));
-    }
-
-    @Test
-    public void testBuildItemsData_containsAllData() {
-        final Object[] expectedObjects = {
-                mDashboardDataWithOneConditions.getSuggestions(),
-                mDashboardDataWithOneConditions.getConditions(),
-                null, mTestCategoryTile};
-        final int expectedSize = expectedObjects.length;
-
-        assertThat(mDashboardDataWithOneConditions.getItemList()).hasSize(expectedSize);
-
-        for (int i = 0; i < expectedSize; i++) {
-            final Object item = mDashboardDataWithOneConditions.getItemEntityByPosition(i);
-            if (item instanceof List) {
-                assertThat(item).isEqualTo(expectedObjects[i]);
-            } else if (item instanceof DashboardData.SuggestionConditionHeaderData) {
-                DashboardData.SuggestionConditionHeaderData i1 =
-                        (DashboardData.SuggestionConditionHeaderData) item;
-                DashboardData.SuggestionConditionHeaderData i2 =
-                        (DashboardData.SuggestionConditionHeaderData) expectedObjects[i];
-                assertThat(i1.title).isEqualTo(i2.title);
-                assertThat(i1.conditionCount).isEqualTo(i2.conditionCount);
-                assertThat(i1.hiddenSuggestionCount).isEqualTo(i2.hiddenSuggestionCount);
-            } else {
-                assertThat(item).isSameAs(expectedObjects[i]);
-            }
-        }
-    }
-
-    @Test
-    public void testGetPositionByEntity_selfInstance_returnPositionFound() {
-        final int position = mDashboardDataWithOneConditions
-                .getPositionByEntity(mDashboardDataWithOneConditions.getConditions());
-        assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
-    }
-
-    @Test
-    public void testGetPositionByEntity_notExisted_returnNotFound() {
-        final Condition condition = mock(AirplaneModeCondition.class);
-        final int position = mDashboardDataWithOneConditions.getPositionByEntity(condition);
-        assertThat(position).isEqualTo(DashboardData.POSITION_NOT_FOUND);
-    }
-
-    @Test
-    public void testGetPositionByTile_selfInstance_returnPositionFound() {
-        final int position = mDashboardDataWithOneConditions
-                .getPositionByTile(mTestCategoryTile);
-        assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
-    }
-
-    @Test
-    public void testGetPositionByTile_equalTitle_returnPositionFound() {
-        final Tile tile = mock(Tile.class);
-        tile.title = TEST_CATEGORY_TILE_TITLE;
-        final int position = mDashboardDataWithOneConditions.getPositionByTile(tile);
-        assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
-    }
-
-    @Test
-    public void testGetPositionByTile_notExisted_returnNotFound() {
-        final Tile tile = mock(Tile.class);
-        tile.title = "";
-        final int position = mDashboardDataWithOneConditions.getPositionByTile(tile);
-        assertThat(position).isEqualTo(DashboardData.POSITION_NOT_FOUND);
-    }
-
-    @Test
-    public void testDiffUtil_DataEqual_noResultData() {
-        List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        testDiffUtil(mDashboardDataWithOneConditions,
-                mDashboardDataWithOneConditions, testResultData);
-    }
-
-    @Test
-    public void testDiffUtil_InsertOneCondition_ResultDataOneChanged() {
-        //Build testResultData
-        final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        // Item in position 2 is the condition container containing the list of conditions, which
-        // gets 1 more item
-        testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
-
-        testDiffUtil(mDashboardDataWithOneConditions,
-                mDashboardDataWithTwoConditions, testResultData);
-    }
-
-    @Test
-    public void testDiffUtil_RemoveOneSuggestion_causeItemRemoveAndChange() {
-        //Build testResultData
-        final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 1));
-        testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
-        // Build DashboardData
-        final List<Condition> oneItemConditions = new ArrayList<>();
-        when(mTestCondition.shouldShow()).thenReturn(true);
-        oneItemConditions.add(mTestCondition);
-        final List<Tile> suggestions = new ArrayList<>();
-        mTestSuggestion.title = TEST_SUGGESTION_TITLE;
-        suggestions.add(mTestSuggestion);
-
-        final DashboardData oldData = new DashboardData.Builder()
-                .setConditions(oneItemConditions)
-                .setCategory(mDashboardCategory)
-                .setSuggestions(suggestions)
-                .setSuggestionConditionMode(DashboardData.HEADER_MODE_DEFAULT)
-                .build();
-        final DashboardData newData = new DashboardData.Builder()
-                .setConditions(oneItemConditions)
-                .setSuggestions(null)
-                .setCategory(mDashboardCategory)
-                .setSuggestionConditionMode(DashboardData.HEADER_MODE_DEFAULT)
-                .build();
-
-        testDiffUtil(oldData, newData, testResultData);
-    }
-
-    @Test
-    public void testDiffUtil_DeleteAllData_ResultDataOneDeleted() {
-        //Build testResultData
-        final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 4));
-
-        testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
-    }
-
-    @Test
-    public void testDiffUtil_typeSuggestedContainer_ResultDataNothingChanged() {
-        //Build testResultData
-        final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 0, 1));
-        Tile tile = new Tile();
-        tile.remoteViews = mock(RemoteViews.class);
-
-        DashboardData prevData = new DashboardData.Builder()
-                .setConditions(null)
-                .setCategory(null)
-                .setSuggestions(Arrays.asList(tile))
-                .build();
-        DashboardData currentData = new DashboardData.Builder()
-                .setConditions(null)
-                .setCategory(null)
-                .setSuggestions(Arrays.asList(tile))
-                .build();
-        testDiffUtil(prevData, currentData, testResultData);
-    }
-
-    /**
-     * Test when using the
-     * {@link com.android.settings.dashboard.DashboardData.ItemsDataDiffCallback}
-     * to transfer List from {@paramref baseDashboardData} to {@paramref diffDashboardData}, whether
-     * the transform data result is equals to {@paramref testResultData}
-     * <p>
-     * The steps are described below:
-     * 1. Calculate a {@link android.support.v7.util.DiffUtil.DiffResult} from
-     * {@paramref baseDashboardData} to {@paramref diffDashboardData}
-     * <p>
-     * 2. Dispatch the {@link android.support.v7.util.DiffUtil.DiffResult} calculated from step 1
-     * into {@link ListUpdateResult}
-     * <p>
-     * 3. Get result data(a.k.a. baseResultData) from {@link ListUpdateResult} and compare it to
-     * {@paramref testResultData}
-     * <p>
-     * Because baseResultData and {@paramref testResultData} don't have sequence. When do the
-     * comparison, we will sort them first and then compare the inside data from them one by one.
-     */
-    private void testDiffUtil(DashboardData baseDashboardData, DashboardData diffDashboardData,
-            List<ListUpdateResult.ResultData> testResultData) {
-        final DiffUtil.DiffResult diffUtilResult = DiffUtil.calculateDiff(
-                new DashboardData.ItemsDataDiffCallback(
-                        baseDashboardData.getItemList(), diffDashboardData.getItemList()));
-
-        // Dispatch to listUpdateResult, then listUpdateResult will have result data
-        final ListUpdateResult listUpdateResult = new ListUpdateResult();
-        diffUtilResult.dispatchUpdatesTo(listUpdateResult);
-
-        final List<ListUpdateResult.ResultData> baseResultData = listUpdateResult.getResultData();
-        assertThat(testResultData.size()).isEqualTo(baseResultData.size());
-
-        // Sort them so we can compare them one by one using a for loop
-        Collections.sort(baseResultData);
-        Collections.sort(testResultData);
-        final int size = baseResultData.size();
-        for (int i = 0; i < size; i++) {
-            // Refer to equals method in ResultData
-            assertThat(baseResultData.get(i)).isEqualTo(testResultData.get(i));
-        }
-    }
-
-    /**
-     * This class contains the result about how the changes made to convert one
-     * list to another list. It implements ListUpdateCallback to record the result data.
-     */
-    private static class ListUpdateResult implements ListUpdateCallback {
-        final private List<ResultData> mResultData;
-
-        public ListUpdateResult() {
-            mResultData = new ArrayList<>();
-        }
-
-        public List<ResultData> getResultData() {
-            return mResultData;
-        }
-
-        @Override
-        public void onInserted(int position, int count) {
-            mResultData.add(new ResultData(ResultData.TYPE_OPERATION_INSERT, position, count));
-        }
-
-        @Override
-        public void onRemoved(int position, int count) {
-            mResultData.add(new ResultData(ResultData.TYPE_OPERATION_REMOVE, position, count));
-        }
-
-        @Override
-        public void onMoved(int fromPosition, int toPosition) {
-            mResultData.add(
-                    new ResultData(ResultData.TYPE_OPERATION_MOVE, fromPosition, toPosition));
-        }
-
-        @Override
-        public void onChanged(int position, int count, Object payload) {
-            mResultData.add(new ResultData(ResultData.TYPE_OPERATION_CHANGE, position, count));
-        }
-
-        /**
-         * This class contains general type and field to record the operation data generated
-         * in {@link ListUpdateCallback}. Please refer to {@link ListUpdateCallback} for more info.
-         * <p>
-         * The following are examples about the data stored in this class:
-         * <p>
-         * "The data starts from position(arg1) with count number(arg2) is changed(operation)"
-         * or "The data is moved(operation) from position1(arg1) to position2(arg2)"
-         */
-        private static class ResultData implements Comparable<ResultData> {
-            public static final int TYPE_OPERATION_INSERT = 0;
-            public static final int TYPE_OPERATION_REMOVE = 1;
-            public static final int TYPE_OPERATION_MOVE = 2;
-            public static final int TYPE_OPERATION_CHANGE = 3;
-
-            public final int operation;
-            public final int arg1;
-            public final int arg2;
-
-            public ResultData(int operation, int arg1, int arg2) {
-                this.operation = operation;
-                this.arg1 = arg1;
-                this.arg2 = arg2;
-            }
-
-            @Override
-            public boolean equals(Object obj) {
-                if (this == obj) {
-                    return true;
-                }
-
-                if (!(obj instanceof ResultData)) {
-                    return false;
-                }
-
-                ResultData targetData = (ResultData) obj;
-
-                return operation == targetData.operation && arg1 == targetData.arg1
-                        && arg2 == targetData.arg2;
-            }
-
-            @Override
-            public int compareTo(@NonNull ResultData resultData) {
-                if (this.operation != resultData.operation) {
-                    return operation - resultData.operation;
-                }
-
-                if (arg1 != resultData.arg1) {
-                    return arg1 - resultData.arg1;
-                }
-
-                return arg2 - resultData.arg2;
-            }
-
-            @Override
-            public String toString() {
-                return "op:" + operation + ",arg1:" + arg1 + ",arg2:" + arg2;
-            }
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
deleted file mode 100644
index 2791da3f6a7bc8239fd988c0d3e78627f3e9b1d1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Icon;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.CategoryManager;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowUserManager.class)
-public class DashboardFeatureProviderImplTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock
-    private CategoryManager mCategoryManager;
-    private FakeFeatureFactory mFeatureFactory;
-
-    private DashboardFeatureProviderImpl mImpl;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
-        mImpl = new DashboardFeatureProviderImpl(mActivity);
-    }
-
-    @Test
-    public void shouldHoldAppContext() {
-        assertThat(mImpl.mContext).isEqualTo(mActivity.getApplicationContext());
-    }
-
-    @Test
-    public void bindPreference_shouldBindAllData() {
-        final Preference preference = new Preference(
-                ShadowApplication.getInstance().getApplicationContext());
-        final Tile tile = new Tile();
-        tile.title = "title";
-        tile.summary = "summary";
-        tile.icon = Icon.createWithBitmap(Bitmap.createBitmap(1, 1, Bitmap.Config.RGB_565));
-        tile.metaData = new Bundle();
-        tile.metaData.putString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS, "HI");
-        tile.priority = 10;
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                preference, tile, "123", Preference.DEFAULT_ORDER);
-
-        assertThat(preference.getTitle()).isEqualTo(tile.title);
-        assertThat(preference.getSummary()).isEqualTo(tile.summary);
-        assertThat(preference.getIcon()).isNotNull();
-        assertThat(preference.getFragment())
-                .isEqualTo(tile.metaData.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS));
-        assertThat(preference.getOrder()).isEqualTo(-tile.priority);
-    }
-
-    @Test
-    public void bindPreference_noFragmentMetadata_shouldBindIntent() {
-        final Preference preference = new Preference(
-                ShadowApplication.getInstance().getApplicationContext());
-        final Tile tile = new Tile();
-        tile.metaData = new Bundle();
-        tile.priority = 10;
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                preference, tile, "123", Preference.DEFAULT_ORDER);
-
-        assertThat(preference.getFragment()).isNull();
-        assertThat(preference.getOnPreferenceClickListener()).isNotNull();
-        assertThat(preference.getOrder()).isEqualTo(-tile.priority);
-    }
-
-    @Test
-    public void bindPreference_noFragmentMetadata_shouldBindToProfileSelector() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.metaData = new Bundle();
-        tile.userHandle = new ArrayList<>();
-        tile.userHandle.add(mock(UserHandle.class));
-        tile.userHandle.add(mock(UserHandle.class));
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-
-        when(mActivity.getApplicationContext().getSystemService(Context.USER_SERVICE))
-                .thenReturn(mUserManager);
-
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                preference, tile, "123", Preference.DEFAULT_ORDER);
-        preference.getOnPreferenceClickListener().onPreferenceClick(null);
-
-        verify(mActivity).getFragmentManager();
-    }
-
-    @Test
-    public void bindPreference_noFragmentMetadataSingleUser_shouldBindToDirectLaunchIntent() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.metaData = new Bundle();
-        tile.userHandle = new ArrayList<>();
-        tile.userHandle.add(mock(UserHandle.class));
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-
-        when(mActivity.getSystemService(Context.USER_SERVICE))
-                .thenReturn(mUserManager);
-
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                preference, tile, "123", Preference.DEFAULT_ORDER);
-        preference.getOnPreferenceClickListener().onPreferenceClick(null);
-
-        verify(mFeatureFactory.metricsFeatureProvider).logDashboardStartIntent(
-                any(Context.class),
-                any(Intent.class),
-                eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES));
-        verify(mActivity)
-                .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
-    }
-
-    @Test
-    public void bindPreference_toInternalSettingActivity_shouldBindToDirectLaunchIntentAndNotLog() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.metaData = new Bundle();
-        tile.userHandle = new ArrayList<>();
-        tile.userHandle.add(mock(UserHandle.class));
-        tile.intent = new Intent();
-        tile.intent.setComponent(
-                new ComponentName(RuntimeEnvironment.application.getPackageName(), "class"));
-
-        when(mActivity.getSystemService(Context.USER_SERVICE))
-                .thenReturn(mUserManager);
-        when(mActivity.getApplicationContext().getPackageName())
-                .thenReturn(RuntimeEnvironment.application.getPackageName());
-
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                preference, tile, "123", Preference.DEFAULT_ORDER);
-        preference.getOnPreferenceClickListener().onPreferenceClick(null);
-        verify(mFeatureFactory.metricsFeatureProvider).logDashboardStartIntent(
-                any(Context.class),
-                any(Intent.class),
-                anyInt());
-        verify(mActivity)
-                .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
-    }
-
-    @Test
-    public void bindPreference_withNullKeyNullPriority_shouldGenerateKeyAndPriority() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
-                preference, tile, null /*key */, Preference.DEFAULT_ORDER);
-
-        assertThat(preference.getKey()).isNotNull();
-        assertThat(preference.getOrder()).isEqualTo(Preference.DEFAULT_ORDER);
-    }
-
-    @Test
-    public void bindPreference_noSummary_shouldSetSummaryToPlaceholder() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
-                preference, tile, null /*key */, Preference.DEFAULT_ORDER);
-
-        assertThat(preference.getSummary())
-                .isEqualTo(RuntimeEnvironment.application.getString(R.string.summary_placeholder));
-    }
-
-    @Test
-    public void bindPreference_hasSummary_shouldSetSummary() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.summary = "test";
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
-                preference, tile, null /*key */, Preference.DEFAULT_ORDER);
-
-        assertThat(preference.getSummary()).isEqualTo(tile.summary);
-    }
-
-    @Test
-    public void bindPreference_withNullKeyTileKey_shouldUseTileKey() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.key = "key";
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
-                preference, tile, null /* key */, Preference.DEFAULT_ORDER);
-
-        assertThat(preference.getKey()).isEqualTo(tile.key);
-    }
-
-    @Test
-    public void bindPreference_withBaseOrder_shouldOffsetPriority() {
-        final int baseOrder = 100;
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        final Tile tile = new Tile();
-        tile.metaData = new Bundle();
-        tile.priority = 10;
-        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
-                preference, tile, "123", baseOrder);
-
-        assertThat(preference.getOrder()).isEqualTo(-tile.priority + baseOrder);
-    }
-
-    @Test
-    public void bindPreference_withIntentActionMetatdata_shouldSetLaunchAction() {
-        Activity activity = Robolectric.buildActivity(Activity.class).get();
-        final ShadowApplication application = ShadowApplication.getInstance();
-        final Preference preference = new Preference(application.getApplicationContext());
-        final Tile tile = new Tile();
-        tile.key = "key";
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-        tile.metaData = new Bundle();
-        tile.metaData.putString("com.android.settings.intent.action", "TestAction");
-        tile.userHandle = null;
-        mImpl.bindPreferenceToTile(activity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                preference, tile, "123", Preference.DEFAULT_ORDER);
-        preference.performClick();
-        ShadowActivity shadowActivity = shadowOf(activity);
-
-        final Intent launchIntent = shadowActivity.getNextStartedActivityForResult().intent;
-        assertThat(launchIntent.getAction())
-                .isEqualTo("TestAction");
-        assertThat(launchIntent.getIntExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY, 0))
-                .isEqualTo(MetricsProto.MetricsEvent.SETTINGS_GESTURES);
-    }
-
-    @Test
-    public void clickPreference_withUnresolvableIntent_shouldNotLaunchAnything() {
-        ReflectionHelpers.setField(
-                mImpl, "mPackageManager", RuntimeEnvironment.getPackageManager());
-        Activity activity = Robolectric.buildActivity(Activity.class).get();
-        final ShadowApplication application = ShadowApplication.getInstance();
-        final Preference preference = new Preference(application.getApplicationContext());
-        final Tile tile = new Tile();
-        tile.key = "key";
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName("pkg", "class"));
-        tile.metaData = new Bundle();
-        tile.metaData.putString("com.android.settings.intent.action", "TestAction");
-        tile.userHandle = null;
-
-        mImpl.bindPreferenceToTile(activity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                preference, tile, "123", Preference.DEFAULT_ORDER);
-        preference.performClick();
-
-        final ShadowActivity.IntentForResult launchIntent =
-                shadowOf(activity).getNextStartedActivityForResult();
-
-        assertThat(launchIntent).isNull();
-    }
-
-    @Test
-    public void getPreferences_noCategory_shouldReturnNull() {
-        mImpl = new DashboardFeatureProviderImpl(mActivity);
-        ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
-        when(mCategoryManager.getTilesByCategory(mActivity, CategoryKey.CATEGORY_HOMEPAGE))
-                .thenReturn(null);
-
-        assertThat(mImpl.getPreferencesForCategory(null, null,
-                MetricsProto.MetricsEvent.SETTINGS_GESTURES, CategoryKey.CATEGORY_HOMEPAGE))
-                .isNull();
-    }
-
-    @Test
-    public void getPreferences_noTileForCategory_shouldReturnNull() {
-        mImpl = new DashboardFeatureProviderImpl(mActivity);
-        ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
-        when(mCategoryManager.getTilesByCategory(mActivity, CategoryKey.CATEGORY_HOMEPAGE))
-                .thenReturn(new DashboardCategory());
-
-        assertThat(mImpl.getPreferencesForCategory(null, null,
-                MetricsProto.MetricsEvent.SETTINGS_GESTURES, CategoryKey.CATEGORY_HOMEPAGE))
-                .isNull();
-    }
-
-    @Test
-    public void getPreferences_hasTileForCategory_shouldReturnPrefList() {
-        mImpl = new DashboardFeatureProviderImpl(mActivity);
-        ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
-        final DashboardCategory category = new DashboardCategory();
-        category.tiles.add(new Tile());
-        when(mCategoryManager
-                .getTilesByCategory(any(Context.class), eq(CategoryKey.CATEGORY_HOMEPAGE)))
-                .thenReturn(category);
-
-        assertThat(mImpl.getPreferencesForCategory(mActivity,
-                ShadowApplication.getInstance().getApplicationContext(),
-                MetricsProto.MetricsEvent.SETTINGS_GESTURES,
-                CategoryKey.CATEGORY_HOMEPAGE).isEmpty())
-                .isFalse();
-    }
-
-    @Test
-    public void testGetExtraIntentAction_shouldReturnNull() {
-        assertThat(mImpl.getExtraIntentAction()).isNull();
-    }
-
-    @Test
-    public void testShouldTintIcon_shouldReturnValueFromResource() {
-        final Resources res = mActivity.getApplicationContext().getResources();
-        when(res.getBoolean(R.bool.config_tintSettingIcon))
-                .thenReturn(false);
-        assertThat(mImpl.shouldTintIcon()).isFalse();
-
-        when(res.getBoolean(R.bool.config_tintSettingIcon))
-                .thenReturn(true);
-        assertThat(mImpl.shouldTintIcon()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
deleted file mode 100644
index 3d9783da2ed4ebfa4909d558acbe86d40aaca61b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.app.Fragment;
-import android.content.Context;
-
-import com.android.settings.search.DatabaseIndexingUtils;
-import com.android.settings.search.Indexable;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-public class DashboardFragmentSearchIndexProviderInspector {
-
-    public static boolean isSharingPreferenceControllers(Class clazz) {
-        final Context context = RuntimeEnvironment.application;
-        final Fragment fragment;
-        try {
-            fragment = Fragment.instantiate(context, clazz.getName());
-        } catch (Throwable e) {
-            // Can't do much with exception, assume the test passed.
-            return true;
-        }
-        if (!(fragment instanceof DashboardFragment)) {
-            return true;
-        }
-
-        final Indexable.SearchIndexProvider provider =
-                DatabaseIndexingUtils.getSearchIndexProvider(clazz);
-        if (provider == null) {
-            return true;
-        }
-        final List<AbstractPreferenceController> controllersFromSearchIndexProvider;
-        final List<AbstractPreferenceController> controllersFromFragment;
-        try {
-            controllersFromSearchIndexProvider = provider.getPreferenceControllers(context);
-        } catch (Throwable e) {
-            // Can't do much with exception, assume the test passed.
-            return true;
-        }
-        try {
-            controllersFromFragment =
-                    ((DashboardFragment) fragment).getPreferenceControllers(context);
-        } catch (Throwable e) {
-            // Can't do much with exception, assume the test passed.
-            return true;
-        }
-
-        if (controllersFromFragment == controllersFromSearchIndexProvider) {
-            return true;
-        } else if (controllersFromFragment != null && controllersFromSearchIndexProvider != null) {
-            return controllersFromFragment.size() == controllersFromSearchIndexProvider.size();
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
deleted file mode 100644
index ea160dd355ffd390adc1a989a25bbae52006824e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Icon;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.drawer.TileUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DashboardFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private DashboardCategory mDashboardCategory;
-    @Mock
-    private FakeFeatureFactory mFakeFeatureFactory;
-    @Mock
-    private ProgressiveDisclosureMixin mDisclosureMixin;
-    private TestFragment mTestFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFakeFeatureFactory = (FakeFeatureFactory) FeatureFactory.getFactory(mContext);
-        mDashboardCategory.tiles = new ArrayList<>();
-        mDashboardCategory.tiles.add(new Tile());
-        mTestFragment = new TestFragment(ShadowApplication.getInstance().getApplicationContext());
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getProgressiveDisclosureMixin(
-                nullable(Context.class), eq(mTestFragment), nullable(Bundle.class)))
-                .thenReturn(mDisclosureMixin);
-        when(mFakeFeatureFactory.dashboardFeatureProvider
-                .getTilesForCategory(nullable(String.class)))
-                .thenReturn(mDashboardCategory);
-        mTestFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
-        when(mContext.getPackageName()).thenReturn("TestPackage");
-    }
-
-    @Test
-    public void testPreferenceControllerGetterSetter_shouldAddAndGetProperly() {
-        final TestPreferenceController controller = new TestPreferenceController(mContext);
-        mTestFragment.addPreferenceController(controller);
-
-        final TestPreferenceController retrievedController = mTestFragment.getPreferenceController
-                (TestPreferenceController.class);
-
-        assertThat(controller).isSameAs(retrievedController);
-    }
-
-    @Test
-    public void displayTilesAsPreference_shouldAddTilesWithIntent() {
-        when(mFakeFeatureFactory.dashboardFeatureProvider
-                .getTilesForCategory(nullable(String.class)))
-                .thenReturn(mDashboardCategory);
-        when(mFakeFeatureFactory.dashboardFeatureProvider
-                .getDashboardKeyForTile(nullable(Tile.class)))
-                .thenReturn("test_key");
-        mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
-
-        verify(mDisclosureMixin).addPreference(nullable(PreferenceScreen.class),
-                nullable(Preference.class));
-    }
-
-    @Test
-    public void displayTilesAsPreference_shouldNotAddTilesWithoutIntent() {
-        mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
-
-        verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class));
-    }
-
-    @Test
-    public void displayTilesAsPreference_withEmptyCategory_shouldNotAddTiles() {
-        mDashboardCategory.tiles = null;
-        mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
-
-        verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class));
-    }
-
-    @Test
-    public void onAttach_shouldCreatePlaceholderPreferenceController() {
-        final AbstractPreferenceController controller = mTestFragment.getPreferenceController(
-                DashboardTilePlaceholderPreferenceController.class);
-
-        assertThat(controller).isNotNull();
-    }
-
-    @Test
-    public void updateState_skipUnavailablePrefs() {
-        final List<AbstractPreferenceController> preferenceControllers = mTestFragment.mControllers;
-        final AbstractPreferenceController mockController1 =
-                mock(AbstractPreferenceController.class);
-        final AbstractPreferenceController mockController2 =
-                mock(AbstractPreferenceController.class);
-        preferenceControllers.add(mockController1);
-        preferenceControllers.add(mockController2);
-        when(mockController1.isAvailable()).thenReturn(false);
-        when(mockController2.isAvailable()).thenReturn(true);
-
-        mTestFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
-        mTestFragment.onResume();
-
-        verify(mockController1, never()).getPreferenceKey();
-        verify(mockController2).getPreferenceKey();
-    }
-
-    @Test
-    public void tintTileIcon_hasMetadata_shouldReturnIconTintableMetadata() {
-        final Tile tile = new Tile();
-        tile.icon = mock(Icon.class);
-        final Bundle metaData = new Bundle();
-        tile.metaData = metaData;
-
-        metaData.putBoolean(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE, false);
-        assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
-
-        metaData.putBoolean(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE, true);
-        assertThat(mTestFragment.tintTileIcon(tile)).isTrue();
-    }
-
-    @Test
-    public void tintTileIcon_noIcon_shouldReturnFalse() {
-        final Tile tile = new Tile();
-        final Bundle metaData = new Bundle();
-        tile.metaData = metaData;
-
-        assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
-    }
-
-    @Test
-    public void tintTileIcon_noMetadata_shouldReturnPackageNameCheck() {
-        final Tile tile = new Tile();
-        tile.icon = mock(Icon.class);
-        final Intent intent = new Intent();
-        tile.intent = intent;
-
-        intent.setComponent(new ComponentName(
-                ShadowApplication.getInstance().getApplicationContext().getPackageName(),
-                "TestClass"));
-        assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
-
-        intent.setComponent(new ComponentName("OtherPackage", "TestClass"));
-        assertThat(mTestFragment.tintTileIcon(tile)).isTrue();
-    }
-
-    public static class TestPreferenceController extends AbstractPreferenceController
-            implements PreferenceControllerMixin {
-
-        public TestPreferenceController(Context context) {
-            super(context);
-        }
-
-        @Override
-        public boolean handlePreferenceTreeClick(Preference preference) {
-            return false;
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return false;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return null;
-        }
-
-        @Override
-        public void updateNonIndexableKeys(List<String> keys) {
-
-        }
-    }
-
-    public static class TestFragment extends DashboardFragment {
-
-        private final PreferenceManager mPreferenceManager;
-        private final Context mContext;
-        private final List<AbstractPreferenceController> mControllers;
-
-        public final PreferenceScreen mScreen;
-
-        public TestFragment(Context context) {
-            mContext = context;
-            mPreferenceManager = mock(PreferenceManager.class);
-            mScreen = mock(PreferenceScreen.class);
-            mControllers = new ArrayList<>();
-
-            when(mPreferenceManager.getContext()).thenReturn(mContext);
-            ReflectionHelpers.setField(
-                    this, "mVisibilityLoggerMixin", mock(VisibilityLoggerMixin.class));
-        }
-
-        @Override
-        public Context getContext() {
-            return mContext;
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-
-        @Override
-        public PreferenceScreen getPreferenceScreen() {
-            return mScreen;
-        }
-
-        @Override
-        protected String getLogTag() {
-            return "TEST_FRAG";
-        }
-
-        @Override
-        protected int getPreferenceScreenResId() {
-            return 0;
-        }
-
-        @Override
-        protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
-            return mControllers;
-        }
-
-        @Override
-        public PreferenceManager getPreferenceManager() {
-            return mPreferenceManager;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
deleted file mode 100644
index cda9a2269eb0b9571c6bdb25a230e9b16cd6e9d3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.content.Context;
-import android.widget.TextView;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SupportItemAdapter.ViewHolder;
-import com.android.settingslib.drawer.Tile;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DashboardItemAnimatorTest {
-
-    private DashboardItemAnimator mDashboardItemAnimator;
-    private ViewHolder mViewHolder;
-
-    @Before
-    public void SetUp() {
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mDashboardItemAnimator = new DashboardItemAnimator();
-        mViewHolder = new ViewHolder(new TextView(context));
-        mViewHolder.itemView.setTag(new Tile());
-    }
-
-    @Test
-    public void testAnimateChange_NoPositionChange_NoPendingAnimation() {
-        final boolean hasPendingAnimation = mDashboardItemAnimator
-                .animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
-        assertThat(hasPendingAnimation).isFalse();
-    }
-
-    @Test
-    public void testAnimateChange_HasPositionChange_HasPendingAnimation() {
-        final boolean hasPendingAnimation = mDashboardItemAnimator
-                .animateChange(mViewHolder, mViewHolder, 0, 0, 1, 1);
-        assertThat(hasPendingAnimation).isTrue();
-    }
-
-    @Test
-    public void testAnimateChange_HasRunningAnimationWhileNoPositionChange_NoPendingAnimation() {
-        // Set pending move animations
-        mDashboardItemAnimator.animateMove(mViewHolder, 0, 0, 1, 1);
-
-        final boolean hasPendingAnimation = mDashboardItemAnimator
-                .animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
-        assertThat(hasPendingAnimation).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
deleted file mode 100644
index f3ed57c2fb1867784ddb6eb58f7ffa7b8f21747a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.app.Activity;
-import android.support.v7.widget.LinearLayoutManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.conditional.ConditionManager;
-import com.android.settings.dashboard.conditional.FocusRecyclerView;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DashboardSummaryTest {
-
-    @Mock
-    private DashboardAdapter mAdapter;
-    @Mock
-    private DashboardFeatureProvider mDashboardFeatureProvider;
-    @Mock
-    private FocusRecyclerView mDashboard;
-    @Mock
-    private LinearLayoutManager mLayoutManager;
-    @Mock
-    private ConditionManager mConditionManager;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-
-    private DashboardSummary mSummary;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mSummary = spy(new DashboardSummary());
-        ReflectionHelpers.setField(mSummary, "mAdapter", mAdapter);
-        ReflectionHelpers.setField(mSummary, "mDashboardFeatureProvider",
-                mDashboardFeatureProvider);
-        ReflectionHelpers.setField(mSummary, "mDashboard", mDashboard);
-        ReflectionHelpers.setField(mSummary, "mLayoutManager", mLayoutManager);
-        ReflectionHelpers.setField(mSummary, "mConditionManager", mConditionManager);
-        ReflectionHelpers.setField(mSummary, "mSummaryLoader", mSummaryLoader);
-    }
-
-    @Test
-    public void updateCategoryAndSuggestion_shouldGetCategoryFromFeatureProvider() {
-        doReturn(mock(Activity.class)).when(mSummary).getActivity();
-        mSummary.updateCategoryAndSuggestion(null);
-
-        verify(mSummaryLoader).updateSummaryToCache(nullable(DashboardCategory.class));
-        verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
-    }
-
-    @Test
-    public void onConditionChanged_PositionAtTop_ScrollToTop() {
-        when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(1);
-        mSummary.onConditionsChanged();
-        mSummary.onConditionsChanged();
-        verify(mDashboard).scrollToPosition(0);
-    }
-
-    @Test
-    public void onConditionChanged_PositionNotTop_RemainPosition() {
-        when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(2);
-        mSummary.onConditionsChanged();
-        mSummary.onConditionsChanged();
-        verify(mDashboard, never()).scrollToPosition(0);
-    }
-
-    @Test
-    public void onConditionChanged_firstCall_shouldIgnore() {
-        mSummary.onConditionsChanged();
-        verify(mAdapter, never()).setConditions(any());
-    }
-
-    @Test
-    public void onConditionChanged_secondCall_shouldSetConditionsOnAdapter() {
-        mSummary.onConditionsChanged();
-        mSummary.onConditionsChanged();
-        verify(mAdapter).setConditions(any());
-    }
-
-    @Test
-    public void onCategoryChanged_noRebuildOnFirstCall() {
-        doReturn(mock(Activity.class)).when(mSummary).getActivity();
-        doNothing().when(mSummary).rebuildUI();
-        mSummary.onCategoriesChanged();
-        verify(mSummary, never()).rebuildUI();
-    }
-
-    @Test
-    public void onCategoryChanged_rebuildOnSecondCall() {
-        doReturn(mock(Activity.class)).when(mSummary).getActivity();
-        doNothing().when(mSummary).rebuildUI();
-        mSummary.onCategoriesChanged();
-        mSummary.onCategoriesChanged();
-        verify(mSummary).rebuildUI();
-    }
-
-    @Test
-    public void onSuggestionDismissed_shouldNotRebuildUI() {
-        mSummary.onSuggestionDismissed(mock(Tile.class));
-        verify(mSummary, never()).rebuildUI();
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
deleted file mode 100644
index c48f30ca742440ea6a5585d8ed910b0aad7e540e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DashboardTilePlaceholderPreferenceControllerTest {
-
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    private DashboardTilePlaceholderPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new DashboardTilePlaceholderPreferenceController(mContext);
-    }
-
-    @Test
-    public void display_hasPlaceholderPref_shouldUseOrderFromPlaceholder() {
-        final int baseOrder = 15;
-        when(mScreen.findPreference(anyString()).getOrder()).thenReturn(baseOrder);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mController.getOrder()).isEqualTo(baseOrder);
-    }
-
-    @Test
-    public void display_noPlaceholderPref_shouldUseDefaultOrder() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mController.getOrder()).isEqualTo(Preference.DEFAULT_ORDER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
deleted file mode 100644
index 6fe60cf5124040eebd98e536458c94b735f989c8..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.content.Context;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ProgressiveDisclosureTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceFragment mPreferenceFragment;
-    @Mock
-    private ExpandPreference mExpandButton;
-    private PreferenceScreen mScreen;
-    private Context mAppContext;
-    private Preference mPreference;
-    private ProgressiveDisclosureMixin mMixin;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mScreen = mPreferenceFragment.getPreferenceScreen();
-        mAppContext = ShadowApplication.getInstance().getApplicationContext();
-        mMixin = new ProgressiveDisclosureMixin(mAppContext,
-                mPreferenceFragment, false /* keepExpanded */);
-        ReflectionHelpers.setField(mMixin, "mExpandButton", mExpandButton);
-        mPreference = new Preference(mAppContext);
-        mPreference.setKey("test");
-    }
-
-    @Test
-    public void shouldNotCollapse_lessPreferenceThanLimit() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-
-        mMixin.setTileLimit(10);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
-    }
-
-    @Test
-    public void shouldNotCollapse_preferenceCountSameAsThreshold() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-
-        mMixin.setTileLimit(5);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
-    }
-
-    @Test
-    public void shouldNotCollapse_whenStartAsExpanded() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-
-        mMixin = new ProgressiveDisclosureMixin(mAppContext,
-                mPreferenceFragment, true /* keepExpanded */);
-        mMixin.setTileLimit(10);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
-    }
-
-    @Test
-    public void shouldCollapse_morePreferenceThanLimit() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-        mMixin.setTileLimit(3);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isTrue();
-    }
-
-    @Test
-    public void findPreference_prefInCollapsedList_shouldFindIt() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        mMixin.addToCollapsedList(mPreference);
-
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNotNull();
-        assertThat(pref).isSameAs(mPreference);
-    }
-
-    @Test
-    public void findPreference_prefOnScreen_shouldFindIt() {
-        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
-
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNotNull();
-        assertThat(pref).isSameAs(mPreference);
-    }
-
-    @Test
-    public void findPreference_prefNotInCollapsedListOrScreen_shouldNotFindIt() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNull();
-    }
-
-    @Test
-    public void findPreference_prefRemovedFromCollapsedList_shouldNotFindIt() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        mMixin.addToCollapsedList(mPreference);
-        mMixin.removePreference(mPreferenceFragment.getPreferenceScreen(), mPreference.getKey());
-
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNull();
-    }
-
-    @Test
-    public void findPreference_nestedPrefInCollapsedList_shouldFindIt() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        final PreferenceScreen prefGroup = spy(new PreferenceScreen(mAppContext, null));
-        when(prefGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        final Preference preference = mock(Preference.class);
-        when(preference.getKey()).thenReturn("TestKey");
-        prefGroup.addPreference(preference);
-        mMixin.addToCollapsedList(prefGroup);
-
-        Preference pref = mMixin.findPreference(mScreen, "TestKey");
-
-        assertThat(pref).isNotNull();
-        assertThat(pref).isSameAs(preference);
-    }
-
-    @Test
-    public void removePreference_shouldRemoveOnScreenPreference() {
-        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
-
-        mMixin.removePreference(mScreen, mPreference.getKey());
-
-        verify(mScreen).removePreference(mPreference);
-    }
-
-    @Test
-    public void removeLastPreference_shouldRemoveExpandButtonToo() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        mMixin.addToCollapsedList(mPreference);
-        // Collapsed
-        assertThat(mMixin.isCollapsed()).isTrue();
-
-        mMixin.removePreference(mScreen, mPreference.getKey());
-
-        // Removing expand button
-        verify(mScreen).removePreference(any(Preference.class));
-        // No longer collapsed
-        assertThat(mMixin.isCollapsed()).isFalse();
-    }
-
-    @Test
-    public void collapse_shouldDoNothingIfNotCollapsible() {
-        final PreferenceScreen screen = mPreferenceFragment.getPreferenceScreen();
-        when(screen.getPreferenceCount()).thenReturn(5);
-        mMixin.setTileLimit(15);
-
-        mMixin.collapse(screen);
-        assertThat(mMixin.isCollapsed()).isFalse();
-        verify(mExpandButton, never()).setSummary(nullable(String.class));
-        verify(screen, never()).addPreference(any(Preference.class));
-        verify(screen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void collapse_shouldRemovePrefAndAddExpandButton() {
-        final PreferenceScreen screen = mPreferenceFragment.getPreferenceScreen();
-        when(screen.getPreferenceCount()).thenReturn(5);
-        when(screen.getPreference(anyInt())).thenReturn(mPreference);
-        mMixin.setTileLimit(2);
-
-        mMixin.collapse(screen);
-
-        assertThat(mMixin.isCollapsed()).isTrue();
-        verify(mExpandButton, atLeastOnce()).setSummary(nullable(String.class));
-        verify(screen).addPreference(any(ExpandPreference.class));
-        verify(screen, times(3)).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void addToCollapsedList_shouldAddInOrder() {
-        final Preference pref1 = new Preference(mAppContext);
-        final Preference pref2 = new Preference(mAppContext);
-        pref1.setOrder(10);
-        pref2.setOrder(20);
-
-        // Pref1 has lower order than pref2, but add pref2 first. The collapsed list should maintain
-        // items in increasing order.
-        mMixin.addToCollapsedList(pref2);
-        mMixin.addToCollapsedList(pref1);
-
-        List<Preference> collapsedList = mMixin.getCollapsedPrefs();
-        assertThat(collapsedList.get(0)).isSameAs(pref1);
-        assertThat(collapsedList.get(1)).isSameAs(pref2);
-    }
-
-    @Test
-    public void addPreferenceWhenCollapsed_noPrefOnScreen_shouldAddToList() {
-        // Add something to collapsed list so we are in collapsed state.
-        mMixin.addToCollapsedList(new Preference(mAppContext));
-        assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
-
-        // Just 1 preference on screen: the more button
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        final Preference toBeAdded = new Preference(mAppContext);
-        toBeAdded.setOrder(100);
-        mMixin.addPreference(mScreen, toBeAdded);
-
-        // Should have 2 prefs in collapsed list now
-        assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(2);
-        assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(toBeAdded);
-    }
-
-    @Test
-    public void addPreferenceWhenCollapsed_prefOrderLessThanLastOnScreen_shouldAddToScreen() {
-        final Preference lastPref = new Preference(mAppContext);
-        lastPref.setOrder(100);
-        // Add something to collapsed list so we are in collapsed state.
-        mMixin.addToCollapsedList(new Preference(mAppContext));
-        verify(mExpandButton).setSummary(nullable(String.class));
-        assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
-
-        // 3 prefs on screen, 2 are real and the last one is more button.
-        when(mScreen.getPreferenceCount()).thenReturn(3);
-        when(mScreen.getPreference(1)).thenReturn(lastPref);
-
-        final Preference toBeAdded = new Preference(mAppContext);
-        toBeAdded.setOrder(50);
-        mMixin.addPreference(mScreen, toBeAdded);
-
-        verify(mScreen).removePreference(lastPref);
-        verify(mScreen).addPreference(toBeAdded);
-        assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(lastPref);
-    }
-
-    @Test
-    public void addPreferenceWhenCollapsed_prefOrderMoreThanLastOnScreen_shouldAddToList() {
-        final Preference lastPref = new Preference(mAppContext);
-        lastPref.setOrder(100);
-        // Add something to collapsed list so we are in collapsed state.
-        mMixin.addToCollapsedList(new Preference(mAppContext));
-        verify(mExpandButton).setSummary(nullable(String.class));
-        assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
-
-        // 3 prefs on screen, 2 are real and the last one is more button.
-        when(mScreen.getPreferenceCount()).thenReturn(3);
-        when(mScreen.getPreference(1)).thenReturn(lastPref);
-
-        final Preference toBeAdded = new Preference(mAppContext);
-        toBeAdded.setOrder(200);
-        mMixin.addPreference(mScreen, toBeAdded);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-        verify(mScreen, never()).addPreference(any(Preference.class));
-        verify(mExpandButton, times(2)).setSummary(nullable(String.class));
-        assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(toBeAdded);
-    }
-
-    @Test
-    public void updateExpandSummary_noPref_noSummary() {
-        mMixin.updateExpandButtonSummary();
-
-        verify(mExpandButton).setSummary(null);
-    }
-
-    @Test
-    public void updateExpandSummary_doNotIncludeEmptyPrefTitle() {
-        final Preference pref1 = new Preference(mAppContext);
-        pref1.setTitle("1");
-        final Preference pref2 = new Preference(mAppContext);
-        pref2.setTitle(null);
-        final Preference pref3 = new Preference(mAppContext);
-        pref3.setTitle("3");
-        final Preference pref4 = new Preference(mAppContext);
-        pref4.setTitle("");
-
-        mMixin.addToCollapsedList(pref1);
-        mMixin.addToCollapsedList(pref2);
-        mMixin.addToCollapsedList(pref3);
-        mMixin.addToCollapsedList(pref4);
-
-        verify(mExpandButton).setSummary("1, 3");
-    }
-
-    @Test
-    public void updateExapndSummary_singlePref_expandSummarySameAsPrefTitle() {
-        final String TEST = "test";
-        final Preference pref = new Preference(mAppContext);
-        pref.setTitle(TEST);
-
-        mMixin.addToCollapsedList(pref);
-        verify(mExpandButton).setSummary(TEST);
-    }
-
-    @Test
-    public void updateExapndSummary_multiPrefs_useCombinedPrefTitleAsSummary() {
-        final String TEST1 = "test1";
-        final String TEST2 = "test2";
-        final Preference pref1 = new Preference(mAppContext);
-        pref1.setTitle(TEST1);
-        final Preference pref2 = new Preference(mAppContext);
-        pref2.setTitle(TEST2);
-
-        mMixin.addToCollapsedList(pref1);
-        mMixin.addToCollapsedList(pref2);
-
-        verify(mExpandButton)
-                .setSummary(mAppContext.getString(R.string.join_many_items_middle, TEST1, TEST2));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
deleted file mode 100644
index 146be9c7acb7698ab62e9f50df15c47cf120f483..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SummaryLoaderTest {
-
-    private static final String SUMMARY_1 = "summary1";
-    private static final String SUMMARY_2 = "summary2";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private SummaryLoader mSummaryLoader;
-    private boolean mCallbackInvoked;
-    private Tile mTile;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void SetUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
-
-        mTile = new Tile();
-        mTile.summary = SUMMARY_1;
-        mCallbackInvoked = false;
-
-        final Activity activity = Robolectric.buildActivity(Activity.class).get();
-        final List<DashboardCategory> categories = new ArrayList<>();
-        mSummaryLoader = new SummaryLoader(activity, categories);
-        mSummaryLoader.setSummaryConsumer(new SummaryLoader.SummaryConsumer() {
-            @Override
-            public void notifySummaryChanged(Tile tile) {
-                mCallbackInvoked = true;
-            }
-        });
-    }
-
-    @Test
-    public void testUpdateSummaryIfNeeded_SummaryIdentical_NoCallback() {
-        mSummaryLoader.updateSummaryIfNeeded(mTile, SUMMARY_1);
-
-        assertThat(mCallbackInvoked).isFalse();
-    }
-
-    @Test
-    public void testUpdateSummaryIfNeeded_SummaryChanged_HasCallback() {
-        mSummaryLoader.updateSummaryIfNeeded(mTile, SUMMARY_2);
-
-        assertThat(mCallbackInvoked).isTrue();
-    }
-
-    @Test
-    public void testUpdateSummaryToCache_hasCache_shouldUpdate() {
-
-        final String testSummary = "test_summary";
-        final DashboardCategory category = new DashboardCategory();
-        final Tile tile = new Tile();
-        tile.key = "123";
-        tile.intent = new Intent();
-        category.addTile(tile);
-        when(mFeatureFactory.dashboardFeatureProvider.getDashboardKeyForTile(tile))
-                .thenReturn(tile.key);
-
-        mSummaryLoader.updateSummaryIfNeeded(tile, testSummary);
-        tile.summary = null;
-        mSummaryLoader.updateSummaryToCache(category);
-
-        assertThat(tile.summary).isEqualTo(testSummary);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
deleted file mode 100644
index 3dd526672396b8a54c1397627eb8c2a333a42a9e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.accounts.Account;
-import android.app.Activity;
-import android.content.Intent;
-import android.provider.Settings;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.dashboard.SupportItemAdapter.EscalationData;
-import com.android.settings.overlay.SupportFeatureProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SupportItemAdapterTest {
-    private static final String ACCOUNT_TYPE = "com.google";
-    private final Account USER_1 = new Account("user1", ACCOUNT_TYPE);
-    private final Account USER_2 = new Account("user2", ACCOUNT_TYPE);
-    private final Account TWO_ACCOUNTS[] = {USER_1, USER_2};
-    private final Account ONE_ACCOUNT[] = {USER_1};
-    private final Account ZERO_ACCOUNT[] = {};
-
-    private ShadowActivity mShadowActivity;
-    private Activity mActivity;
-    private SupportItemAdapter mSupportItemAdapter;
-    private SupportItemAdapter.ViewHolder mViewHolder;
-    @Mock
-    private SupportFeatureProvider mSupportFeatureProvider;
-    @Mock
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = Robolectric.setupActivity(Activity.class);
-        mShadowActivity = shadowOf(mActivity);
-
-        final View itemView = LayoutInflater.from(mActivity).inflate(
-                R.layout.support_escalation_options, null);
-        mViewHolder = new SupportItemAdapter.ViewHolder(itemView);
-
-        // Mock this to prevent crash in testing
-        when(mSupportFeatureProvider.getAccountLoginIntent()).thenReturn(
-                new Intent(Settings.ACTION_ADD_ACCOUNT));
-    }
-
-    @Test
-    public void testBindAccountPicker_TwoAccounts_ShouldHaveTwoAccounts() {
-        testBindAccountPickerInner(mViewHolder, TWO_ACCOUNTS);
-    }
-
-    @Test
-    public void testBindAccountPicker_OneAccount_ShouldHaveOneAccount() {
-        testBindAccountPickerInner(mViewHolder, ONE_ACCOUNT);
-    }
-
-    @Test
-    public void testOnSpinnerItemClick_AddAccountClicked_AccountLoginIntentInvoked() {
-        bindAccountPickerInner(mViewHolder, TWO_ACCOUNTS);
-
-        final Spinner spinner = (Spinner) mViewHolder.itemView.findViewById(R.id.account_spinner);
-        spinner.setSelection(TWO_ACCOUNTS.length);
-
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(mSupportFeatureProvider).getAccountLoginIntent();
-    }
-
-    @Test
-    public void testSetAccount_AccountEmpty_NotCrash() {
-        when(mSupportFeatureProvider.getSupportEligibleAccounts(mActivity)).thenReturn(
-                ZERO_ACCOUNT);
-        mSupportItemAdapter = new SupportItemAdapter(mActivity, null, mSupportFeatureProvider,
-                mMetricsFeatureProvider, null);
-
-        // Should not crash in this method
-        mSupportItemAdapter.setAccounts(ONE_ACCOUNT);
-
-        verify(mSupportFeatureProvider).getSupportEligibleAccounts(mActivity);
-    }
-
-    @Test
-    public void testRefreshData_CardUpdatedOnEnteringOrLeavingSupportHours() {
-        // pretend we have support right now
-        when(mSupportFeatureProvider.isSupportTypeEnabled(any(), anyInt()))
-                .thenReturn(true);
-        when(mSupportFeatureProvider.isOperatingNow(anyInt())).thenReturn(true);
-        when(mSupportFeatureProvider.getSupportEligibleAccounts(any())).thenReturn(ONE_ACCOUNT);
-        mSupportItemAdapter = new SupportItemAdapter(mActivity, null, mSupportFeatureProvider,
-                mMetricsFeatureProvider, null);
-
-        // If this doesn't return escalation data something has gone wrong
-        EscalationData data = (EscalationData) mSupportItemAdapter.getSupportData().get(0);
-
-        // precondition, support is enabled
-        assertThat(data.enabled1).isTrue();
-
-        // pretend we support hours are over
-        when(mSupportFeatureProvider.isOperatingNow(anyInt())).thenReturn(false);
-        mSupportItemAdapter.refreshData();
-        data = (EscalationData) mSupportItemAdapter.getSupportData().get(0);
-
-        assertThat(data.enabled1).isFalse();
-
-        // pretend support hours have started again
-        when(mSupportFeatureProvider.isOperatingNow(anyInt())).thenReturn(true);
-        mSupportItemAdapter.refreshData();
-        data = (EscalationData) mSupportItemAdapter.getSupportData().get(0);
-
-        assertThat(data.enabled1).isTrue();
-    }
-
-    /**
-     * Check after {@link SupportItemAdapter#bindAccountPicker(SupportItemAdapter.ViewHolder)} is
-     * invoked, whether the spinner in {@paramref viewHolder} has all the data from {@paramref
-     * accounts}
-     *
-     * @param viewHolder holds the view that contains the spinner to test
-     * @param accounts holds the accounts info to be showed in spinner.
-     */
-    private void testBindAccountPickerInner(SupportItemAdapter.ViewHolder viewHolder,
-            Account accounts[]) {
-        bindAccountPickerInner(viewHolder, accounts);
-
-        final Spinner spinner = (Spinner) viewHolder.itemView.findViewById(R.id.account_spinner);
-        final SpinnerAdapter adapter = spinner.getAdapter();
-
-        // Contains "Add account" option, so should be 'count+1'
-        assertThat(adapter.getCount()).isEqualTo(accounts.length + 1);
-        for (int i = 0; i < accounts.length; i++) {
-            assertThat(adapter.getItem(i)).isEqualTo(accounts[i].name);
-        }
-    }
-
-    /**
-     * Create {@link SupportItemAdapter} and bind the account picker view into
-     * {@paramref viewholder}
-     *
-     * @param viewHolder holds the view that contains the spinner to test
-     * @param accounts holds the accounts info to be showed in spinner.
-     */
-    private void bindAccountPickerInner(SupportItemAdapter.ViewHolder viewHolder,
-            Account accounts[]) {
-        when(mSupportFeatureProvider.getSupportEligibleAccounts(mActivity)).thenReturn(accounts);
-        mSupportItemAdapter = new SupportItemAdapter(mActivity, null, mSupportFeatureProvider,
-                mMetricsFeatureProvider, null);
-
-        mSupportItemAdapter.bindAccountPicker(viewHolder);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
deleted file mode 100644
index d943fe3ec7442be1fc999317a4c5cb5bd91f1532..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.DashboardAdapter;
-import com.android.settings.dashboard.DashboardData;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ConditionAdapterTest {
-    @Mock
-    private Condition mCondition1;
-    @Mock
-    private Condition mCondition2;
-
-    private Context mContext;
-    private ConditionAdapter mConditionAdapter;
-    private List<Condition> mOneCondition;
-    private List<Condition> mTwoConditions;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        final CharSequence[] actions = new CharSequence[2];
-        when(mCondition1.getActions()).thenReturn(actions);
-        when(mCondition1.shouldShow()).thenReturn(true);
-        mOneCondition = new ArrayList<>();
-        mOneCondition.add(mCondition1);
-        mTwoConditions = new ArrayList<>();
-        mTwoConditions.add(mCondition1);
-        mTwoConditions.add(mCondition2);
-    }
-
-    @Test
-    public void getItemCount_notFullyExpanded_shouldReturn0() {
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mOneCondition, DashboardData.HEADER_MODE_DEFAULT);
-        assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
-
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
-        assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
-
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mOneCondition, DashboardData.HEADER_MODE_COLLAPSED);
-        assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void getItemCount_fullyExpanded_shouldReturnListSize() {
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mOneCondition, DashboardData.HEADER_MODE_FULLY_EXPANDED);
-        assertThat(mConditionAdapter.getItemCount()).isEqualTo(1);
-
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
-        assertThat(mConditionAdapter.getItemCount()).isEqualTo(2);
-    }
-
-    @Test
-    public void getItemViewType_shouldReturnConditionTile() {
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
-        assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile);
-    }
-
-    @Test
-    public void onBindViewHolder_shouldSetListener() {
-        final View view = LayoutInflater.from(mContext).inflate(
-            R.layout.condition_tile, new LinearLayout(mContext), true);
-        final DashboardAdapter.DashboardItemHolder viewHolder =
-            new DashboardAdapter.DashboardItemHolder(view);
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
-
-        mConditionAdapter.onBindViewHolder(viewHolder, 0);
-        final View card = view.findViewById(R.id.content);
-        assertThat(card.hasOnClickListeners()).isTrue();
-    }
-
-    @Test
-    public void viewClick_shouldInvokeConditionPrimaryClick() {
-        final View view = LayoutInflater.from(mContext).inflate(
-            R.layout.condition_tile, new LinearLayout(mContext), true);
-        final DashboardAdapter.DashboardItemHolder viewHolder =
-            new DashboardAdapter.DashboardItemHolder(view);
-        mConditionAdapter = new ConditionAdapter(
-            mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
-
-        mConditionAdapter.onBindViewHolder(viewHolder, 0);
-        final View card = view.findViewById(R.id.content);
-        card.performClick();
-        verify(mCondition1).onPrimaryClick();
-    }
-
-    @Test
-    public void onSwiped_nullCondition_shouldNotCrash() {
-        final RecyclerView recyclerView = new RecyclerView(mContext);
-        final View view = LayoutInflater.from(mContext).inflate(
-                R.layout.condition_tile, new LinearLayout(mContext), true);
-        final DashboardAdapter.DashboardItemHolder viewHolder =
-                new DashboardAdapter.DashboardItemHolder(view);
-        mConditionAdapter = new ConditionAdapter(
-                mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
-        mConditionAdapter.addDismissHandling(recyclerView);
-
-        // do not bind viewholder to simulate the null condition scenario
-        mConditionAdapter.mSwipeCallback.onSwiped(viewHolder, 0);
-        // no crash
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
deleted file mode 100644
index d077e6fcd7791c905dff276fe04829bda402917a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.graphics.drawable.Icon;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.RuntimeEnvironment;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ConditionTest {
-
-    @Mock
-    private ConditionManager mConditionManager;
-    @Mock
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    private Context mContext;
-    private TestCondition mCondition;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mCondition = new TestCondition(mConditionManager, mMetricsFeatureProvider);
-        when(mConditionManager.getContext()).thenReturn(mContext);
-    }
-
-    @Test
-    public void initialize_shouldNotBeSilenced() {
-        assertThat(mCondition.isSilenced()).isFalse();
-    }
-
-    @Test
-    public void silence_shouldNotifyDataChangeAndLog() {
-        mCondition.silence();
-
-        assertThat(mCondition.isSilenced()).isTrue();
-        verify(mConditionManager).notifyChanged(mCondition);
-        verify(mMetricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_DISMISS),
-                eq(TestCondition.TEST_METRIC_CONSTANT));
-    }
-
-    @Test
-    public void onSilenceChanged_silenced_shouldRegisterReceiver() {
-        mCondition.onSilenceChanged(true);
-
-        verify(mContext).registerReceiver(
-            TestCondition.mReceiver, TestCondition.TESTS_INTENT_FILTER);
-    }
-
-    @Test
-    public void onSilenceChanged_notSilenced_registered_shouldUnregisterReceiver() {
-        mCondition.onSilenceChanged(true);
-
-        mCondition.onSilenceChanged(false);
-
-        verify(mContext).unregisterReceiver(TestCondition.mReceiver);
-    }
-
-    @Test
-    public void onSilenceChanged_notSilenced_notRegistered_shouldNotCrash() {
-        mCondition.onSilenceChanged(false);
-
-        verify(mContext, never()).unregisterReceiver(TestCondition.mReceiver);
-        // no crash
-    }
-
-    private static final class TestCondition extends Condition {
-
-        private static final int TEST_METRIC_CONSTANT = 1234;
-        private static final IntentFilter TESTS_INTENT_FILTER = new IntentFilter("TestIntent");
-        private static final BroadcastReceiver mReceiver = mock(BroadcastReceiver.class);
-
-        TestCondition(ConditionManager manager,
-                MetricsFeatureProvider metricsFeatureProvider) {
-            super(manager, metricsFeatureProvider);
-        }
-
-        @Override
-        public void refreshState() {
-
-        }
-
-        @Override
-        public int getMetricsConstant() {
-            return TEST_METRIC_CONSTANT;
-        }
-
-        @Override
-        public Icon getIcon() {
-            return null;
-        }
-
-        @Override
-        public CharSequence getTitle() {
-            return null;
-        }
-
-        @Override
-        public CharSequence getSummary() {
-            return null;
-        }
-
-        @Override
-        public CharSequence[] getActions() {
-            return new CharSequence[0];
-        }
-
-        @Override
-        public void onPrimaryClick() {
-
-        }
-
-        @Override
-        public void onActionClick(int index) {
-
-        }
-
-        @Override
-        public BroadcastReceiver getReceiver() {
-            return mReceiver;
-        }
-
-        @Override
-        public IntentFilter getIntentFilter() {
-            return TESTS_INTENT_FILTER;
-        }
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
deleted file mode 100644
index e46ae9ef68af627fa2151d6cc3ef299f23942043..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DndConditionTest {
-
-    @Mock
-    private ConditionManager mConditionManager;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mConditionManager.getContext()).thenReturn(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-    }
-
-    @Test
-    public void constructor_shouldNotDisableReceiver() {
-        DndCondition condition = new DndCondition(mConditionManager);
-        verify(mPackageManager, never()).setComponentEnabledSetting(any(ComponentName.class),
-            eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED), eq(PackageManager.DONT_KILL_APP));
-    }
-
-    @Test
-    public void constructor_shouldRegisterReceiver() {
-        DndCondition condition = new DndCondition(mConditionManager);
-        verify(mContext).registerReceiver(any(DndCondition.Receiver.class),
-            eq(DndCondition.DND_FILTER));
-    }
-
-    @Test
-    public void silence_shouldNotDisableReceiver() {
-        DndCondition condition = new DndCondition(mConditionManager);
-        condition.silence();
-
-        verify(mPackageManager, never()).setComponentEnabledSetting(any(ComponentName.class),
-            eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED), eq(PackageManager.DONT_KILL_APP));
-    }
-
-    @Test
-    public void onResume_shouldRegisterReceiver() {
-        DndCondition condition = new DndCondition(mConditionManager);
-        condition.onPause();
-        condition.onResume();
-
-        // one from constructor, one from onResume()
-        verify(mContext, times(2)).registerReceiver(any(DndCondition.Receiver.class),
-            eq(DndCondition.DND_FILTER));
-    }
-
-    @Test
-    public void onPause_shouldUnregisterReceiver() {
-        DndCondition condition = new DndCondition(mConditionManager);
-        condition.onPause();
-
-        verify(mContext).unregisterReceiver(any(DndCondition.Receiver.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
deleted file mode 100644
index 114ee2b0cfbf514ca0db74cc0dada20d48775437..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.dashboard.suggestions;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EventStoreTest {
-
-    private EventStore mEventStore;
-
-    @Before
-    public void setUp() {
-        mEventStore = new EventStore(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void testWriteRead() {
-        mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
-        long timeMs = System.currentTimeMillis();
-        assertThat(mEventStore.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_COUNT))
-            .isEqualTo(1);
-        assertThat(Math.abs(timeMs - mEventStore
-            .readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_LAST_EVENT_TIME)) < 10000)
-            .isTrue();
-    }
-
-    @Test
-    public void testWriteRead_shouldHaveLatestValues() {
-        mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
-        mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
-        assertThat(
-            mEventStore.readMetric("pkg", EventStore.EVENT_DISMISSED, EventStore.METRIC_COUNT))
-            .isEqualTo(2);
-    }
-
-    @Test
-    public void testWriteRead_shouldReturnDefaultIfNotAvailable() {
-        assertThat(mEventStore.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_COUNT))
-            .isEqualTo(0);
-        assertThat(
-            mEventStore
-                .readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_LAST_EVENT_TIME))
-            .isEqualTo(0);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
deleted file mode 100644
index bd3650b74a7981cc2429c0589f1b8b35a43480c8..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard.suggestions;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Icon;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ContextThemeWrapper;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RemoteViews;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.DashboardAdapter;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.drawer.Tile;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SuggestionAdapterTest {
-    @Mock
-    private Tile mSuggestion1;
-    @Mock
-    private Tile mSuggestion2;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SettingsActivity mActivity;
-
-    private Context mContext;
-    private SuggestionAdapter mSuggestionAdapter;
-    private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
-    private List<Tile> mOneSuggestion;
-    private List<Tile> mTwoSuggestions;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        FakeFeatureFactory.setupForTest(mActivity);
-
-        mSuggestion1.title = "Test Suggestion 1";
-        mSuggestion1.icon = mock(Icon.class);
-        mSuggestion2.title = "Test Suggestion 2";
-        mSuggestion2.icon = mock(Icon.class);
-        mOneSuggestion = new ArrayList<>();
-        mOneSuggestion.add(mSuggestion1);
-        mTwoSuggestions = new ArrayList<>();
-        mTwoSuggestions.add(mSuggestion1);
-        mTwoSuggestions.add(mSuggestion2);
-    }
-
-    @Test
-    public void getItemCount_shouldReturnListSize() {
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
-        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
-
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mTwoSuggestions, new ArrayList<>());
-        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
-    }
-
-    @Test
-    public void getItemViewType_shouldReturnSuggestionTile() {
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
-        assertThat(mSuggestionAdapter.getItemViewType(0))
-            .isEqualTo(R.layout.suggestion_tile);
-    }
-
-    @Test
-    public void onBindViewHolder_shouldSetListener() {
-        final View view = spy(LayoutInflater.from(mContext).inflate(
-            R.layout.suggestion_tile, new LinearLayout(mContext), true));
-        mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
-
-        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
-        verify(view).setOnClickListener(any(View.OnClickListener.class));
-    }
-
-    @Test
-    public void onBindViewHolder_shouldInflateRemoteView() {
-        List<Tile> packages = makeSuggestions("pkg1");
-        RemoteViews remoteViews = mock(RemoteViews.class);
-        TextView textView = new TextView(RuntimeEnvironment.application);
-        doReturn(textView).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
-        packages.get(0).remoteViews = remoteViews;
-        setupSuggestions(mActivity, packages);
-
-        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
-        assertThat(textView.getParent()).isSameAs(mSuggestionHolder.itemView);
-        mSuggestionHolder.itemView.performClick();
-
-        verify(mActivity).startSuggestion(any(Intent.class));
-    }
-
-    @Test
-    public void onBindViewHolder_primaryViewShouldHandleClick() {
-        Context context =
-                new ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_Settings);
-
-        List<Tile> packages = makeSuggestions("pkg1");
-        RemoteViews remoteViews = mock(RemoteViews.class);
-        FrameLayout layout = new FrameLayout(context);
-        Button primary = new Button(context);
-        primary.setId(android.R.id.primary);
-        layout.addView(primary);
-        doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
-        packages.get(0).remoteViews = remoteViews;
-        setupSuggestions(mActivity, packages);
-
-        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-        mSuggestionHolder.itemView.performClick();
-
-        assertThat(ShadowApplication.getInstance().getNextStartedActivity()).isNull();
-        verify(mActivity, never()).startSuggestion(any(Intent.class));
-
-        primary.performClick();
-
-        verify(mActivity).startSuggestion(any(Intent.class));
-    }
-
-    @Test
-    public void onBindViewHolder_viewsShouldClearOnRebind() {
-        Context context =
-                new ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_Settings);
-
-        List<Tile> packages = makeSuggestions("pkg1");
-        RemoteViews remoteViews = mock(RemoteViews.class);
-        FrameLayout layout = new FrameLayout(context);
-        Button primary = new Button(context);
-        primary.setId(android.R.id.primary);
-        layout.addView(primary);
-        doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
-        packages.get(0).remoteViews = remoteViews;
-        setupSuggestions(mActivity, packages);
-
-        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
-        ViewGroup itemView = (ViewGroup) mSuggestionHolder.itemView;
-        assertThat(itemView.getChildCount()).isEqualTo(1);
-    }
-
-    private void setupSuggestions(Context context, List<Tile> suggestions) {
-        mSuggestionAdapter = new SuggestionAdapter(context, suggestions, new ArrayList<>());
-        mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
-                new FrameLayout(RuntimeEnvironment.application),
-                mSuggestionAdapter.getItemViewType(0));
-    }
-
-    private List<Tile> makeSuggestions(String... pkgNames) {
-        final List<Tile> suggestions = new ArrayList<>();
-        for (String pkgName : pkgNames) {
-            Tile suggestion = new Tile();
-            suggestion.intent = new Intent("action");
-            suggestion.intent.setComponent(new ComponentName(pkgName, "cls"));
-            suggestions.add(suggestion);
-            suggestion.icon = mock(Icon.class);
-        }
-        return suggestions;
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
deleted file mode 100644
index ca9faf56d51171df28ed1eefb5c241757d8197b5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.suggestions;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.suggestions.SuggestionParser;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SuggestionDismissControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private RecyclerView mRecyclerView;
-    @Mock
-    private SuggestionParser mSuggestionParser;
-    @Mock
-    private SuggestionDismissController.Callback mCallback;
-
-    private FakeFeatureFactory mFactory;
-    private SuggestionDismissController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        when(mRecyclerView.getResources().getDimension(anyInt())).thenReturn(50F);
-
-        mController = new SuggestionDismissController(mContext, mRecyclerView,
-                mSuggestionParser, mCallback);
-    }
-
-    @Test
-    public void onMove_alwaysReturnTrue() {
-        assertThat(mController.onMove(null, null, null)).isTrue();
-    }
-
-    @Test
-    public void getSwipeDirs_isSuggestionTile_shouldReturnDirection() {
-        final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile);
-
-        assertThat(mController.getSwipeDirs(mRecyclerView, vh))
-                .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
-    }
-
-    @Test
-    public void getSwipeDirs_isSuggestionTileCard_shouldReturnDirection() {
-        final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_remote_container);
-
-        assertThat(mController.getSwipeDirs(mRecyclerView, vh))
-                .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
-    }
-
-    @Test
-    public void getSwipeDirs_isNotSuggestionTile_shouldReturn0() {
-        final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.condition_tile);
-
-        assertThat(mController.getSwipeDirs(mRecyclerView, vh))
-                .isEqualTo(0);
-    }
-
-    @Test
-    public void onSwiped_shouldTriggerDismissSuggestion() {
-        final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-
-        mController.onSwiped(vh, ItemTouchHelper.START);
-
-        verify(mFactory.suggestionsFeatureProvider).dismissSuggestion(
-                eq(mContext), eq(mSuggestionParser), nullable(Tile.class));
-        verify(mCallback).onSuggestionDismissed(nullable(Tile.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
deleted file mode 100644
index 82bef2d8bbd8207b6d2416b904735b71a8277be6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.suggestions;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.app.ActivityManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
-import android.provider.Settings.Secure;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
-import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
-import com.android.settings.Settings.DoubleTapPowerSuggestionActivity;
-import com.android.settings.Settings.DoubleTwistSuggestionActivity;
-import com.android.settings.Settings.NightDisplaySuggestionActivity;
-import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.gestures.DoubleTapPowerSettings;
-import com.android.settings.gestures.DoubleTapScreenSettings;
-import com.android.settings.gestures.PickupGestureSettings;
-import com.android.settings.gestures.SwipeToNotificationSettings;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.suggestions.SuggestionParser;
-
-import java.time.LocalDateTime;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {ShadowSecureSettings.class, SettingsShadowResources.class}
-)
-public class SuggestionFeatureProviderImplTest {
-
-    private static final String DOUBLE_TWIST_SENSOR_NAME = "double_twist_sensor_name";
-    private static final String DOUBLE_TWIST_SENSOR_VENDOR = "double_twist_sensor_vendor";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private SuggestionParser mSuggestionParser;
-    @Mock
-    private Tile mSuggestion;
-    @Mock
-    private ActivityManager mActivityManager;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private FingerprintManager mFingerprintManager;
-    @Mock
-    private SharedPreferences mSharedPreferences;
-    @Captor
-    private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
-
-    private FakeFeatureFactory mFactory;
-    private SuggestionFeatureProviderImpl mProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        // Explicit casting to object due to MockitoCast bug
-        when((Object) mContext.getSystemService(FingerprintManager.class))
-                .thenReturn(mFingerprintManager);
-        when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.ACTIVITY_SERVICE)).thenReturn(mActivityManager);
-        when(mActivityManager.isLowRamDevice()).thenReturn(false);
-
-        mSuggestion.intent = new Intent().setClassName("pkg", "cls");
-        mSuggestion.category = "category";
-
-        mProvider = new SuggestionFeatureProviderImpl(mContext);
-    }
-
-    @Test
-    public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        DoubleTapPowerSuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionCompleted_doubleTapPower_falseWhenNotVisited() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
-        // No stored value in shared preferences if not visited yet.
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        DoubleTapPowerSuggestionActivity.class))).isFalse();
-    }
-
-    @Test
-    public void isSuggestionCompleted_doubleTapPower_trueWhenVisited() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
-        mProvider.getSharedPrefs(RuntimeEnvironment.application).edit().putBoolean(
-                DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        DoubleTapPowerSuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionCompleted_doubleTwist_trueWhenNotAvailable() {
-        SettingsShadowResources.overrideResource(
-                R.string.gesture_double_twist_sensor_name, "nonexistant name");
-        SettingsShadowResources.overrideResource(
-                R.string.gesture_double_twist_sensor_vendor, "nonexistant vendor");
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        DoubleTwistSuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionCompleted_ambientDisplay_falseWhenNotVisited() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_dozeComponent, "foo");
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_dozeDoubleTapSensorType, "bar");
-        // No stored value in shared preferences if not visited yet.
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        AmbientDisplaySuggestionActivity.class))).isFalse();
-    }
-
-    @Test
-    public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_dozeComponent, "foo");
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_dozeDoubleTapSensorType, "bar");
-        mProvider.getSharedPrefs(RuntimeEnvironment.application).edit().putBoolean(
-                DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        AmbientDisplaySuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionCompleted_ambientDisplayPickup_falseWhenNotVisited() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_dozeComponent, "foo");
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_dozePulsePickup, true);
-        // No stored value in shared preferences if not visited yet.
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        AmbientDisplaySuggestionActivity.class))).isFalse();
-    }
-
-    @Test
-    public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_dozeComponent, "foo");
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_dozePulsePickup, true);
-        mProvider.getSharedPrefs(RuntimeEnvironment.application).edit().putBoolean(
-                PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
-
-        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
-                new ComponentName(RuntimeEnvironment.application,
-                        AmbientDisplayPickupSuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionCompleted_swipeToNotification_trueWhenNotHardwareNotAvailable() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
-                .thenReturn(true);
-
-        assertThat(mProvider.isSuggestionCompleted(mContext,
-                new ComponentName(mContext, SwipeToNotificationSuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionCompleted_swipeToNotification_trueWhenNotAvailable() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
-                .thenReturn(false);
-
-        assertThat(mProvider.isSuggestionCompleted(mContext,
-                new ComponentName(mContext, SwipeToNotificationSuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionCompleted_swipeToNotification_falseWhenNotVisited() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
-                .thenReturn(true);
-        // No stored value in shared preferences if not visited yet.
-
-        assertThat(mProvider.isSuggestionCompleted(mContext,
-                new ComponentName(mContext,
-                        SwipeToNotificationSuggestionActivity.class))).isFalse();
-    }
-
-    @Test
-    public void isSuggestionCompleted_swipeToNotification_trueWhenVisited() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
-                .thenReturn(true);
-        when(mContext.getSharedPreferences(anyString(), anyInt())).thenReturn(mSharedPreferences);
-        when(mSharedPreferences.getBoolean(
-                SwipeToNotificationSettings.PREF_KEY_SUGGESTION_COMPLETE, false)).thenReturn(true);
-
-        assertThat(mProvider.isSuggestionCompleted(mContext,
-                new ComponentName(mContext, SwipeToNotificationSuggestionActivity.class))).isTrue();
-    }
-
-    @Test
-    public void isSuggestionEnabled_isLowMemoryDevice_shouldReturnFalse() {
-        when(mActivityManager.isLowRamDevice()).thenReturn(true);
-
-        assertThat(mProvider.isSuggestionEnabled(mContext)).isFalse();
-    }
-
-    @Test
-    public void isSuggestionEnabled_isNotLowMemoryDevice_shouldReturnTrue() {
-        when(mActivityManager.isLowRamDevice()).thenReturn(false);
-
-        assertThat(mProvider.isSuggestionEnabled(mContext)).isTrue();
-    }
-
-    @Test
-    public void dismissSuggestion_noParserOrSuggestion_noop() {
-        mProvider.dismissSuggestion(mContext, null, null);
-        mProvider.dismissSuggestion(mContext, mSuggestionParser, null);
-        mProvider.dismissSuggestion(mContext, null, mSuggestion);
-
-        verifyZeroInteractions(mFactory.metricsFeatureProvider);
-    }
-
-    @Test
-    public void getSuggestionIdentifier_samePackage_returnClassName() {
-        final Tile suggestion = new Tile();
-        suggestion.intent = new Intent()
-                .setClassName(RuntimeEnvironment.application.getPackageName(), "123");
-        assertThat(mProvider.getSuggestionIdentifier(RuntimeEnvironment.application, suggestion))
-                .isEqualTo("123");
-    }
-
-    @Test
-    public void getSuggestionIdentifier_differentPackage_returnPackageName() {
-        final Tile suggestion = new Tile();
-        suggestion.intent = new Intent()
-                .setClassName(RuntimeEnvironment.application.getPackageName(), "123");
-        assertThat(mProvider.getSuggestionIdentifier(mContext, suggestion))
-                .isEqualTo(RuntimeEnvironment.application.getPackageName());
-    }
-
-    @Test
-    public void getSuggestionIdentifier_nullComponent_shouldNotCrash() {
-        final Tile suggestion = new Tile();
-        suggestion.intent = new Intent();
-        assertThat(mProvider.getSuggestionIdentifier(mContext, suggestion))
-                .isNotEmpty();
-    }
-
-    @Test
-    public void getSuggestionIdentifier_nullContext_shouldNotCrash() {
-        final Tile suggestion = new Tile();
-        suggestion.intent = new Intent()
-                .setClassName(RuntimeEnvironment.application.getPackageName(), "123");
-        assertThat(mProvider.getSuggestionIdentifier(null, suggestion))
-                .isNotEmpty();
-    }
-
-    @Test
-    public void dismissSuggestion_hasMoreDismissCount_shouldNotDisableComponent() {
-        when(mSuggestionParser.dismissSuggestion(any(Tile.class)))
-                .thenReturn(false);
-        mProvider.dismissSuggestion(mContext, mSuggestionParser, mSuggestion);
-
-        verify(mFactory.metricsFeatureProvider).action(
-                eq(mContext),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION),
-                anyString(),
-                mTaggedDataCaptor.capture());
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-        verify(mContext, never()).getPackageManager();
-    }
-
-    @Test
-    public void dismissSuggestion_noContext_shouldDoNothing() {
-        mProvider.dismissSuggestion(null, mSuggestionParser, mSuggestion);
-
-        verifyZeroInteractions(mFactory.metricsFeatureProvider);
-    }
-
-    @Test
-    public void dismissSuggestion_hasNoMoreDismissCount_shouldDisableComponent() {
-        when(mSuggestionParser.dismissSuggestion(any(Tile.class)))
-                .thenReturn(true);
-
-        mProvider.dismissSuggestion(mContext, mSuggestionParser, mSuggestion);
-
-        verify(mFactory.metricsFeatureProvider).action(
-                eq(mContext),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION),
-                anyString(),
-                mTaggedDataCaptor.capture());
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-        verify(mContext.getPackageManager())
-                .setComponentEnabledSetting(mSuggestion.intent.getComponent(),
-                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                        PackageManager.DONT_KILL_APP);
-    }
-
-    private void stubFingerprintSupported(boolean enabled) {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(enabled);
-    }
-
-    @Test
-    public void filterExclusiveSuggestions_shouldOnlyKeepFirst3() {
-        final List<Tile> suggestions = new ArrayList<>();
-        suggestions.add(new Tile());
-        suggestions.add(new Tile());
-        suggestions.add(new Tile());
-        suggestions.add(new Tile());
-        suggestions.add(new Tile());
-        suggestions.add(new Tile());
-        suggestions.add(new Tile());
-
-        mProvider.filterExclusiveSuggestions(suggestions);
-
-        assertThat(suggestions).hasSize(3);
-    }
-
-    @Test
-    public void hasUsedNightDisplay_returnsFalse_byDefault() {
-        assertThat(mProvider.hasUsedNightDisplay(mContext)).isFalse();
-    }
-
-    @Test
-    public void hasUsedNightDisplay_returnsTrue_ifPreviouslyActivatedAndManual() {
-        Secure.putString(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
-                LocalDateTime.now().toString());
-        Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
-        assertThat(mProvider.hasUsedNightDisplay(mContext)).isTrue();
-    }
-
-    @Test
-    public void nightDisplaySuggestion_isCompleted_ifPreviouslyActivated() {
-        Secure.putString(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
-                LocalDateTime.now().toString());
-        final ComponentName componentName =
-                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
-    }
-
-    @Test
-    public void nightDisplaySuggestion_isCompleted_ifNonManualMode() {
-        Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
-        final ComponentName componentName =
-                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
-    }
-
-    @Test
-    public void nightDisplaySuggestion_isCompleted_ifPreviouslyCleared() {
-        Secure.putString(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
-                null);
-        Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
-        final ComponentName componentName =
-                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
-    }
-
-    @Test
-    public void nightDisplaySuggestion_isNotCompleted_byDefault() {
-        final ComponentName componentName =
-                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
deleted file mode 100644
index 4d6a74353104d110e46e306651dc9f9d7449bba3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.dashboard.suggestions;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SuggestionFeaturizerTest {
-
-    private EventStore mEventStore;
-    private SuggestionFeaturizer mSuggestionFeaturizer;
-
-    @Before
-    public void setUp() {
-        mEventStore = new EventStore(RuntimeEnvironment.application);
-        mSuggestionFeaturizer = new SuggestionFeaturizer(mEventStore);
-    }
-
-    @Test
-    public void testFeaturize_singlePackage() {
-        mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
-        mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
-        mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
-        Map<String, Double> features = mSuggestionFeaturizer.featurize(Arrays.asList("pkg"))
-                .get("pkg");
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(1.0);
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
-
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN)).isLessThan(1.0);
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
-                .isLessThan(1.0);
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
-                .isEqualTo(1.0);
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
-                .isEqualTo(2.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT))
-                .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
-        assertThat(features.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
-    }
-
-    @Test
-    public void testFeaturize_multiplePackages() {
-        mEventStore.writeEvent("pkg1", EventStore.EVENT_DISMISSED);
-        mEventStore.writeEvent("pkg2", EventStore.EVENT_SHOWN);
-        mEventStore.writeEvent("pkg1", EventStore.EVENT_SHOWN);
-        Map<String, Map<String, Double>> features = mSuggestionFeaturizer
-                .featurize(Arrays.asList("pkg1", "pkg2"));
-        Map<String, Double> features1 = features.get("pkg1");
-        Map<String, Double> features2 = features.get("pkg2");
-
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(1.0);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN))
-                .isLessThan(1.0);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
-                .isLessThan(1.0);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
-                .isEqualTo(1.0);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
-                .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT))
-                .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
-        assertThat(features1.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
-
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(0.0);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN))
-                .isLessThan(1.0);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
-                .isEqualTo(1.0);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
-                .isEqualTo(1.0);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
-                .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT)).isEqualTo(0.0);
-        assertThat(features2.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
deleted file mode 100644
index 8eb4273fc54d69dff8217b21b2302b8ee2f3bade..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.suggestions;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import org.junit.Test;
-
-public class SuggestionLogHelperTest {
-
-    @Test
-    public void testGetSmartSuggestionEnabledTaggedData_disabled() {
-        assertThat(SuggestionLogHelper.getSuggestionTaggedData(false)).asList().containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testGetSmartSuggestionEnabledTaggedData_enabled() {
-        assertThat(SuggestionLogHelper.getSuggestionTaggedData(true)).asList().containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
deleted file mode 100644
index 1f32531713fd40e7a9eea16255f1c34e92621b92..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.dashboard.suggestions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.same;
-import static org.mockito.Mockito.spy;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SuggestionRankerTest {
-
-    @Mock
-    private SuggestionRanker mSuggestionRanker;
-    @Mock
-    private SuggestionFeaturizer mSuggestionFeaturizer;
-    private Map<String, Map<String, Double>> mFeatures;
-    private List<String> mPkgNames;
-    private List<Tile> mSuggestions;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPkgNames = Arrays.asList("pkg1", "pkg2", "pkg3");
-        mFeatures = new HashMap<String, Map<String, Double>>();
-        mFeatures.put("pkg1", new HashMap<String, Double>());
-        mFeatures.put("pkg2", new HashMap<String, Double>());
-        mFeatures.put("pkg3", new HashMap<String, Double>());
-        mSuggestions = new ArrayList<Tile>() {
-            {
-                add(new Tile());
-                add(new Tile());
-                add(new Tile());
-            }
-        };
-        mSuggestionFeaturizer = mock(SuggestionFeaturizer.class);
-        mSuggestionRanker = new SuggestionRanker(mSuggestionFeaturizer);
-        when(mSuggestionFeaturizer.featurize(mPkgNames)).thenReturn(mFeatures);
-        mSuggestionRanker = spy(mSuggestionRanker);
-        when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg1")))).thenReturn(0.9);
-        when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg2")))).thenReturn(0.1);
-        when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg3")))).thenReturn(0.5);
-    }
-
-    @Test
-    public void testRank() {
-        List<Tile> expectedOrderdList = new ArrayList<Tile>() {
-            {
-                add(mSuggestions.get(0)); // relevance = 0.9
-                add(mSuggestions.get(2)); // relevance = 0.5
-                add(mSuggestions.get(1)); // relevance = 0.1
-            }
-        };
-        mSuggestionRanker.rankSuggestions(mSuggestions, mPkgNames);
-        assertThat(mSuggestions).isEqualTo(expectedOrderdList);
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
deleted file mode 100644
index 59752c6575d536d2b9d34c6e669a7dd842cdbdd1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.suggestions;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
-
-import android.app.WallpaperManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
-
-import com.android.settings.Settings;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SuggestionsChecksTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private FingerprintManager mFingerprintManager;
-    @Mock
-    private DevicePolicyManager mDevicePolicyManager;
-    @Mock
-    private WallpaperManagerWrapper mWallpaperManager;
-    private SuggestionsChecks mSuggestionsChecks;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        mSuggestionsChecks = new SuggestionsChecks(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getSystemService(eq(Context.DEVICE_POLICY_SERVICE)))
-                .thenReturn(mDevicePolicyManager);
-        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(), anyInt()))
-                .thenReturn(0);
-        when(mContext.getSystemService(FingerprintManager.class)).thenReturn(mFingerprintManager);
-    }
-
-    @Test
-    public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintAdded() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
-    }
-
-    @Test
-    public void testFingerprintEnrollmentIntroductionIsNotCompleteWhenNoFingerprintAdded() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isFalse();
-    }
-
-    @Test
-    public void testFingerprintEnrollmentIntroductionIsCompleteWhenHardwareNotDetected() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
-    }
-
-    @Test
-    public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintNotSupported() {
-        stubFingerprintSupported(false);
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
-    }
-
-    @Test
-    public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintDisabled() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(), anyInt()))
-                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
-
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
-    }
-
-    private void stubFingerprintSupported(boolean enabled) {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(enabled);
-    }
-
-    private Tile createFingerprintTile() {
-        final Tile tile = new Tile();
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName(mContext,
-                Settings.FingerprintEnrollSuggestionActivity.class));
-        return tile;
-    }
-
-    @Test
-    public void hasWallpaperSet_no_shouldReturnFalse() {
-        ReflectionHelpers.setField(mSuggestionsChecks, "mWallpaperManager", mWallpaperManager);
-        when(mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM))
-                .thenReturn(0);
-
-        assertThat(mSuggestionsChecks.hasWallpaperSet())
-                .isFalse();
-    }
-
-    @Test
-    public void hasWallpaperSet_yes_shouldReturnTrue() {
-        ReflectionHelpers.setField(mSuggestionsChecks, "mWallpaperManager", mWallpaperManager);
-        when(mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM))
-                .thenReturn(100);
-
-        assertThat(mSuggestionsChecks.hasWallpaperSet())
-                .isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
deleted file mode 100644
index 2f2a6852daebbf18bb45ff55845196a3d4224c7f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datausage;
-
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.ArraySet;
-import android.view.View;
-
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.AppItem;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowEntityHeaderController.class)
-public class AppDataUsageTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private EntityHeaderController mHeaderController;
-    @Mock
-    private PackageManagerWrapper mPackageManagerWrapper;
-
-    private AppDataUsage mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowEntityHeaderController.reset();
-    }
-
-    @Test
-    public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() {
-        ShadowEntityHeaderController.setUseMock(mHeaderController);
-        when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
-        when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController);
-
-        mFragment = spy(new AppDataUsage());
-
-        doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
-                .when(mFragment)
-                .getPreferenceManager();
-        doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
-        ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class));
-
-        mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
-
-        verify(mHeaderController).setHasAppInfoLink(false);
-    }
-
-    @Test
-    public void bindAppHeader_workApp_shouldSetWorkAppUid() throws
-            PackageManager.NameNotFoundException {
-        final int fakeUserId = 100;
-
-        mFragment = spy(new AppDataUsage());
-        final ArraySet<String> packages = new ArraySet<>();
-        packages.add("pkg");
-        final AppItem appItem = new AppItem(123456789);
-
-        ReflectionHelpers.setField(mFragment, "mPackageManagerWrapper", mPackageManagerWrapper);
-        ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
-        ReflectionHelpers.setField(mFragment, "mPackages", packages);
-
-        when(mPackageManagerWrapper.getPackageUidAsUser(anyString(), anyInt()))
-                .thenReturn(fakeUserId);
-
-        ShadowEntityHeaderController.setUseMock(mHeaderController);
-        when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
-        when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController);
-        when(mHeaderController.setHasAppInfoLink(anyBoolean())).thenReturn(mHeaderController);
-
-        doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
-                .when(mFragment)
-                .getPreferenceManager();
-        doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
-
-        mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
-
-        verify(mHeaderController).setHasAppInfoLink(true);
-        verify(mHeaderController).setUid(fakeUserId);
-    }
-
-    @Test
-    public void changePreference_backgroundData_shouldUpdateUI() {
-        mFragment = spy(new AppDataUsage());
-        final AppItem appItem = new AppItem(123456789);
-        final SwitchPreference pref = mock(SwitchPreference.class);
-        final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
-        ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
-        ReflectionHelpers.setField(mFragment, "mRestrictBackground", pref);
-        ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
-
-        doNothing().when(mFragment).updatePrefs();
-
-        mFragment.onPreferenceChange(pref, true /* value */);
-
-        verify(mFragment).updatePrefs();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
deleted file mode 100644
index ac28e1defaf7c0d293bd65b3b7d16c1112d9c289..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
-
-import android.util.ArraySet;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppPrefLoaderTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private AppPrefLoader mLoader;
-
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        final ArraySet<String> pkgs = new ArraySet<>();
-        pkgs.add("pkg0");
-        pkgs.add("pkg1");
-        mLoader =
-            new AppPrefLoader(RuntimeEnvironment.application, pkgs, mPackageManager);
-    }
-
-    @Test
-    public void loadInBackground_packageNotFound_shouldReturnEmptySet()
-            throws NameNotFoundException {
-        when(mPackageManager.getApplicationInfo(anyString(), anyInt()))
-            .thenThrow(new NameNotFoundException());
-
-        ArraySet<Preference> preferences = mLoader.loadInBackground();
-        assertThat(preferences).isEmpty();
-    }
-
-    @Test
-    public void loadInBackground_shouldReturnPreference() throws NameNotFoundException {
-        ApplicationInfo info = mock(ApplicationInfo.class);
-        when(mPackageManager.getApplicationInfo(anyString(), anyInt())).thenReturn(info);
-        final Drawable drawable = mock(Drawable.class);
-        final String label = "Label1";
-        when(info.loadIcon(mPackageManager)).thenReturn(drawable);
-        when(info.loadLabel(mPackageManager)).thenReturn(label);
-
-        Preference preference = mLoader.loadInBackground().valueAt(0);
-        assertThat(preference.getTitle()).isEqualTo(label);
-        assertThat(preference.getIcon()).isEqualTo(drawable);
-        assertThat(preference.isSelectable()).isFalse();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
deleted file mode 100644
index 8b635d24ead07094a8197f5ac9b6ba56f9e0a81c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.datausage;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v7.preference.PreferenceManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BillingCycleSettingsTest {
-
-    private static final int LIMIT_BYTES = 123;
-
-    @Mock
-    BillingCycleSettings mMockBillingCycleSettings;
-    BillingCycleSettings.ConfirmLimitFragment mConfirmLimitFragment;
-    @Mock
-    PreferenceManager mMockPreferenceManager;
-    SharedPreferences mSharedPreferences;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mConfirmLimitFragment = new BillingCycleSettings.ConfirmLimitFragment();
-        mConfirmLimitFragment.setTargetFragment(mMockBillingCycleSettings, 0);
-        mSharedPreferences = RuntimeEnvironment.application.getSharedPreferences(
-                "testSharedPreferences", Context.MODE_PRIVATE);
-        when(mMockBillingCycleSettings.getPreferenceManager()).thenReturn(mMockPreferenceManager);
-        when(mMockPreferenceManager.getSharedPreferences()).thenReturn(mSharedPreferences);
-        final Bundle args = new Bundle();
-        args.putLong(BillingCycleSettings.ConfirmLimitFragment.EXTRA_LIMIT_BYTES, LIMIT_BYTES);
-        mConfirmLimitFragment.setArguments(args);
-        mSharedPreferences.edit().putBoolean(
-                BillingCycleSettings.KEY_SET_DATA_LIMIT, false).apply();
-    }
-
-    @Test
-    public void testDataUsageLimit_shouldNotBeSetOnCancel() {
-        mConfirmLimitFragment.onClick(null, DialogInterface.BUTTON_NEGATIVE);
-
-        assertFalse(mSharedPreferences.getBoolean(BillingCycleSettings.KEY_SET_DATA_LIMIT, true));
-        verify(mMockBillingCycleSettings, never()).setPolicyLimitBytes(anyLong());
-    }
-
-    @Test
-    public void testDataUsageLimit_shouldBeSetOnConfirmation() {
-        mConfirmLimitFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
-
-        assertTrue(mSharedPreferences.getBoolean(BillingCycleSettings.KEY_SET_DATA_LIMIT, false));
-        verify(mMockBillingCycleSettings).setPolicyLimitBytes(LIMIT_BYTES);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java
deleted file mode 100644
index a5dbf7857717442a7a62c4fe913d7959441e1d9e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.DonutView;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class
-        }
-)
-public final class DataPlanSummaryPreferenceTest {
-
-    private static final String TEST_PLAN_USAGE = "Test plan usage";
-    private static final String TEST_PLAN_NAME = "Test plan name";
-    private static final String TEST_PLAN_DESCRIPTION = "Test plan description";
-    private static final int PLAN_USAGE_TEXT_COLOR = Color.parseColor("#FF5C94F1");
-    private static final int METER_BACKGROUND_COLOR = Color.parseColor("#FFDBDCDC");
-    private static final int METER_CONSUMED_COLOR = Color.parseColor("#FF5C94F1");
-
-    private DataPlanSummaryPreference mPreference;
-    private PreferenceViewHolder mHolder;
-
-    @Before
-    public void setUp() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_headlineFontFamily, "");
-        Context context = RuntimeEnvironment.application;
-        mPreference = new DataPlanSummaryPreference(context);
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate(mPreference.getLayoutResource(),
-                new LinearLayout(context), false);
-        mHolder = PreferenceViewHolder.createInstanceForTests(view);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void shouldRender_withoutData() {
-        mPreference.onBindViewHolder(mHolder);
-
-        TextView planUsageTextView = (TextView) mHolder.findViewById(android.R.id.title);
-        assertThat(planUsageTextView.getText().toString()).isEmpty();
-        TextView planNameTextView = (TextView) mHolder.findViewById(android.R.id.text1);
-        assertThat(planNameTextView.getText().toString()).isEmpty();
-        TextView planDescriptionTextView = (TextView) mHolder.findViewById(android.R.id.text2);
-        assertThat(planDescriptionTextView.getText().toString()).isEmpty();
-    }
-
-    @Test
-    public void shouldRender_withData() {
-        mPreference.setTitle(TEST_PLAN_USAGE);
-        mPreference.setUsageTextColor(PLAN_USAGE_TEXT_COLOR);
-        mPreference.setName(TEST_PLAN_NAME);
-        mPreference.setDescription(TEST_PLAN_DESCRIPTION);
-        mPreference.setPercentageUsage(0.25D);
-        mPreference.setMeterBackgroundColor(METER_BACKGROUND_COLOR);
-        mPreference.setMeterConsumedColor(METER_CONSUMED_COLOR);
-
-        mPreference.onBindViewHolder(mHolder);
-
-        TextView planUsageTextView = (TextView) mHolder.findViewById(android.R.id.title);
-        assertThat(planUsageTextView.getTextColors().getDefaultColor())
-                .isEqualTo(PLAN_USAGE_TEXT_COLOR);
-        assertThat(planUsageTextView.getText()).isEqualTo(TEST_PLAN_USAGE);
-
-        TextView planNameTextView = (TextView) mHolder.findViewById(android.R.id.text1);
-        assertThat(planNameTextView.getText()).isEqualTo(TEST_PLAN_NAME);
-
-        TextView planDescriptionTextView = (TextView) mHolder.findViewById(android.R.id.text2);
-        assertThat(planDescriptionTextView.getText()).isEqualTo(TEST_PLAN_DESCRIPTION);
-
-        DonutView donutView = (DonutView) mHolder.findViewById(R.id.donut);
-        assertThat(donutView.getMeterBackgroundColor()).isEqualTo(METER_BACKGROUND_COLOR);
-        assertThat(donutView.getMeterConsumedColor()).isEqualTo(METER_CONSUMED_COLOR);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
deleted file mode 100644
index 748c317379329d45d2f29428ce5250c83fc2730d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkPolicy;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.NetworkPolicyEditor;
-import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DataPlanUsageSummaryTest {
-    @Mock
-    private ConnectivityManager mManager;
-
-    private Context mContext;
-    private DataPlanUsageSummary mDataUsageSummary;
-    private NetworkPolicyEditor mPolicyEditor;
-    private WifiConfiguration mWifiConfiguration;
-    private NetworkPolicy mNetworkPolicy;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.CONNECTIVITY_SERVICE, mManager);
-        mContext = shadowContext.getApplicationContext();
-        when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
-    }
-
-    @Test
-    public void testUpdateNetworkRestrictionSummary_shouldSetSummary() {
-        mDataUsageSummary = spy(new DataPlanUsageSummary());
-        NetworkRestrictionsPreference preference = mock(NetworkRestrictionsPreference.class);
-        mPolicyEditor = mock(NetworkPolicyEditor.class);
-        WifiManager wifiManager = mock(WifiManager.class);
-        ReflectionHelpers.setField(mDataUsageSummary, "mPolicyEditor", mPolicyEditor);
-        ReflectionHelpers.setField(mDataUsageSummary, "mWifiManager", wifiManager);
-        when(wifiManager.getConfiguredNetworks()).thenReturn(new ArrayList<>());
-        doReturn(mContext.getResources()).when(mDataUsageSummary).getResources();
-
-        mDataUsageSummary.updateNetworkRestrictionSummary(preference);
-
-        verify(preference).setSummary(mContext.getResources().getQuantityString(
-                R.plurals.network_restrictions_summary, 0, 0));
-    }
-
-    @Test
-    public void testIsMetered_noSsid_shouldReturnFalse() {
-        initTest();
-
-        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse();
-    }
-
-    @Test
-    public void testIsMetered_noNetworkPolicy_shouldReturnFalse() {
-        initTest();
-        mWifiConfiguration.SSID = "network1";
-        doReturn(null).when(mPolicyEditor).getPolicyMaybeUnquoted(any());
-
-        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse();
-    }
-
-    @Test
-    public void testIsMetered_policyHasLimit_shouldReturnTrue() {
-        initTest();
-        mWifiConfiguration.SSID = "network1";
-        mNetworkPolicy = mock(NetworkPolicy.class);
-        mNetworkPolicy.limitBytes = 100;
-        doReturn(mNetworkPolicy).when(mPolicyEditor).getPolicyMaybeUnquoted(any());
-
-        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isTrue();
-    }
-
-    @Test
-    public void testIsMetered_noPolicyLimit_shouldReturnMeteredValue() {
-        initTest();
-        mWifiConfiguration.SSID = "network1";
-        mNetworkPolicy = mock(NetworkPolicy.class);
-        mNetworkPolicy.limitBytes = NetworkPolicy.LIMIT_DISABLED;
-        doReturn(mNetworkPolicy).when(mPolicyEditor).getPolicyMaybeUnquoted(any());
-
-        mNetworkPolicy.metered = true;
-        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isTrue();
-
-        mNetworkPolicy.metered = false;
-        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse();
-    }
-
-    private void initTest() {
-        mDataUsageSummary = new DataPlanUsageSummary();
-        mPolicyEditor = mock(NetworkPolicyEditor.class);
-        ReflectionHelpers.setField(mDataUsageSummary, "mPolicyEditor", mPolicyEditor);
-        mWifiConfiguration = mock(WifiConfiguration.class);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java
deleted file mode 100644
index ba2d5f15ba5a1dd8d9919f96ca0bd04edb7a278f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class DataPlansSyncTimePreferenceTest {
-    private static final String SYNC_TIME = "Today 12:24pm";
-
-    private Preference mPreference;
-    private PreferenceViewHolder mHolder;
-
-    @Before
-    public void setUp() {
-        Context context = RuntimeEnvironment.application;
-        mPreference = new Preference(context);
-        mPreference.setLayoutResource(R.layout.data_plans_sync_time_preference);
-
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate(mPreference.getLayoutResource(),
-                new LinearLayout(context), false);
-        mHolder = PreferenceViewHolder.createInstanceForTests(view);
-    }
-
-    @Test
-    public void shouldRender_withData() {
-        mPreference.setTitle(SYNC_TIME);
-
-        mPreference.onBindViewHolder(mHolder);
-
-        TextView syncTimeTextView = (TextView) mHolder.findViewById(android.R.id.title);
-        assertThat(syncTimeTextView.getText()).isEqualTo(SYNC_TIME);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
deleted file mode 100644
index e60243bf8466490771946c40afefa0c0998b571d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.android.settings.datausage;
-
-import android.net.NetworkPolicy;
-import android.net.NetworkTemplate;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.net.DataUsageController.DataUsageInfo;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DataUsageInfoControllerTest {
-    private DataUsageInfoController mInfoController;
-    private DataUsageInfo info;
-    private static final int NEGATIVE = -1;
-    private static final int ZERO = 0;
-    private static final int POSITIVE_SMALL = 1;
-    private static final int POSITIVE_LARGE = 5;
-
-    @Before
-    public void setUp()  {
-        mInfoController = new DataUsageInfoController();
-        info = new DataUsageInfo();
-    }
-
-    @Test
-    public void testLowUsageLowWarning_LimitUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = POSITIVE_LARGE;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
-    }
-
-    @Test
-    public void testLowUsageEqualWarning_LimitUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = POSITIVE_LARGE;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
-    }
-
-    @Test
-    public void testNoLimitNoUsage_WarningUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = ZERO;
-        info.usageLevel = ZERO;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
-    }
-
-    @Test
-    public void testNoLimitLowUsage_WarningUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = ZERO;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
-    }
-
-    @Test
-    public void testLowWarningNoLimit_UsageUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = ZERO;
-        info.usageLevel = POSITIVE_LARGE;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
-    }
-
-    @Test
-    public void testLowWarningLowLimit_UsageUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = POSITIVE_SMALL;
-        info.usageLevel = POSITIVE_LARGE;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
-    }
-
-    private NetworkPolicy getDefaultNetworkPolicy() {
-        NetworkTemplate template = new NetworkTemplate(NetworkTemplate.MATCH_WIFI_WILDCARD,
-                null, null);
-        int cycleDay  = -1;
-        String cycleTimezone = "UTC";
-        long warningBytes = -1;
-        long limitBytes = -1;
-        return new NetworkPolicy(template,cycleDay, cycleTimezone, warningBytes, limitBytes, true);
-    }
-
-    @Test
-    public void testNullArguments_NoError() {
-        mInfoController.updateDataLimit(null, null);
-        mInfoController.updateDataLimit(info, null);
-        mInfoController.updateDataLimit(null, getDefaultNetworkPolicy());
-    }
-
-    @Test
-    public void testNegativeWarning_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = NEGATIVE;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testWarningZero_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = ZERO;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testWarningPositive_UpdatedToWarning() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = POSITIVE_SMALL;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(policy.warningBytes);
-    }
-
-    @Test
-    public void testLimitNegative_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = NEGATIVE;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testLimitZero_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = ZERO;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testLimitPositive_UpdatedToLimit() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = POSITIVE_SMALL;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(policy.limitBytes);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
deleted file mode 100644
index 9ab88d3a805f2796f3e3856ddac159590e269a9f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datausage;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.NetworkPolicyEditor;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DataUsageListTest {
-
-    @Mock
-    private CellDataPreference.DataStateListener mListener;
-    @Mock
-    private TemplatePreference.NetworkServices mNetworkServices;
-    @Mock
-    private Context mContext;
-    private DataUsageList mDataUsageList;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mNetworkServices.mPolicyEditor = mock(NetworkPolicyEditor.class);
-        mDataUsageList = spy(DataUsageList.class);
-
-        doReturn(mContext).when(mDataUsageList).getContext();
-        ReflectionHelpers.setField(mDataUsageList, "mDataStateListener", mListener);
-        ReflectionHelpers.setField(mDataUsageList, "services", mNetworkServices);
-    }
-
-    @Test
-    public void resumePause_shouldListenUnlistenDataStateChange() {
-        mDataUsageList.onResume();
-
-        verify(mListener).setListener(true, 0, mContext);
-
-        mDataUsageList.onPause();
-
-        verify(mListener).setListener(false, 0, mContext);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
deleted file mode 100644
index 431796acd45f73c56080e3d3303d84a847291dca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settingslib.NetworkPolicyEditor;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DataUsageSummaryTest {
-    @Mock private ConnectivityManager mManager;
-    private Context mContext;
-
-    /**
-     * This set up is contrived to get a passing test so that the build doesn't block without tests.
-     * These tests should be updated as code gets refactored to improve testability.
-     */
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.CONNECTIVITY_SERVICE, mManager);
-        mContext = shadowContext.getApplicationContext();
-        when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
-    }
-
-    @Test
-    public void testUpdateNetworkRestrictionSummary_shouldSetSummary() {
-        final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
-        final NetworkRestrictionsPreference preference = mock(NetworkRestrictionsPreference.class);
-        final NetworkPolicyEditor policyEditor = mock(NetworkPolicyEditor.class);
-        final WifiManager wifiManager = mock(WifiManager.class);
-        ReflectionHelpers.setField(dataUsageSummary, "mPolicyEditor", policyEditor);
-        ReflectionHelpers.setField(dataUsageSummary, "mWifiManager", wifiManager);
-        when(wifiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
-        doReturn(mContext.getResources()).when(dataUsageSummary).getResources();
-
-        dataUsageSummary.updateNetworkRestrictionSummary(preference);
-
-        verify(preference).setSummary(mContext.getResources().getQuantityString(
-            R.plurals.network_restrictions_summary, 0, 0));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
deleted file mode 100644
index cdcd3a992e9a5ed5ef4594de35e3e45bb3459a74..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class DataUsageUtilsTest {
-    @Mock private ConnectivityManager mManager;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = shadowContext.getApplicationContext();
-        shadowContext.setSystemService(Context.CONNECTIVITY_SERVICE, mManager);
-    }
-
-    @Test
-    public void mobileDataStatus_whenNetworkIsSupported() {
-        when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
-        boolean hasMobileData = DataUsageUtils.hasMobileData(mContext);
-        assertThat(hasMobileData).isTrue();
-    }
-
-    @Test
-    public void mobileDataStatus_whenNetworkIsNotSupported() {
-        when(mManager.isNetworkSupported(anyInt())).thenReturn(false);
-        boolean hasMobileData = DataUsageUtils.hasMobileData(mContext);
-        assertThat(hasMobileData).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java
deleted file mode 100644
index 6eff393cd0e14ed245064248d89a9d6c122eafe5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class ManageDataPlansPreferenceTest {
-    private Preference mPreference;
-    private PreferenceViewHolder mHolder;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new Preference(mContext);
-        mPreference.setLayoutResource(R.layout.manage_data_plans_preference);
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        View view = inflater.inflate(mPreference.getLayoutResource(),
-                new LinearLayout(mContext), false);
-        mHolder = PreferenceViewHolder.createInstanceForTests(view);
-    }
-
-    @Test
-    public void shouldRender_withData() {
-        mPreference.onBindViewHolder(mHolder);
-        Button managePlanButton = (Button) mHolder.findViewById(R.id.manage_data_plans);
-        assertThat(managePlanButton.getText())
-                .isEqualTo(mContext.getString(R.string.data_plan_usage_manage_plans_button_text));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
deleted file mode 100644
index f20e50c3e12806269483ef7a0008cde9299cc297..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.Process;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.applications.ApplicationsState;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UnrestrictedDataAccessTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    @Mock
-    private ApplicationsState.AppEntry mAppEntry;
-    private UnrestrictedDataAccess mFragment;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new UnrestrictedDataAccess();
-    }
-
-    @Test
-    public void testShouldAddPreferenceForApps() {
-        mAppEntry.info = new ApplicationInfo();
-        mAppEntry.info.uid = Process.FIRST_APPLICATION_UID + 10;
-
-        assertThat(mFragment.shouldAddPreference(mAppEntry)).isTrue();
-    }
-
-    @Test
-    public void testShouldNotAddPreferenceForNonApps() {
-        mAppEntry.info = new ApplicationInfo();
-        mAppEntry.info.uid = Process.FIRST_APPLICATION_UID - 10;
-
-        assertThat(mFragment.shouldAddPreference(mAppEntry)).isFalse();
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW), eq("app"));
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_DENY), eq("app"));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
deleted file mode 100644
index d28cad1d78545594fb426b62cd6710b112284fea..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.RestrictedSwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutoTimePreferenceControllerTest {
-
-    @Mock
-    private UpdateTimeAndDateCallback mCallback;
-
-    private Context mContext;
-    private RestrictedSwitchPreference mPreference;
-    private AutoTimePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        mPreference = new RestrictedSwitchPreference(mContext);
-        mController = new AutoTimePreferenceController(mContext, mCallback);
-    }
-
-    @Test
-    public void testIsEnabled_shouldReadFromSettingsProvider() {
-        // Disabled
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.AUTO_TIME, 0);
-        assertThat(mController.isEnabled()).isFalse();
-
-        // Enabled
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.AUTO_TIME, 1);
-        assertThat(mController.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void updatePreferenceChange_prefIsChecked_shouldUpdatePreferenceAndNotifyCallback() {
-        mController.onPreferenceChange(mPreference, true);
-
-        assertThat(mController.isEnabled()).isTrue();
-        verify(mCallback).updateTimeAndDateDisplay(mContext);
-    }
-
-    @Test
-    public void updatePreferenceChange_prefIsUnchecked_shouldUpdatePreferenceAndNotifyCallback() {
-        mController.onPreferenceChange(mPreference, false);
-
-        assertThat(mController.isEnabled()).isFalse();
-        verify(mCallback).updateTimeAndDateDisplay(mContext);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
deleted file mode 100644
index 41bff933443f54ac143f0a8ab3eecbf668097526..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutoTimeZonePreferenceControllerTest {
-
-    @Mock
-    private Context mMockContext;
-    @Mock
-    private ConnectivityManager mCm;
-    @Mock
-    private UpdateTimeAndDateCallback mCallback;
-
-    private Context mContext;
-    private AutoTimeZonePreferenceController mController;
-    private Preference mPreference;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication.getInstance().setSystemService(Context.CONNECTIVITY_SERVICE, mCm);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        mPreference = new Preference(mContext);
-        when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
-    }
-
-    @Test
-    public void isFromSUW_notAvailable() {
-        mController = new AutoTimeZonePreferenceController(
-                mMockContext, null /* callback */, true /* isFromSUW */);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void notFromSUW_isAvailable() {
-        mController = new AutoTimeZonePreferenceController(
-                mMockContext, null /* callback */, false /* isFromSUW */);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isWifiOnly_notAvailable() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
-
-        mController = new AutoTimeZonePreferenceController(
-                mMockContext, null /* callback */, false /* isFromSUW */);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isFromSUW_notEnable() {
-        mController = new AutoTimeZonePreferenceController(
-            mMockContext, null /* callback */, true /* isFromSUW */);
-
-        assertThat(mController.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void isWifiOnly_notEnable() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
-
-        mController = new AutoTimeZonePreferenceController(
-            mMockContext, null /* callback */, false /* isFromSUW */);
-
-        assertThat(mController.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testIsEnabled_shouldReadFromSettingsProvider() {
-        mController = new AutoTimeZonePreferenceController(
-                mContext, null /* callback */, false /* isFromSUW */);
-
-        // Disabled
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.AUTO_TIME_ZONE, 0);
-        assertThat(mController.isEnabled()).isFalse();
-
-        // Enabled
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.AUTO_TIME_ZONE, 1);
-        assertThat(mController.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void updatePreferenceChange_prefIsChecked_shouldUpdatePreferenceAndNotifyCallback() {
-        mController = new AutoTimeZonePreferenceController(
-                mContext, mCallback, false /* isFromSUW */);
-
-        mController.onPreferenceChange(mPreference, true);
-
-        assertThat(mController.isEnabled()).isTrue();
-        verify(mCallback).updateTimeAndDateDisplay(mContext);
-    }
-
-    @Test
-    public void updatePreferenceChange_prefIsUnchecked_shouldUpdatePreferenceAndNotifyCallback() {
-        mController = new AutoTimeZonePreferenceController(
-                mContext, mCallback, false /* isFromSUW */);
-
-        mController.onPreferenceChange(mPreference, false);
-
-        assertThat(mController.isEnabled()).isFalse();
-        verify(mCallback).updateTimeAndDateDisplay(mContext);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
deleted file mode 100644
index e6a6dd842e0c453bda3e8e32133f05c4576c4743..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-import android.app.AlarmManager;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DatePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private AlarmManager mAlarmManager;
-    @Mock
-    private DatePreferenceController.DatePreferenceHost mHost;
-    @Mock
-    private AutoTimePreferenceController mAutoTimePreferenceController;
-
-    private Preference mPreference;
-    private DatePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);
-        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
-        mController = new DatePreferenceController(mContext, mHost, mAutoTimePreferenceController);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void shouldHandleDateSetCallback() {
-        mController.onDateSet(null, 2016, 1, 1);
-        verify(mHost).updateTimeAndDateDisplay(mContext);
-    }
-
-    @Test
-    public void updateState_autoTimeEnabled_shouldDisablePref() {
-        when(mAutoTimePreferenceController.isEnabled()).thenReturn(true);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_autoTimeDisabled_shouldEnablePref() {
-        when(mAutoTimePreferenceController.isEnabled()).thenReturn(false);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void clickPreference_showDatePicker() {
-        // Click a preference that's not controlled by this controller.
-        mPreference.setKey("fake_key");
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-
-        // Click a preference controlled by this controller.
-        mPreference.setKey(mController.getPreferenceKey());
-        mController.handlePreferenceTreeClick(mPreference);
-        // Should show date picker
-        verify(mHost).showDatePicker();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
deleted file mode 100644
index 843c753d9a655cdbe38e2f730da3fcf4ef1bcb02..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TimeChangeListenerMixinTest {
-
-    @Mock
-    private UpdateTimeAndDateCallback mCallback;
-
-    private Context mContext;
-    private TimeChangeListenerMixin mMixin;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        mMixin = new TimeChangeListenerMixin(mContext, mCallback);
-    }
-
-    @Test
-    public void shouldImplementMixinInterfaces() {
-        assertThat(mMixin instanceof LifecycleObserver).isTrue();
-        assertThat(mMixin instanceof OnPause).isTrue();
-        assertThat(mMixin instanceof OnResume).isTrue();
-    }
-
-    @Test
-    public void onResume_shouldRegisterIntentFilter() {
-        mMixin.onResume();
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
-
-        verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext);
-    }
-
-    @Test
-    public void onPause_shouldUnregisterIntentFilter() {
-        mMixin.onResume();
-        mMixin.onPause();
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
-
-        verify(mCallback, never()).updateTimeAndDateDisplay(mContext);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
deleted file mode 100644
index 58ecd62e71293967298a39b8e6ef0aab894e1879..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TimeFormatPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock
-    private UpdateTimeAndDateCallback mCallback;
-
-    private ShadowApplication mApplication;
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private TimeFormatPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mApplication = ShadowApplication.getInstance();
-        mContext = mApplication.getApplicationContext();
-    }
-
-    @Test
-    public void isCalledFromSUW_NotAvailable() {
-        mController = new TimeFormatPreferenceController(mContext, mCallback, true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void notCalledFromSUW_shouldBeAvailable() {
-        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_24HourSet_shouldCheckPreference() {
-        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
-        mPreference = new SwitchPreference(mContext);
-        mPreference.setKey(mController.getPreferenceKey());
-        Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24,
-                TimeFormatPreferenceController.HOURS_24);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void updateState_12HourSet_shouldNotCheckPreference() {
-        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
-        mPreference = new SwitchPreference(mContext);
-        mPreference.setKey(mController.getPreferenceKey());
-        Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24,
-                TimeFormatPreferenceController.HOURS_12);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void updatePreference_12HourSet_shouldSendIntent() {
-        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
-        mPreference = new SwitchPreference(mContext);
-        mPreference.setKey(mController.getPreferenceKey());
-        mPreference.setChecked(false);
-
-        boolean result = mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(result).isTrue();
-
-        List<Intent> intentsFired = mApplication.getBroadcastIntents();
-        assertThat(intentsFired.size()).isEqualTo(1);
-        Intent intentFired = intentsFired.get(0);
-        assertThat(intentFired.getAction()).isEqualTo(Intent.ACTION_TIME_CHANGED);
-        assertThat(intentFired.getIntExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, -1))
-                .isEqualTo(Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR);
-    }
-
-    @Test
-    public void updatePreference_24HourSet_shouldSendIntent() {
-        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
-        mPreference = new SwitchPreference(mContext);
-        mPreference.setKey(mController.getPreferenceKey());
-        mPreference.setChecked(true);
-
-        boolean result = mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(result).isTrue();
-
-        List<Intent> intentsFired = mApplication.getBroadcastIntents();
-        assertThat(intentsFired.size()).isEqualTo(1);
-        Intent intentFired = intentsFired.get(0);
-        assertThat(intentFired.getAction()).isEqualTo(Intent.ACTION_TIME_CHANGED);
-        assertThat(intentFired.getIntExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, -1))
-                .isEqualTo(Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
deleted file mode 100644
index 15877e0dc3e32f7502f0017dfb06b6fd867c19b4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TimePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private TimePreferenceController.TimePreferenceHost mHost;
-    @Mock
-    private AutoTimePreferenceController mAutoTimePreferenceController;
-
-    private TimePreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
-        mController = new TimePreferenceController(mContext, mHost, mAutoTimePreferenceController);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_autoTimeEnabled_shouldDisablePref() {
-        when(mAutoTimePreferenceController.isEnabled()).thenReturn(true);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_autoTimeDisabled_shouldEnablePref() {
-        when(mAutoTimePreferenceController.isEnabled()).thenReturn(false);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void clickPreference_showTimePicker() {
-        // Click a preference that's not controlled by this controller.
-        mPreference.setKey("fake_key");
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-
-        // Click a preference controlled by this controller.
-        mPreference.setKey(mController.getPreferenceKey());
-        mController.handlePreferenceTreeClick(mPreference);
-        // Should show date picker
-        verify(mHost).showTimePicker();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
deleted file mode 100644
index 2f96d65e26d4acb306e9389dbe5c8acfd59da9ef..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TimeZonePreferenceControllerTest {
-
-    @Mock
-    private AutoTimeZonePreferenceController mAutoTimeZonePreferenceController;
-    private Context mContext;
-    private TimeZonePreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        mPreference = new Preference(mContext);
-        mController = spy(new TimeZonePreferenceController(mContext,
-                mAutoTimeZonePreferenceController));
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_autoTimeZoneEnabled_shouldDisablePref() {
-        doReturn("test timezone").when(mController).getTimeZoneOffsetAndName();
-        when(mAutoTimeZonePreferenceController.isEnabled()).thenReturn(true);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_autoTimeZoneDisabled_shouldEnablePref() {
-        doReturn("test timezone").when(mController).getTimeZoneOffsetAndName();
-        when(mAutoTimeZonePreferenceController.isEnabled()).thenReturn(false);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
deleted file mode 100644
index 92807e9fcf3e15bdf2b8ff5e654c82b3d3857c63..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.testutils.shadow.ShadowZoneGetter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ZonePickerTest {
-
-    private Activity mActivity;
-    private ZonePicker mZonePicker;
-
-    @Before
-    public void setUp() {
-        mActivity = Robolectric.setupActivity(Activity.class);
-        mZonePicker = spy(ZonePicker.class);
-        ReflectionHelpers.setField(mZonePicker, "mVisibilityLoggerMixin",
-                mock(VisibilityLoggerMixin.class));
-    }
-
-    @Test
-    @Config(shadows = ShadowZoneGetter.class)
-    public void testLaunch() {
-        // Shouldn't crash
-        mActivity.getFragmentManager()
-                .beginTransaction()
-                .add(mZonePicker, "test_tag")
-                .commit();
-
-        // Should render
-        verify(mZonePicker).onCreateView(
-                nullable(LayoutInflater.class),
-                nullable(ViewGroup.class),
-                nullable(Bundle.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
deleted file mode 100644
index dd438ffd77b286f9f1ea7cb68f62e2dd103680bb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.android.settings.deletionhelper;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutomaticStorageManagerDescriptionPreferenceControllerTest {
-    @Mock private PreferenceScreen mScreen;
-    @Mock private Preference mPreference;
-    private AutomaticStorageManagerDescriptionPreferenceController mController;
-    private Context mContext = RuntimeEnvironment.application;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new AutomaticStorageManagerDescriptionPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-        when(mPreference.getContext()).thenReturn(mContext);
-    }
-
-    @Test
-    public void displayPreference_asmDisabled_shouldHaveDescription() {
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setSummary(eq(R.string.automatic_storage_manager_text));
-    }
-
-    @Test
-    public void displayPreference_asmEnabledButUnused_shouldHaveDescription() {
-        Settings.Secure.putInt(
-                mContext.getContentResolver(),
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
-                1);
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setSummary(eq(R.string.automatic_storage_manager_text));
-    }
-
-    @Ignore("Robolectric doesn't do locale switching for date localization -- yet.")
-    @Test
-    @Config(qualifiers = "en")
-    public void displayPreference_asmEnabledAndUsed_shouldHaveDescriptionFilledOut() {
-        Settings.Secure.putInt(
-                mContext.getContentResolver(),
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
-                1);
-        Settings.Secure.putLong(
-                mContext.getContentResolver(),
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED,
-                10);
-        Settings.Secure.putLong(
-                mContext.getContentResolver(),
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN,
-                43200000); // January 1, 1970 12:00:00 PM to avoid timezone issues.
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference)
-                .setSummary(eq("10.00B total made available\n\nLast ran on January 1, 1970"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
deleted file mode 100644
index 38c4ab21e9d88e2d2108fa0aa1acbc2e6dc54cee..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.deletionhelper;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import com.android.settings.widget.SwitchBar;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutomaticStorageManagerSwitchBarControllerTest {
-    private Context mContext;
-    private SwitchBar mSwitchBar;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-    private Preference mPreference;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private FragmentManager mFragmentManager;
-
-    private AutomaticStorageManagerSwitchBarController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mSwitchBar = new SwitchBar(mContext);
-
-        Context fakeContextForFakeProvider = mock(Context.class, RETURNS_DEEP_STUBS);
-        FakeFeatureFactory.setupForTest(fakeContextForFakeProvider);
-        FeatureFactory featureFactory = FakeFeatureFactory.getFactory(fakeContextForFakeProvider);
-        mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
-        mPreference = new Preference(mContext);
-
-        mController =
-                new AutomaticStorageManagerSwitchBarController(
-                        mContext,
-                        mSwitchBar,
-                        mMetricsFeatureProvider,
-                        mPreference,
-                        mFragmentManager);
-    }
-
-    @Test
-    public void onSwitchChanged_false_recordsAMetric() {
-        mController.onSwitchChanged(null, false);
-
-        verify(mMetricsFeatureProvider)
-                .action(
-                        eq(mContext),
-                        eq(MetricsProto.MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER),
-                        eq(false));
-    }
-
-    @Test
-    public void onSwitchChanged_true_recordsAMetric() {
-        mController.onSwitchChanged(null, true);
-
-        verify(mMetricsFeatureProvider)
-                .action(
-                        eq(mContext),
-                        eq(MetricsProto.MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER),
-                        eq(true));
-    }
-
-    @Test
-    public void onSwitchChanged_showWarningFragmentIfNotEnabledByDefault() {
-        mController.onSwitchChanged(null, true);
-
-        verify(mFragmentManager.beginTransaction())
-                .add(any(Fragment.class), eq(ActivationWarningFragment.TAG));
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void onSwitchChange_doNotShowWarningFragmentIfEnabledByDefault() {
-        SettingsShadowSystemProperties.set("ro.storage_manager.enabled", "true");
-
-        mController.onSwitchChanged(null, true);
-
-        verify(mFragmentManager.beginTransaction(), never())
-                .add(any(Fragment.class), eq(ActivationWarningFragment.TAG));
-    }
-
-    @Test
-    public void initializeSwitchOnConstruction() {
-        Settings.Secure.putInt(
-                mContext.getContentResolver(),
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
-                1);
-
-        mController =
-                new AutomaticStorageManagerSwitchBarController(
-                        mContext,
-                        mSwitchBar,
-                        mMetricsFeatureProvider,
-                        mPreference,
-                        mFragmentManager);
-
-        assertThat(mSwitchBar.isChecked()).isTrue();
-    }
-
-    @Test
-    public void initializingSwitchDoesNotTriggerView() {
-        Settings.Secure.putInt(
-                mContext.getContentResolver(),
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
-                1);
-
-        mController =
-                new AutomaticStorageManagerSwitchBarController(
-                        mContext,
-                        mSwitchBar,
-                        mMetricsFeatureProvider,
-                        mPreference,
-                        mFragmentManager);
-
-        verify(mFragmentManager.beginTransaction(), never())
-                .add(any(Fragment.class), eq(ActivationWarningFragment.TAG));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
deleted file mode 100644
index f703b263604e6e60ed64657abf7b42ae6bbcdfd7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.provider.Settings;
-import android.os.UserManager;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BugReportInPowerPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private BugReportInPowerPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
-        mContext = spy(shadowContext.getApplicationContext());
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        mPreference = new SwitchPreference(mContext);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mController = new BugReportInPowerPreferenceController(mContext);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void displayPreference_hasDebugRestriction_shouldRemovePreference() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPreference_noDebugRestriction_shouldNotRemovePreference() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void enablePreference_hasDebugRestriction_shouldNotEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        mController.displayPreference(mScreen);
-        mPreference.setEnabled(false);
-
-        mController.enablePreference(true);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void enablePreference_noDebugRestriction_shouldEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        mController.displayPreference(mScreen);
-        mPreference.setEnabled(false);
-
-        mController.enablePreference(true);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void resetPreference_shouldUncheck() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        mController.displayPreference(mScreen);
-        mPreference.setChecked(true);
-
-        mController.resetPreference();
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_shouldUpdateSettings() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        Settings.Secure.putInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 0);
-        mPreference.setChecked(true);
-        mController.displayPreference(mScreen);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 0)).isEqualTo(1);
-    }
-
-    @Test
-    public void updateState_settingsOn_shouldCheck() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        Settings.Secure.putInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 1);
-        mPreference.setChecked(false);
-        mController.displayPreference(mScreen);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void updateState_settingsOff_shouldUncheck() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        Settings.Secure.putInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 0);
-        mPreference.setChecked(true);
-        mController.displayPreference(mScreen);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void updateBugreportOptions_shouldEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        mPreference.setEnabled(false);
-        mController.displayPreference(mScreen);
-
-        mController.updateBugreportOptions();
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void updateBugreportOptions_shouldEnableBugReportStorage() {
-        final ComponentName componentName = new ComponentName("com.android.shell",
-            "com.android.shell.BugreportStorageProvider");
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        mController.displayPreference(mScreen);
-
-        mController.updateBugreportOptions();
-
-        verify(mPackageManager).setComponentEnabledSetting(eq(componentName), anyInt(), anyInt());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
deleted file mode 100644
index 3b3b482fa41473258de946d78998802d63426de7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BugReportPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private Preference mPreference;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock
-    private UserManager mUserManager;
-
-    private BugReportPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mController = new BugReportPreferenceController(mContext);
-    }
-
-    @Test
-    public void displayPreference_hasDebugRestriction_shouldRemovePreference() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPreference_noDebugRestriction_shouldNotRemovePreference() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void enablePreference_hasDebugRestriction_shouldNotEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        mController.displayPreference(mScreen);
-
-        mController.enablePreference(true);
-
-        verify(mPreference, never()).setEnabled(anyBoolean());
-    }
-
-    @Test
-    public void enablePreference_noDebugRestriction_shouldEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        mController.displayPreference(mScreen);
-
-        mController.enablePreference(true);
-
-        verify(mPreference).setEnabled(anyBoolean());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
deleted file mode 100644
index 7aab99d7c8787bd3cb7329ec374999c6fc4f7efb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.RuntimeEnvironment;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {SettingsShadowSystemProperties.class})
-public class CameraLaserSensorPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SwitchPreference mPreference;
-
-    static final String USERDEBUG_BUILD = "userdebug";
-    static final String ENG_BUILD = "eng";
-    static final String USER_BUILD = "user";
-
-    private CameraLaserSensorPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new CameraLaserSensorPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowSystemProperties.clear();
-    }
-
-    @Test
-    public void isAvailable_withConfigNoShow_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
-        SettingsShadowSystemProperties.set(
-                CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_withEngBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
-        SettingsShadowSystemProperties.set(
-                CameraLaserSensorPreferenceController.BUILD_TYPE, ENG_BUILD);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_withUserBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
-        SettingsShadowSystemProperties.set(
-                CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_cameraLaserSensorEnabled_shouldCheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
-        SettingsShadowSystemProperties.set(
-                CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
-                Integer.toString(CameraLaserSensorPreferenceController.ENABLED));
-        SettingsShadowSystemProperties.set(
-                CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void displayPreference_cameraLaserSensorEnabled_shouldUncheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
-        SettingsShadowSystemProperties.set(
-                CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
-                Integer.toString(CameraLaserSensorPreferenceController.DISABLED));
-        SettingsShadowSystemProperties.set(
-                CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableCameraLaserSensor() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
-        when(mPreference.isChecked()).thenReturn(true);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(Integer.toString(CameraLaserSensorPreferenceController.ENABLED).equals(
-            SystemProperties.get(
-                        CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
-                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)))).isTrue();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraLaserSensor() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
-        when(mPreference.isChecked()).thenReturn(false);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED).equals(
-                SystemProperties.get(
-                        CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
-                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)))).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
deleted file mode 100644
index 59276465ac84393887f8b5009c8c957f5bb44d0e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowToast;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DevelopmentSettingsDisabledActivityTest {
-
-    @Test
-    public void launchActivity_shouldShowToast() {
-        Robolectric.setupActivity(DevelopmentSettingsDisabledActivity.class);
-
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.dev_settings_disabled_warning));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
deleted file mode 100644
index 223f98d7686528d92c6a691b2560bfe882f28ac2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.provider.Settings;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DevelopmentSettingsEnablerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SharedPreferences mDevelopmentPreferences;
-    private Context mContext;
-    private DevelopmentSettingsEnabler mEnabler;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mEnabler = new DevelopmentSettingsEnabler(mContext, null);
-        ReflectionHelpers.setField(mEnabler, "mDevelopmentPreferences", mDevelopmentPreferences);
-    }
-
-    @Test
-    public void constructor_shouldInitEnabledState() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-
-        mEnabler = new DevelopmentSettingsEnabler(mContext, null);
-
-        assertThat(mEnabler.getLastEnabledState()).isTrue();
-    }
-
-    @Test
-    public void onResume_shouldReadStateFromSettingProvider() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-
-        mEnabler.onResume();
-
-        assertThat(mEnabler.getLastEnabledState()).isTrue();
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
-
-        mEnabler.onResume();
-
-        assertThat(mEnabler.getLastEnabledState()).isFalse();
-    }
-
-    @Test
-    public void disable_shouldChangeSettingProviderValue() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-
-        mEnabler.disableDevelopmentSettings();
-
-        assertThat(mEnabler.getLastEnabledState()).isFalse();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1)).isEqualTo(0);
-    }
-
-    @Test
-    public void enable_shouldChangeSettingProviderValue() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
-
-        mEnabler.enableDevelopmentSettings();
-
-        assertThat(mEnabler.getLastEnabledState()).isTrue();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0)).isEqualTo(1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
deleted file mode 100644
index 8e4b74d21e2d0df5eef8af42af6b31ea6cd57bfb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.app.Activity;
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.drawer.CategoryKey;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class
-        })
-public class DevelopmentSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private DevelopmentSettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mSettings = spy(new DevelopmentSettings());
-    }
-
-    @Test
-    public void addDashboardCategoryPreference_shouldAddToScreen() {
-        final List<Preference> preferences = new ArrayList<>();
-        preferences.add(new Preference(ShadowApplication.getInstance().getApplicationContext()));
-        preferences.add(new Preference(ShadowApplication.getInstance().getApplicationContext()));
-        doReturn(mScreen).when(mSettings).getPreferenceScreen();
-        doReturn(mPreferenceManager).when(mSettings).getPreferenceManager();
-        doReturn(mActivity).when(mSettings).getActivity();
-        when(mPreferenceManager.getContext()).thenReturn(mContext);
-        when(mFeatureFactory.dashboardFeatureProvider.getPreferencesForCategory(
-                mActivity, mContext, mSettings.getMetricsCategory(),
-                CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT))
-                .thenReturn(preferences);
-
-        mSettings.onAttach(mContext);
-        mSettings.addDashboardCategoryPreferences();
-
-        verify(mScreen, times(2)).addPreference(any(Preference.class));
-    }
-
-    @Test
-    public void searchIndex_shouldIndexFromPrefXml() {
-        final List<SearchIndexableResource> index =
-                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        RuntimeEnvironment.application, true);
-
-        assertThat(index.size()).isEqualTo(1);
-        assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_prefs);
-    }
-
-    @Test
-    public void searchIndex_pageDisabled_shouldAddAllKeysToNonIndexable() {
-        final Context appContext = RuntimeEnvironment.application;
-        new DevelopmentSettingsEnabler(appContext, null /* lifecycle */)
-                .disableDevelopmentSettings();
-
-        final List<String> nonIndexableKeys =
-                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(appContext);
-
-        assertThat(nonIndexableKeys).contains("development_prefs_screen");
-    }
-
-    @Test
-    public void searchIndex_pageEnabled_shouldNotAddKeysToNonIndexable() {
-        final Context appContext = RuntimeEnvironment.application;
-        new DevelopmentSettingsEnabler(appContext, null /* lifecycle */)
-                .enableDevelopmentSettings();
-
-        final List<String> nonIndexableKeys =
-                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(appContext);
-
-        assertThat(nonIndexableKeys).doesNotContain("development_prefs_screen");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
deleted file mode 100644
index a53b83662cbd45dee0f9f68d7c6eb7ebc23e4c8a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowUtils.class
-        })
-public class DevelopmentSwitchBarControllerTest {
-
-    @Mock
-    private DevelopmentSettings mSettings;
-    private Lifecycle mLifecycle;
-    private SwitchBar mSwitchBar;
-    private DevelopmentSwitchBarController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        mSwitchBar = new SwitchBar(RuntimeEnvironment.application);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowUtils.reset();
-    }
-
-    @Test
-    public void runThroughLifecycle_isMonkeyRun_shouldNotRegisterListener() {
-        ShadowUtils.setIsUserAMonkey(true);
-        mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
-                true /* isAvailable */, mLifecycle);
-        final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
-                ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
-
-        mLifecycle.onStart();
-        assertThat(listeners).doesNotContain(mSettings);
-
-        mLifecycle.onStop();
-        assertThat(listeners).doesNotContain(mSettings);
-    }
-
-    @Test
-    public void runThroughLifecycle_isNotMonkeyRun_shouldRegisterAndRemoveListener() {
-        ShadowUtils.setIsUserAMonkey(false);
-        mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
-                true /* isAvailable */, mLifecycle);
-        final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
-                ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
-
-        mLifecycle.onStart();
-        assertThat(listeners).contains(mSettings);
-
-        mLifecycle.onStop();
-        assertThat(listeners).doesNotContain(mSettings);
-    }
-
-    @Test
-    public void buildController_unavailable_shouldDisableSwitchBar() {
-        ShadowUtils.setIsUserAMonkey(false);
-        mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
-                false /* isAvailable */, mLifecycle);
-
-        assertThat(mSwitchBar.isEnabled()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
deleted file mode 100644
index 2f0f261fda8e4548f8d589346ed6da984a96bc89..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TelephonyMonitorPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SwitchPreference mPreference;
-
-    private TelephonyMonitorPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        SettingsShadowSystemProperties.clear();
-        mController = new TelephonyMonitorPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "eng");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "user");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(false);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(false);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "eng");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(false);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "user");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorEnabled_shouldCheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.ENABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorUserEnabled_shouldCheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.USER_ENABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorDisabled_shouldUncheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.DISABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorUserDisabled_shouldUncheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.USER_DISABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableTelephonyMonitor() {
-        when(mPreference.isChecked()).thenReturn(true);
-
-        when(mContext.getResources().getString(R.string.telephony_monitor_toast))
-                .thenReturn("To apply telephony monitor change, reboot device");
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(TelephonyMonitorPreferenceController.USER_ENABLED_STATUS.equals(
-                SystemProperties.get(
-                        TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                        TelephonyMonitorPreferenceController.DISABLED_STATUS))).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableTelephonyMonitor() {
-        when(mPreference.isChecked()).thenReturn(false);
-
-        when(mContext.getResources().getString(R.string.telephony_monitor_toast))
-                .thenReturn("To apply telephony monitor change, reboot device");
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(TelephonyMonitorPreferenceController.USER_DISABLED_STATUS.equals(
-                SystemProperties.get(
-                        TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                        TelephonyMonitorPreferenceController.DISABLED_STATUS))).isTrue();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
deleted file mode 100644
index 45e457bd195ddd2d5177543c9c4f278457eada25..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.development;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.provider.Settings.Global;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedSwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Collections;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VerifyAppsOverUsbPreferenceControllerTest {
-
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private RestrictedSwitchPreference mPreference;
-
-    @Mock
-    private VerifyAppsOverUsbPreferenceController.RestrictedLockUtilsDelegate
-            mRestrictedLockUtilsDelegate;
-
-    private Context mContext;
-    private VerifyAppsOverUsbPreferenceController mController;
-
-    /** Convenience class for setting global int settings. */
-    class GlobalSetter {
-        public GlobalSetter set(String setting, int value) {
-            Global.putInt(mContext.getContentResolver(), setting, value);
-            return this;
-        }
-    }
-    private final GlobalSetter mGlobals = new GlobalSetter();
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = spy(shadowContext.getApplicationContext());
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        mController = new VerifyAppsOverUsbPreferenceController(mContext);
-        ReflectionHelpers.setField(
-                mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
-    }
-
-    private void setupVerifyBroadcastReceivers(boolean nonEmpty) {
-        final List<ResolveInfo> resolveInfos = nonEmpty
-                ? Collections.singletonList(mock(ResolveInfo.class))
-                : Collections.<ResolveInfo>emptyList();
-        when(mPackageManager.queryBroadcastReceivers((Intent) any(), anyInt()))
-                .thenReturn(resolveInfos);
-    }
-
-    private void setupEnforcedAdmin(EnforcedAdmin result) {
-        when(mRestrictedLockUtilsDelegate.checkIfRestrictionEnforced(
-                (Context) any(), anyString(), anyInt())).thenReturn(result);
-    }
-
-    @Test
-    public void updateState_preferenceCheckedWhenSettingIsOn() {
-        setupVerifyBroadcastReceivers(true);
-        setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceUncheckedWhenSettingIsOff() {
-        setupVerifyBroadcastReceivers(true);
-        setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void updateState_preferenceUncheckedWhenNoAdb() {
-        setupVerifyBroadcastReceivers(true);
-        setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 0).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void updateState_preferenceUncheckedWhenVerifierIsOff() {
-        setupVerifyBroadcastReceivers(true);
-        setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1)
-                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1)
-                .set(Global.PACKAGE_VERIFIER_ENABLE, 0);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void updateState_preferenceUncheckedWhenNoVerifyBroadcastReceivers() {
-        setupVerifyBroadcastReceivers(false);
-        setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1)
-                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void updateState_preferenceDisabledWhenRestrictedByAdmin() {
-        setupVerifyBroadcastReceivers(true);
-        final EnforcedAdmin admin = new EnforcedAdmin();
-        setupEnforcedAdmin(admin);
-        mGlobals.set(Global.ADB_ENABLED, 1)
-                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
-        verify(mPreference).setDisabledByAdmin(admin);
-    }
-
-    @Test
-    public void updateState_preferenceRemovedWhenVerifierSettingsVisibleIsOff() {
-        setupVerifyBroadcastReceivers(true);
-        mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 0);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(anyInt())).thenReturn(mPreference);
-        mController.displayPreference(mScreen);
-        verify(mScreen).removePreference(mPreference);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
deleted file mode 100644
index 3bba438ab52435b75c9b52c9064ed05762c7f91a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BasebandVersionPreferenceControllerTest {
-
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mCm;
-    @Mock
-    private Preference mPreference;
-
-    private BasebandVersionPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new BasebandVersionPreferenceController(mContext);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);
-    }
-
-    @Test
-    public void isAvailable_wifiOnly_shouldReturnFalse() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_hasMobile_shouldReturnTrue() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void updateState_shouldLoadFromSysProperty() {
-        SettingsShadowSystemProperties.set("gsm.version.baseband", "test");
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary("test");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
deleted file mode 100644
index 6dc7bbe9b9b254c10c7482664ee2acfb29f573ec..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Build;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.BidiFormatter;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
-import com.android.settings.development.DevelopmentSettings;
-import com.android.settings.search.DatabaseIndexingManager;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowUtils.class
-        })
-public class BuildNumberPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock
-    private UserManager mUserManager;
-
-    private Lifecycle mLifecycle;
-    private FakeFeatureFactory mFactory;
-    private Preference mPreference;
-    private BuildNumberPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFactory = FakeFeatureFactory.setupForTest(mContext);
-        mLifecycle = new Lifecycle();
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mController = new BuildNumberPreferenceController(
-                mContext, mActivity, mFragment, mLifecycle);
-
-        mPreference = new Preference(RuntimeEnvironment.application);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @After
-    public void tearDown() {
-        ShadowUtils.reset();
-    }
-
-    @Test
-    public void displayPref_shouldAlwaysDisplay() {
-        mController.displayPreference(mScreen);
-
-        verify(mScreen.findPreference(mController.getPreferenceKey()))
-                .setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void handlePrefTreeClick_onlyHandleBuildNumberPref() {
-        assertThat(mController.handlePreferenceTreeClick(mock(Preference.class))).isFalse();
-    }
-
-    @Test
-    public void handlePrefTreeClick_notAdminUser_doNothing() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-    }
-
-    @Test
-    public void handlePrefTreeClick_deviceNotProvisioned_doNothing() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        final Context context = RuntimeEnvironment.application;
-        Settings.Global.putInt(context.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 0);
-
-        mController = new BuildNumberPreferenceController(
-                context, mActivity, mFragment, mLifecycle);
-        ReflectionHelpers.setField(mController, "mContext", context);
-        ReflectionHelpers.setField(mController, "mUm", mUserManager);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-        verify(mFactory.metricsFeatureProvider).action(
-                any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF));
-    }
-
-    @Test
-    public void handlePrefTreeClick_isMonkeyRun_doNothing() {
-        final Context context = spy(RuntimeEnvironment.application);
-        Settings.Global.putInt(context.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 1);
-        ShadowUtils.setIsUserAMonkey(true);
-        mController = new BuildNumberPreferenceController(
-                context, mActivity, mFragment, mLifecycle);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-    }
-
-    @Test
-    public void handlePrefTreeClick_userHasRestriction_doNothing() {
-        final Context context = spy(RuntimeEnvironment.application);
-        Settings.Global.putInt(context.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 1);
-
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES))
-                .thenReturn(true);
-
-        mController = new BuildNumberPreferenceController(
-                mContext, mActivity, mFragment, mLifecycle);
-        ReflectionHelpers.setField(mController, "mContext", context);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-        verify(mFactory.metricsFeatureProvider).action(
-                any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF));
-    }
-
-    @Test
-    public void onActivityResult_notConfirmPasswordRequest_doNothing() {
-        final boolean activityResultHandled = mController.onActivityResult(
-                BuildNumberPreferenceController.REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF + 1,
-                Activity.RESULT_OK,
-                null);
-
-        assertThat(activityResultHandled).isFalse();
-        verify(mContext, never())
-                .getSharedPreferences(DevelopmentSettings.PREF_FILE, Context.MODE_PRIVATE);
-    }
-
-    @Test
-    public void onActivityResult_confirmPasswordRequestFailed_doNotEnableDevPref() {
-        final boolean activityResultHandled = mController.onActivityResult(
-                BuildNumberPreferenceController.REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
-                Activity.RESULT_CANCELED,
-                null);
-
-        assertThat(activityResultHandled).isTrue();
-        verify(mContext, never())
-                .getSharedPreferences(DevelopmentSettings.PREF_FILE, Context.MODE_PRIVATE);
-    }
-
-    @Test
-    public void onActivityResult_confirmPasswordRequestCompleted_enableDevPref() {
-        final Context context = RuntimeEnvironment.application;
-
-        when(mFactory.searchFeatureProvider.getIndexingManager(any(Context.class)))
-                .thenReturn(mock(DatabaseIndexingManager.class));
-
-        mController = new BuildNumberPreferenceController(
-                context, mActivity, mFragment, mLifecycle);
-
-        final boolean activityResultHandled = mController.onActivityResult(
-                BuildNumberPreferenceController.REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
-                Activity.RESULT_OK,
-                null);
-
-        assertThat(activityResultHandled).isTrue();
-        assertThat(context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                Context.MODE_PRIVATE).getBoolean(DevelopmentSettings.PREF_SHOW, false))
-                .isTrue();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
deleted file mode 100644
index 108d34212d2dd64d626eab25e077c5cc5e0ea8e0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-
-import android.app.Fragment;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DeviceModelPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    private DeviceModelPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new DeviceModelPreferenceController(mContext, mFragment);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void displayPref_shouldSetSummary() {
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mPreference).setSummary(anyString());
-    }
-
-    @Test
-    public void clickPreference_shouldLaunchHardwareInfoDialog() {
-        assertThat(mController.handlePreferenceTreeClick(mPreference))
-                .isTrue();
-        verify(mFragment).getFragmentManager();
-        verify(mFragment.getFragmentManager().beginTransaction())
-                .add(any(HardwareInfoDialogFragment.class), eq(HardwareInfoDialogFragment.TAG));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
deleted file mode 100644
index 951d8c7310b94ef0e0e7beec8cecfd4e57f0db8c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FccEquipmentIdPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    private FccEquipmentIdPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new FccEquipmentIdPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-    }
-
-    @Test
-    public void isAvailable_configEmpty_shouldReturnFalse() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Config(shadows = SettingsShadowSystemProperties.class)
-    public void isAvailable_configNonEmpty_shouldReturnTrue() {
-        SettingsShadowSystemProperties.set("ro.ril.fccid", "fcc_equipment");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
deleted file mode 100644
index dfc1a0c65f90a4ad000a727cbcec74ce82b5ef59..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-import android.app.Fragment;
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FeedbackPreferenceControllerTest {
-    @Mock
-    private Fragment mFragment;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FeedbackPreferenceController mController;
-
-    public FeedbackPreferenceControllerTest() {
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        this.mController = new FeedbackPreferenceController(this.mFragment, this.mContext);
-    }
-
-    @Test
-    public void isAvailable_noReporterPackage_shouldReturnFalse() {
-        when(this.mContext.getResources().getString(anyInt())).thenReturn("");
-        assertThat(Boolean.valueOf(this.mController.isAvailable())).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
deleted file mode 100644
index 5a4d9888dffbeac363ff470d6f60ee1e1a35caaa..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FirmwareVersionPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private UserManager mUserManager;
-    private FirmwareVersionPreferenceController mController;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(null);
-        mController = new FirmwareVersionPreferenceController(mContext, mLifecycle);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
deleted file mode 100644
index 8e8da51aa73a0bca500af0bc2d39d92e4c639421..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import android.app.Activity;
-import android.os.SystemProperties;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class HardwareInfoDialogFragmentTest {
-
-    private Activity mActivity;
-
-    @Before
-    public void setUp() {
-        mActivity = Robolectric.setupActivity(Activity.class);
-    }
-
-    @Test
-    public void display_shouldShowHardwareRevision() {
-        final String TEST_HARDWARE_REV = "123";
-        SystemProperties.set("ro.boot.hardware.revision", TEST_HARDWARE_REV);
-
-        final HardwareInfoDialogFragment fragment = spy(HardwareInfoDialogFragment.newInstance());
-        fragment.show(mActivity.getFragmentManager(), HardwareInfoDialogFragment.TAG);
-
-        verify(fragment).setText(
-                any(View.class), eq(R.id.model_label), eq(R.id.model_value),
-                anyString());
-
-        verify(fragment).setText(
-                any(View.class), eq(R.id.hardware_rev_label), eq(R.id.hardware_rev_value),
-                anyString());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
deleted file mode 100644
index 10e495873773da5127722d189883654f87a4b4e5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class KernelVersionPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    private KernelVersionPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new KernelVersionPreferenceController(mContext);
-    }
-
-    @Test
-    public void alwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
deleted file mode 100644
index 6151ca030f772bdb45ef3b4c389042c9a85b8f81..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ManualPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private ManualPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new ManualPreferenceController(mContext);
-    }
-
-    @Test
-    public void isAvailable_configTurnedOff_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(anyInt()))
-                .thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_configTurnedOn_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(anyInt()))
-                .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
deleted file mode 100644
index ca6a33a268b48a984e61e56c363d221bc410a425..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.os.storage.VolumeInfo;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PrivateVolumeOptionMenuControllerTest {
-    @Mock
-    private MenuItem mMigrateMenuItem;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Menu mMenu;
-    @Mock
-    private MenuInflater mMenuInflater;
-    @Mock
-    private PackageManagerWrapper mPm;
-    @Mock
-    private VolumeInfo mVolumeInfo;
-    @Mock
-    private VolumeInfo mPrimaryInfo;
-
-    private PrivateVolumeOptionMenuController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mVolumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
-        when(mPrimaryInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
-        when(mMenu.findItem(anyInt())).thenReturn(mMigrateMenuItem);
-        when(mMigrateMenuItem.getItemId()).thenReturn(100);
-
-        mController = new PrivateVolumeOptionMenuController(
-                RuntimeEnvironment.application, mPrimaryInfo, mPm);
-    }
-
-    @Test
-    public void testMigrateDataMenuItemIsAdded() {
-        mController.onCreateOptionsMenu(mMenu, mMenuInflater);
-
-        verify(mMenu).add(Menu.NONE, 100, Menu.NONE, R.string.storage_menu_migrate);
-    }
-
-    @Test
-    public void testMigrateDataIsNotVisibleNormally() {
-        when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mPrimaryInfo);
-
-        mController.onCreateOptionsMenu(mMenu, mMenuInflater);
-        mController.onPrepareOptionsMenu(mMenu);
-
-        verify(mMigrateMenuItem).setVisible(false);
-    }
-
-    @Test
-    public void testMigrateDataIsVisibleWhenExternalVolumeIsPrimary() {
-        when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mVolumeInfo);
-
-        mController.onCreateOptionsMenu(mMenu, mMenuInflater);
-        mController.onPrepareOptionsMenu(mMenu);
-
-        verify(mMigrateMenuItem).setVisible(true);
-    }
-
-    @Test
-    public void testMigrateDataGoesToMigrateWizard() {
-        when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mVolumeInfo);
-
-        mController.onCreateOptionsMenu(mMenu, mMenuInflater);
-        mController.onPrepareOptionsMenu(mMenu);
-
-        assertThat(mController.onOptionsItemSelected(mMigrateMenuItem)).isTrue();
-        assertThat(ShadowApplication.getInstance()
-                .getNextStartedActivity().getComponent().getClassName())
-                .isEqualTo(StorageWizardMigrateConfirm.class.getName());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
deleted file mode 100644
index 4ea33ee7eceed931e37c9f35550591f938a142ba..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RegulatoryInfoPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PackageManager mPackageManager;
-    private RegulatoryInfoPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
-        mController = new RegulatoryInfoPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-    }
-
-    @Test
-    public void isAvailable_hasIntent_returnTrue() {
-        final List<ResolveInfo> activities = new ArrayList<>();
-        activities.add(new ResolveInfo());
-        when(mPackageManager.queryIntentActivities(any(Intent.class), eq(0)))
-                .thenReturn(activities);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_hasNoIntent_returnFalse() {
-        final List<ResolveInfo> activities = new ArrayList<>();
-        when(mPackageManager.queryIntentActivities(any(Intent.class), eq(0)))
-                .thenReturn(activities);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
deleted file mode 100644
index 18ef003937136e17fe6106ed1ac8a3b171b178f5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SerialNumberPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private SerialNumberPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void testIsAvaiable_noSerial_shouldReturnFalse() {
-        mController = new SerialNumberPreferenceController(mContext, null);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvaiable_hasSerial_shouldReturnTrue() {
-        mController = new SerialNumberPreferenceController(mContext, "123");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testDisplay_noSerial_shouldHidePreference() {
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        mController = new SerialNumberPreferenceController(mContext, null);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void testDisplay_hasSerial_shouldSummary() {
-        final String serial = "123";
-        final Preference preference = mock(Preference.class);
-        when(mScreen.findPreference(anyString())).thenReturn(preference);
-
-        mController = new SerialNumberPreferenceController(mContext, serial);
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-        verify(preference).setSummary(serial);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
deleted file mode 100644
index b1296e5f38b3c5cf13df766cc001a658254620da..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.os.storage.StorageManager;
-import android.provider.SearchIndexableResource;
-import android.util.SparseArray;
-import android.view.View;
-
-import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper;
-import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-import com.android.settingslib.drawer.CategoryKey;
-import android.support.v7.widget.RecyclerView;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StorageDashboardFragmentTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private StorageManager mStorageManager;
-
-    private StorageDashboardFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFragment = new StorageDashboardFragment();
-    }
-
-    @Test
-    public void testCategory_isConnectedDevice() {
-        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_STORAGE);
-    }
-
-    @Test
-    public void test_initializeOptionsMenuInvalidatesExistingMenu() {
-        Activity activity = mock(Activity.class);
-
-        mFragment.initializeOptionsMenu(activity);
-
-        verify(activity).invalidateOptionsMenu();
-    }
-
-    @Test
-    public void test_cacheProviderProvidesValuesIfBothCached() {
-        CachedStorageValuesHelper helper = mock(CachedStorageValuesHelper.class);
-        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
-        when(helper.getCachedPrivateStorageInfo()).thenReturn(info);
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
-        when(helper.getCachedAppsStorageResult()).thenReturn(result);
-
-        mFragment.setCachedStorageValuesHelper(helper);
-        mFragment.initializeCachedValues();
-
-        assertThat(mFragment.getPrivateStorageInfo()).isEqualTo(info);
-        assertThat(mFragment.getAppsStorageResult()).isEqualTo(result);
-    }
-
-    @Test
-    public void test_cacheProviderDoesntProvideValuesIfAppsMissing() {
-        CachedStorageValuesHelper helper = mock(CachedStorageValuesHelper.class);
-        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
-        when(helper.getCachedPrivateStorageInfo()).thenReturn(info);
-
-        mFragment.setCachedStorageValuesHelper(helper);
-        mFragment.initializeCachedValues();
-
-        assertThat(mFragment.getPrivateStorageInfo()).isNull();
-        assertThat(mFragment.getAppsStorageResult()).isNull();
-    }
-
-    @Test
-    public void test_cacheProviderDoesntProvideValuesIfVolumeInfoMissing() {
-        CachedStorageValuesHelper helper = mock(CachedStorageValuesHelper.class);
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
-        when(helper.getCachedAppsStorageResult()).thenReturn(result);
-
-        mFragment.setCachedStorageValuesHelper(helper);
-        mFragment.initializeCachedValues();
-
-        assertThat(mFragment.getPrivateStorageInfo()).isNull();
-        assertThat(mFragment.getAppsStorageResult()).isNull();
-    }
-
-    @Test
-    public void test_loadWhenQuotaOffIfVolumeInfoNotLoaded() {
-        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
-        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
-        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
-        mFragment = spy(mFragment);
-        when(mFragment.getView()).thenReturn(fakeView);
-        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
-
-        mFragment.maybeSetLoading(false);
-
-        verify(mFragment).setLoading(true, false);
-    }
-
-    @Test
-    public void test_dontLoadWhenQuotaOffIfVolumeInfoNotLoaded() {
-        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
-        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
-        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
-        mFragment = spy(mFragment);
-        when(mFragment.getView()).thenReturn(fakeView);
-        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
-
-        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
-        mFragment.setPrivateStorageInfo(info);
-
-        mFragment.maybeSetLoading(false);
-
-        verify(mFragment, never()).setLoading(true, false);
-    }
-
-    @Test
-    public void test_loadWhenQuotaOnAndVolumeInfoLoadedButAppsMissing() {
-        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
-        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
-        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
-        mFragment = spy(mFragment);
-        when(mFragment.getView()).thenReturn(fakeView);
-        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
-
-        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
-        mFragment.setPrivateStorageInfo(info);
-
-        mFragment.maybeSetLoading(true);
-
-        verify(mFragment).setLoading(true, false);
-    }
-
-    @Test
-    public void test_loadWhenQuotaOnAndAppsLoadedButVolumeInfoMissing() {
-        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
-        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
-        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
-        mFragment = spy(mFragment);
-        when(mFragment.getView()).thenReturn(fakeView);
-        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
-        mFragment.setAppsStorageResult(new SparseArray<>());
-
-        mFragment.maybeSetLoading(true);
-
-        verify(mFragment).setLoading(true, false);
-    }
-
-    @Test
-    public void test_dontLoadWhenQuotaOnAndAllLoaded() {
-        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
-        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
-        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
-        mFragment = spy(mFragment);
-        when(mFragment.getView()).thenReturn(fakeView);
-        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
-
-        mFragment.setAppsStorageResult(new SparseArray<>());
-        PrivateStorageInfo storageInfo = new PrivateStorageInfo(0, 0);
-        mFragment.setPrivateStorageInfo(storageInfo);
-
-        mFragment.maybeSetLoading(true);
-
-        verify(mFragment, never()).setLoading(true, false);
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                StorageDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
deleted file mode 100644
index 5b34c7d5a07df44c583edb174232c70d5252f64b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.deviceinfo;
-
-import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.widget.ProgressBar;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StorageItemPreferenceTest {
-    private Context mContext;
-    private StorageItemPreference mPreference;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new StorageItemPreference(mContext);
-    }
-
-    @Test
-    public void testBeforeLoad() {
-        assertThat(mPreference.getSummary()).isEqualTo(
-                mContext.getString(R.string.memory_calculating_size));
-    }
-
-    @Test
-    public void testAfterLoad() {
-        mPreference.setStorageSize(MEGABYTE_IN_BYTES * 10, MEGABYTE_IN_BYTES * 100);
-        assertThat(((String) mPreference.getSummary())).isEqualTo("0.01 GB");
-    }
-
-    @Test
-    public void testProgressBarPercentageSet() {
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.storage_item, null));
-        final ProgressBar progressBar =
-                (ProgressBar) holder.itemView.findViewById(android.R.id.progress);
-
-        mPreference.onBindViewHolder(holder);
-        mPreference.setStorageSize(MEGABYTE_IN_BYTES, MEGABYTE_IN_BYTES * 10);
-
-        assertThat(progressBar.getProgress()).isEqualTo(10);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
deleted file mode 100644
index b0f464cf2ddb5c6533bf1f70de1cf07092211dc9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.util.SparseArray;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
-import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
-import com.android.settingslib.applications.StorageStatsSource;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StorageProfileFragmentTest {
-    @Captor
-    private ArgumentCaptor<SparseArray<StorageAsyncLoader.AppsStorageResult>> mCaptor;
-
-    @Test
-    public void verifyAppSizesAreNotZeroedOut() {
-        StorageItemPreferenceController controller = mock(StorageItemPreferenceController.class);
-        StorageProfileFragment fragment = new StorageProfileFragment();
-        StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
-        result.musicAppsSize = 100;
-        result.otherAppsSize = 200;
-        result.gamesSize = 300;
-        result.videoAppsSize = 400;
-        result.externalStats = new StorageStatsSource.ExternalStorageStats(6, 1, 2, 3, 0);
-        SparseArray<StorageAsyncLoader.AppsStorageResult> resultsArray = new SparseArray<>();
-        resultsArray.put(0, result);
-        fragment.setPreferenceController(controller);
-
-        fragment.onLoadFinished(null, resultsArray);
-
-        MockitoAnnotations.initMocks(this);
-        verify(controller).onLoadFinished(mCaptor.capture(), anyInt());
-
-        StorageAsyncLoader.AppsStorageResult extractedResult = mCaptor.getValue().get(0);
-        assertThat(extractedResult.musicAppsSize).isEqualTo(100);
-        assertThat(extractedResult.videoAppsSize).isEqualTo(400);
-        assertThat(extractedResult.otherAppsSize).isEqualTo(200);
-        assertThat(extractedResult.gamesSize).isEqualTo(300);
-        assertThat(extractedResult.externalStats.audioBytes).isEqualTo(1);
-        assertThat(extractedResult.externalStats.videoBytes).isEqualTo(2);
-        assertThat(extractedResult.externalStats.imageBytes).isEqualTo(3);
-        assertThat(extractedResult.externalStats.totalBytes).isEqualTo(6);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
deleted file mode 100644
index 5e95a6161027676c11458d41c87fff844a04ae3a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.usage.StorageStatsManager;
-import android.icu.text.NumberFormat;
-import android.os.storage.VolumeInfo;
-import android.text.format.Formatter;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StorageSettingsTest {
-
-    @Mock
-    private StorageManagerVolumeProvider mStorageManagerVolumeProvider;
-    @Mock
-    private Activity mActivity;
-
-    private List<VolumeInfo> mVolumes;
-
-    private StorageSettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mVolumes = new ArrayList<>();
-        mVolumes.add(mock(VolumeInfo.class, RETURNS_DEEP_STUBS));
-        mSettings = new StorageSettings();
-        when(mStorageManagerVolumeProvider.getVolumes()).thenReturn(mVolumes);
-    }
-
-    @Test
-    public void updateSummary_shouldDisplayUsedPercentAndFreeSpace() throws Exception {
-        final SummaryLoader loader = mock(SummaryLoader.class);
-        final SummaryLoader.SummaryProvider provider =
-                StorageSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
-        final VolumeInfo volumeInfo = mVolumes.get(0);
-        when(volumeInfo.isMountedReadable()).thenReturn(true);
-        when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
-        when(mStorageManagerVolumeProvider.getTotalBytes(
-                        nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
-                .thenReturn(500L);
-        when(mStorageManagerVolumeProvider.getFreeBytes(
-                        nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
-                .thenReturn(0L);
-
-        ReflectionHelpers.setField(
-                provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
-        ReflectionHelpers.setField(provider, "mContext", RuntimeEnvironment.application);
-
-        provider.setListening(true);
-
-        final String percentage = NumberFormat.getPercentInstance().format(1);
-        final String freeSpace = Formatter.formatFileSize(RuntimeEnvironment.application, 0);
-        verify(loader).setSummary(provider,
-                RuntimeEnvironment.application.getString(
-                        R.string.storage_summary, percentage, freeSpace));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
deleted file mode 100644
index 5c62220bbd18cb47b6b447bf5a3314a87f41492f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SystemUpdatePreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private SystemUpdatePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new SystemUpdatePreferenceController(mContext, mUserManager);
-    }
-
-    @Test
-    public void updateNonIndexable_bothAvailable_shouldNotUpdate() {
-        final List<String> keys = new ArrayList<>();
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mContext.getResources().getBoolean(
-                R.bool.config_additional_system_update_setting_enable))
-                .thenReturn(true);
-
-        mController.updateNonIndexableKeys(keys);
-
-        assertThat(keys).isEmpty();
-    }
-
-    @Test
-    public void updateNonIndexable_nothingAvailable_shouldUpdateWith2Prefs() {
-        final List<String> keys = new ArrayList<>();
-
-        mController.updateNonIndexableKeys(keys);
-
-        assertThat(keys.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void displayPrefs_nothingAvailable_shouldNotDisplay() {
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void updateState_shouldSetToAndroidVersion() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
-        mController = new SystemUpdatePreferenceController(
-                RuntimeEnvironment.application, mUserManager);
-        mController.updateState(preference);
-
-        assertThat(preference.getSummary())
-                .isEqualTo(RuntimeEnvironment.application.getString(R.string.about_summary,
-                        Build.VERSION.RELEASE));
-    }
-
-    @Test
-    public void displayPrefs_oneAvailable_shouldDisplayOne() {
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        when(mContext.getResources().getBoolean(
-                R.bool.config_additional_system_update_setting_enable))
-                .thenReturn(true);
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
deleted file mode 100644
index ce384a5d973e9812863d2d43f780875df2f462f5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.hardware.usb.UsbManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UsbBackendTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private UsbManager mUsbManager;
-    @Mock
-    private UsbBackend.UserRestrictionUtil mUserRestrictionUtil;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI))
-            .thenReturn(true);
-        when((Object)mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
-    }
-
-    @Test
-    public void constructor_noUsbPort_shouldNotCrash() {
-        UsbBackend usbBackend = new UsbBackend(mContext, mUserRestrictionUtil);
-        // Should not crash
-    }
-
-    @Test
-    public void getCurrentMode_shouldRegisterReceiverToGetUsbState() {
-        UsbBackend usbBackend = new UsbBackend(mContext, mUserRestrictionUtil);
-
-        usbBackend.getCurrentMode();
-
-        verify(mContext).registerReceiver(eq(null),
-            argThat(intentFilter -> intentFilter != null &&
-                UsbManager.ACTION_USB_STATE.equals(intentFilter.getAction(0))));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
deleted file mode 100644
index 1817bfb2902f2f52a3f8b567bbf6193c0c39f292..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UsbModeChooserActivityTest {
-
-    @Mock
-    private TextView mTextView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void updateSummary_chargeDevice_shouldNotSetSummary() {
-        UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[0]);
-        verify(mTextView, never()).setText(anyInt());
-    }
-
-    @Test
-    public void updateSummary_supplyPower_shouldSetSummary() {
-        UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[1]);
-        verify(mTextView).setText(R.string.usb_use_power_only_desc);
-    }
-
-    @Test
-    public void updateSummary_transferFiles_shouldNotSetSummary() {
-        UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[2]);
-        verify(mTextView, never()).setText(anyInt());
-    }
-
-    @Test
-    public void updateSummary_transferPhoto_shouldNotSetSummary() {
-        UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[3]);
-        verify(mTextView, never()).setText(anyInt());
-    }
-
-    @Test
-    public void updateSummary_MIDI_shouldNotSetSummary() {
-        UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[4]);
-        verify(mTextView, never()).setText(anyInt());
-    }
-
-    @Test
-    public void getTitle_shouldReturnCorrectTitle() {
-        assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[0]))
-                .isEqualTo(R.string.usb_use_charging_only);
-
-        assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[1]))
-                .isEqualTo(R.string.usb_use_power_only);
-
-        assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[2]))
-                .isEqualTo(R.string.usb_use_file_transfers);
-
-        assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[3]))
-                .isEqualTo(R.string.usb_use_photo_transfers);
-
-        assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[4]))
-                .isEqualTo(R.string.usb_use_MIDI);
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
deleted file mode 100644
index b737d1f6341be33c6020652d7330e5cf804f7782..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo.storage;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.deletionhelper.ActivationWarningFragment;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import com.android.settings.widget.MasterSwitchPreference;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {SettingsShadowSystemProperties.class}
-)
-public class AutomaticStorageManagementSwitchPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private MasterSwitchPreference mPreference;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private FragmentManager mFragmentManager;
-
-    private Context mContext;
-    private AutomaticStorageManagementSwitchPreferenceController mController;
-    private MetricsFeatureProvider mMetricsFeature;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application.getApplicationContext();
-        FeatureFactory factory = FeatureFactory.getFactory(mContext);
-        mMetricsFeature = factory.getMetricsFeatureProvider();
-
-        mController = new AutomaticStorageManagementSwitchPreferenceController(
-                mContext, mMetricsFeature, mFragmentManager);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-    }
-
-    @Test
-    public void isAvailable_shouldReturnTrue_forHighRamDevice() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnFalse_forLowRamDevice() {
-        SettingsShadowSystemProperties.set("ro.config.low_ram", "true");
-        assertThat(mController.isAvailable()).isFalse();
-        SettingsShadowSystemProperties.clear();
-    }
-
-    @Test
-    public void onResume_shouldReflectEnabledStatus() {
-        mController.displayPreference(mScreen);
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 1);
-
-        mController.onResume();
-
-        verify(mPreference).setChecked(eq(true));
-    }
-
-    @Test
-    public void onResume_shouldRegisterCallback() {
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        verify(mPreference).setOnPreferenceChangeListener(
-                any(Preference.OnPreferenceChangeListener.class));
-    }
-
-    @Test
-    public void togglingShouldCauseMetricsEvent() {
-        // FakeFeatureFactory uses mock contexts, so this test scaffolds itself rather than using
-        // the instance variables.
-        FakeFeatureFactory.setupForTest(mMockContext);
-        FakeFeatureFactory factory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-        AutomaticStorageManagementSwitchPreferenceController controller =
-                new AutomaticStorageManagementSwitchPreferenceController(
-                        mMockContext, factory.metricsFeatureProvider, mFragmentManager);
-
-        controller.onSwitchToggled(true);
-
-        verify(factory.metricsFeatureProvider, times(1)).action(
-                any(Context.class), eq(MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER), eq(true));
-    }
-
-    @Test
-    public void togglingShouldUpdateSettingsSecure() {
-        mController.onSwitchToggled(true);
-
-        ContentResolver resolver = mContext.getContentResolver();
-        assertThat(Settings.Secure.getInt(
-                resolver, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0)).isNotEqualTo(0);
-    }
-
-    @Test
-    public void togglingOnShouldTriggerWarningFragment() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
-        when (mFragmentManager.beginTransaction()).thenReturn(transaction);
-
-        mController.onSwitchToggled(true);
-
-        verify(transaction).add(any(), eq(ActivationWarningFragment.TAG));
-    }
-
-    @Test
-    public void togglingOffShouldTriggerWarningFragment() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
-        when (mFragmentManager.beginTransaction()).thenReturn(transaction);
-
-        mController.onSwitchToggled(false);
-
-        verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG));
-    }
-
-
-    @Test
-    public void togglingOnShouldNotTriggerWarningFragmentIfEnabledByDefault() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
-        when (mFragmentManager.beginTransaction()).thenReturn(transaction);
-        SettingsShadowSystemProperties.set(
-                AutomaticStorageManagementSwitchPreferenceController
-                        .STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, "true");
-
-        mController.onSwitchToggled(true);
-
-        verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG));
-    }
-
-    @Test
-    public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
-        when(mFragmentManager.beginTransaction()).thenReturn(transaction);
-        SettingsShadowSystemProperties.set(
-                AutomaticStorageManagementSwitchPreferenceController
-                        .STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY,
-                "true");
-        Settings.Secure.putInt(
-                mContext.getContentResolver(),
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
-                1);
-
-        mController.onSwitchToggled(true);
-
-        verify(transaction).add(any(), eq(ActivationWarningFragment.TAG));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
deleted file mode 100644
index 154a7a1afbfd3f450d114a779d1d53a902b5f17a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo.storage;
-
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.CACHE_APPS_SIZE_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_APP_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_AUDIO_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_IMAGE_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_TOTAL_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_VIDEO_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.FREE_BYTES_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.GAME_APPS_SIZE_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.MUSIC_APPS_SIZE_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.OTHER_APPS_SIZE_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.PHOTO_APPS_SIZE_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.SHARED_PREFERENCES_NAME;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TIMESTAMP_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY;
-
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.SparseArray;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CachedStorageValuesHelperTest {
-    private Context mContext;
-
-    @Mock private CachedStorageValuesHelper.Clock mMockClock;
-    private CachedStorageValuesHelper mCachedValuesHelper;
-    private SharedPreferences mSharedPreferences;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application.getApplicationContext();
-        mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, 0);
-        mCachedValuesHelper = new CachedStorageValuesHelper(mContext, 0);
-        mCachedValuesHelper.mClock = mMockClock;
-    }
-
-    @Test
-    public void getCachedPrivateStorageInfo_cachedValuesAreLoaded() throws Exception {
-        when(mMockClock.getCurrentTime()).thenReturn(10001L);
-        mSharedPreferences
-                .edit()
-                .putLong(GAME_APPS_SIZE_KEY, 0)
-                .putLong(MUSIC_APPS_SIZE_KEY, 10)
-                .putLong(VIDEO_APPS_SIZE_KEY, 100)
-                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
-                .putLong(OTHER_APPS_SIZE_KEY, 10000)
-                .putLong(CACHE_APPS_SIZE_KEY, 100000)
-                .putLong(EXTERNAL_TOTAL_BYTES, 2)
-                .putLong(EXTERNAL_AUDIO_BYTES, 22)
-                .putLong(EXTERNAL_VIDEO_BYTES, 222)
-                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
-                .putLong(EXTERNAL_APP_BYTES, 22222)
-                .putLong(FREE_BYTES_KEY, 1000L)
-                .putLong(TOTAL_BYTES_KEY, 6000L)
-                .putInt(USER_ID_KEY, 0)
-                .putLong(TIMESTAMP_KEY, 10000L)
-                .apply();
-
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
-
-        assertThat(info.freeBytes).isEqualTo(1000L);
-        assertThat(info.totalBytes).isEqualTo(6000L);
-    }
-
-    @Test
-    public void getCachedAppsStorageResult_cachedValuesAreLoaded() throws Exception {
-        when(mMockClock.getCurrentTime()).thenReturn(10001L);
-        mSharedPreferences
-                .edit()
-                .putLong(GAME_APPS_SIZE_KEY, 1)
-                .putLong(MUSIC_APPS_SIZE_KEY, 10)
-                .putLong(VIDEO_APPS_SIZE_KEY, 100)
-                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
-                .putLong(OTHER_APPS_SIZE_KEY, 10000)
-                .putLong(CACHE_APPS_SIZE_KEY, 100000)
-                .putLong(EXTERNAL_TOTAL_BYTES, 222222)
-                .putLong(EXTERNAL_AUDIO_BYTES, 22)
-                .putLong(EXTERNAL_VIDEO_BYTES, 222)
-                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
-                .putLong(EXTERNAL_APP_BYTES, 22222)
-                .putLong(FREE_BYTES_KEY, 1000L)
-                .putLong(TOTAL_BYTES_KEY, 5000L)
-                .putInt(USER_ID_KEY, 0)
-                .putLong(TIMESTAMP_KEY, 10000L)
-                .apply();
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
-                mCachedValuesHelper.getCachedAppsStorageResult();
-
-        StorageAsyncLoader.AppsStorageResult primaryResult = result.get(0);
-        assertThat(primaryResult.gamesSize).isEqualTo(1L);
-        assertThat(primaryResult.musicAppsSize).isEqualTo(10L);
-        assertThat(primaryResult.videoAppsSize).isEqualTo(100L);
-        assertThat(primaryResult.photosAppsSize).isEqualTo(1000L);
-        assertThat(primaryResult.otherAppsSize).isEqualTo(10000L);
-        assertThat(primaryResult.cacheSize).isEqualTo(100000L);
-        assertThat(primaryResult.externalStats.totalBytes).isEqualTo(222222L);
-        assertThat(primaryResult.externalStats.audioBytes).isEqualTo(22L);
-        assertThat(primaryResult.externalStats.videoBytes).isEqualTo(222L);
-        assertThat(primaryResult.externalStats.imageBytes).isEqualTo(2222L);
-        assertThat(primaryResult.externalStats.appBytes).isEqualTo(22222L);
-    }
-
-    @Test
-    public void getCachedPrivateStorageInfo_nullIfDataIsStale() throws Exception {
-        when(mMockClock.getCurrentTime()).thenReturn(10000000L);
-        mSharedPreferences
-                .edit()
-                .putLong(GAME_APPS_SIZE_KEY, 0)
-                .putLong(MUSIC_APPS_SIZE_KEY, 10)
-                .putLong(VIDEO_APPS_SIZE_KEY, 100)
-                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
-                .putLong(OTHER_APPS_SIZE_KEY, 10000)
-                .putLong(CACHE_APPS_SIZE_KEY, 100000)
-                .putLong(EXTERNAL_TOTAL_BYTES, 2)
-                .putLong(EXTERNAL_AUDIO_BYTES, 22)
-                .putLong(EXTERNAL_VIDEO_BYTES, 222)
-                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
-                .putLong(EXTERNAL_APP_BYTES, 22222)
-                .putLong(FREE_BYTES_KEY, 1000L)
-                .putLong(TOTAL_BYTES_KEY, 5000L)
-                .putInt(USER_ID_KEY, 0)
-                .putLong(TIMESTAMP_KEY, 10000L)
-                .apply();
-
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
-        assertThat(info).isNull();
-    }
-
-    @Test
-    public void getCachedAppsStorageResult_nullIfDataIsStale() throws Exception {
-        when(mMockClock.getCurrentTime()).thenReturn(10000000L);
-        mSharedPreferences
-                .edit()
-                .putLong(GAME_APPS_SIZE_KEY, 0)
-                .putLong(MUSIC_APPS_SIZE_KEY, 10)
-                .putLong(VIDEO_APPS_SIZE_KEY, 100)
-                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
-                .putLong(OTHER_APPS_SIZE_KEY, 10000)
-                .putLong(CACHE_APPS_SIZE_KEY, 100000)
-                .putLong(EXTERNAL_TOTAL_BYTES, 2)
-                .putLong(EXTERNAL_AUDIO_BYTES, 22)
-                .putLong(EXTERNAL_VIDEO_BYTES, 222)
-                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
-                .putLong(EXTERNAL_APP_BYTES, 22222)
-                .putLong(FREE_BYTES_KEY, 1000L)
-                .putLong(TOTAL_BYTES_KEY, 5000L)
-                .putInt(USER_ID_KEY, 0)
-                .putLong(TIMESTAMP_KEY, 10000L)
-                .apply();
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
-                mCachedValuesHelper.getCachedAppsStorageResult();
-        assertThat(result).isNull();
-    }
-
-    @Test
-    public void getCachedPrivateStorageInfo_nullIfWrongUser() throws Exception {
-        when(mMockClock.getCurrentTime()).thenReturn(10001L);
-        mSharedPreferences
-                .edit()
-                .putLong(GAME_APPS_SIZE_KEY, 0)
-                .putLong(MUSIC_APPS_SIZE_KEY, 10)
-                .putLong(VIDEO_APPS_SIZE_KEY, 100)
-                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
-                .putLong(OTHER_APPS_SIZE_KEY, 10000)
-                .putLong(CACHE_APPS_SIZE_KEY, 100000)
-                .putLong(EXTERNAL_TOTAL_BYTES, 2)
-                .putLong(EXTERNAL_AUDIO_BYTES, 22)
-                .putLong(EXTERNAL_VIDEO_BYTES, 222)
-                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
-                .putLong(EXTERNAL_APP_BYTES, 22222)
-                .putLong(FREE_BYTES_KEY, 1000L)
-                .putLong(TOTAL_BYTES_KEY, 5000L)
-                .putInt(USER_ID_KEY, 1)
-                .putLong(TIMESTAMP_KEY, 10000L)
-                .apply();
-
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
-        assertThat(info).isNull();
-    }
-
-    @Test
-    public void getCachedAppsStorageResult_nullIfWrongUser() throws Exception {
-        when(mMockClock.getCurrentTime()).thenReturn(10001L);
-        mSharedPreferences
-                .edit()
-                .putLong(GAME_APPS_SIZE_KEY, 0)
-                .putLong(MUSIC_APPS_SIZE_KEY, 10)
-                .putLong(VIDEO_APPS_SIZE_KEY, 100)
-                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
-                .putLong(OTHER_APPS_SIZE_KEY, 10000)
-                .putLong(CACHE_APPS_SIZE_KEY, 100000)
-                .putLong(EXTERNAL_TOTAL_BYTES, 2)
-                .putLong(EXTERNAL_AUDIO_BYTES, 22)
-                .putLong(EXTERNAL_VIDEO_BYTES, 222)
-                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
-                .putLong(EXTERNAL_APP_BYTES, 22222)
-                .putLong(FREE_BYTES_KEY, 1000L)
-                .putLong(TOTAL_BYTES_KEY, 5000L)
-                .putInt(USER_ID_KEY, 1)
-                .putLong(TIMESTAMP_KEY, 10000L)
-                .apply();
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
-                mCachedValuesHelper.getCachedAppsStorageResult();
-        assertThat(result).isNull();
-    }
-
-    @Test
-    public void getCachedPrivateStorageInfo_nullIfEmpty() throws Exception {
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
-        assertThat(info).isNull();
-    }
-
-    @Test
-    public void getCachedAppsStorageResult_nullIfEmpty() throws Exception {
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
-                mCachedValuesHelper.getCachedAppsStorageResult();
-        assertThat(result).isNull();
-    }
-
-    @Test
-    public void cacheResult_succeeds() throws Exception {
-        when(mMockClock.getCurrentTime()).thenReturn(10000L);
-        final StorageStatsSource.ExternalStorageStats externalStats =
-                new StorageStatsSource.ExternalStorageStats(22222l, 2l, 20L, 200L, 2000L);
-        final StorageAsyncLoader.AppsStorageResult result =
-                new StorageAsyncLoader.AppsStorageResult();
-        result.gamesSize = 1L;
-        result.musicAppsSize = 10l;
-        result.videoAppsSize = 100L;
-        result.photosAppsSize = 1000L;
-        result.otherAppsSize = 10000L;
-        result.cacheSize = 100000l;
-        result.externalStats = externalStats;
-        final PrivateStorageInfo info = new PrivateStorageInfo(1000L, 6000L);
-
-        mCachedValuesHelper.cacheResult(info, result);
-
-        assertThat(mSharedPreferences.getLong(GAME_APPS_SIZE_KEY, -1)).isEqualTo(1L);
-        assertThat(mSharedPreferences.getLong(MUSIC_APPS_SIZE_KEY, -1)).isEqualTo(10L);
-        assertThat(mSharedPreferences.getLong(VIDEO_APPS_SIZE_KEY, -1)).isEqualTo(100L);
-        assertThat(mSharedPreferences.getLong(PHOTO_APPS_SIZE_KEY, -1)).isEqualTo(1000L);
-        assertThat(mSharedPreferences.getLong(OTHER_APPS_SIZE_KEY, -1)).isEqualTo(10000L);
-        assertThat(mSharedPreferences.getLong(CACHE_APPS_SIZE_KEY, -1)).isEqualTo(100000L);
-        assertThat(mSharedPreferences.getLong(EXTERNAL_TOTAL_BYTES, -1)).isEqualTo(22222L);
-        assertThat(mSharedPreferences.getLong(EXTERNAL_AUDIO_BYTES, -1)).isEqualTo(2L);
-        assertThat(mSharedPreferences.getLong(EXTERNAL_VIDEO_BYTES, -1)).isEqualTo(20L);
-        assertThat(mSharedPreferences.getLong(EXTERNAL_IMAGE_BYTES, -1)).isEqualTo(200L);
-        assertThat(mSharedPreferences.getLong(EXTERNAL_APP_BYTES, -1)).isEqualTo(2000L);
-        assertThat(mSharedPreferences.getLong(FREE_BYTES_KEY, -1)).isEqualTo(1000L);
-        assertThat(mSharedPreferences.getLong(TOTAL_BYTES_KEY, -1)).isEqualTo(6000L);
-        assertThat(mSharedPreferences.getInt(USER_ID_KEY, -1)).isEqualTo(0);
-        assertThat(mSharedPreferences.getLong(TIMESTAMP_KEY, -1)).isEqualTo(10000L);
-    };
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
deleted file mode 100644
index a871c1963f309873088154c67efe5cd9bb75d614..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo.storage;
-
-import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.SparseArray;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.UserManagerWrapper;
-import com.android.settingslib.R;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.drawable.UserIconDrawable;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SecondaryUserControllerTest {
-    private static final String TEST_NAME = "Fred";
-    private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";
-    @Mock
-    private UserManagerWrapper mUserManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private PreferenceGroup mGroup;
-
-    private Context mContext;
-    private SecondaryUserController mController;
-    private UserInfo mPrimaryUser;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mPrimaryUser = new UserInfo();
-        mPrimaryUser.flags = UserInfo.FLAG_PRIMARY;
-        mController = new SecondaryUserController(mContext, mPrimaryUser);
-
-        when(mScreen.getContext()).thenReturn(mContext);
-        when(mScreen.findPreference(anyString())).thenReturn(mGroup);
-        when(mGroup.getKey()).thenReturn(TARGET_PREFERENCE_GROUP_KEY);
-    }
-
-    @Test
-    public void controllerAddsSecondaryUser() throws Exception {
-        mPrimaryUser.name = TEST_NAME;
-        mController.displayPreference(mScreen);
-
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-        verify(mGroup).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
-        assertThat(preference.getTitle()).isEqualTo(TEST_NAME);
-    }
-
-    @Test
-    public void controllerUpdatesSummaryOfNewPreference() throws Exception {
-        mPrimaryUser.name = TEST_NAME;
-        mController.displayPreference(mScreen);
-        mController.setSize(MEGABYTE_IN_BYTES * 10);
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-
-        verify(mGroup).addPreference(argumentCaptor.capture());
-
-        Preference preference = argumentCaptor.getValue();
-        assertThat(preference.getSummary()).isEqualTo("0.01 GB");
-    }
-
-    @Test
-    public void noSecondaryUserAddedIfNoneExist() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
-        userInfos.add(mPrimaryUser);
-        when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
-        when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<AbstractPreferenceController> controllers =
-                SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
-
-        assertThat(controllers).hasSize(1);
-        // We should have the NoSecondaryUserController.
-        assertThat(controllers.get(0) instanceof SecondaryUserController).isFalse();
-    }
-
-    @Test
-    public void secondaryUserAddedIfHasDistinctId() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
-        UserInfo secondaryUser = new UserInfo();
-        secondaryUser.id = 10;
-        secondaryUser.profileGroupId = 101010; // this just has to be something not 0
-        userInfos.add(mPrimaryUser);
-        userInfos.add(secondaryUser);
-        when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
-        when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<AbstractPreferenceController> controllers =
-                SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
-
-        assertThat(controllers).hasSize(1);
-        assertThat(controllers.get(0) instanceof SecondaryUserController).isTrue();
-    }
-
-    @Test
-    public void profilesOfPrimaryUserAreNotIgnored() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
-        UserInfo secondaryUser = new UserInfo();
-        secondaryUser.id = mPrimaryUser.id;
-        userInfos.add(mPrimaryUser);
-        userInfos.add(secondaryUser);
-        when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
-        when(mUserManager.getUsers()).thenReturn(userInfos);
-
-        List<AbstractPreferenceController> controllers =
-                SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
-
-        assertThat(controllers).hasSize(2);
-        assertThat(controllers.get(0) instanceof UserProfileController).isTrue();
-        assertThat(controllers.get(1) instanceof SecondaryUserController).isFalse();
-    }
-
-    @Test
-    public void controllerUpdatesPreferenceOnAcceptingResult() throws Exception {
-        mPrimaryUser.name = TEST_NAME;
-        mPrimaryUser.id = 10;
-        mController.displayPreference(mScreen);
-        StorageAsyncLoader.AppsStorageResult userResult =
-                new StorageAsyncLoader.AppsStorageResult();
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
-        userResult.externalStats =
-                new StorageStatsSource.ExternalStorageStats(
-                        MEGABYTE_IN_BYTES * 30,
-                        MEGABYTE_IN_BYTES * 10,
-                        MEGABYTE_IN_BYTES * 10,
-                        MEGABYTE_IN_BYTES * 10, 0);
-        result.put(10, userResult);
-
-        mController.handleResult(result);
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-        verify(mGroup).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
-
-        assertThat(preference.getSummary()).isEqualTo("0.03 GB");
-    }
-
-    @Test
-    public void dontAddPrimaryProfileAsASecondaryProfile() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
-        // The primary UserInfo may be a different object with a different name... but represent the
-        // same user!
-        UserInfo primaryUserRenamed = new UserInfo();
-        primaryUserRenamed.name = "Owner";
-        primaryUserRenamed.flags = UserInfo.FLAG_PRIMARY;
-        userInfos.add(primaryUserRenamed);
-        when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
-        when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<AbstractPreferenceController> controllers =
-                SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
-
-        assertThat(controllers).hasSize(1);
-        // We should have the NoSecondaryUserController.
-        assertThat(controllers.get(0) instanceof SecondaryUserController).isFalse();
-    }
-
-    @Test
-    public void iconCallbackChangesPreferenceIcon() throws Exception {
-        SparseArray<Drawable> icons = new SparseArray<>();
-        Bitmap userBitmap =
-                BitmapFactory.decodeResource(
-                        RuntimeEnvironment.application.getResources(), R.drawable.home);
-        UserIconDrawable drawable = new UserIconDrawable(100 /* size */).setIcon(userBitmap).bake();
-        icons.put(10, drawable);
-        mPrimaryUser.name = TEST_NAME;
-        mPrimaryUser.id = 10;
-        mController.displayPreference(mScreen);
-
-        mController.handleUserIcons(icons);
-
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-        verify(mGroup).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
-        assertThat(preference.getIcon()).isEqualTo(drawable);
-    }
-
-    @Test
-    public void setIcon_doesntNpeOnNullPreference() throws Exception {
-        SparseArray<Drawable> icons = new SparseArray<>();
-        Bitmap userBitmap =
-                BitmapFactory.decodeResource(
-                        RuntimeEnvironment.application.getResources(), R.drawable.home);
-        UserIconDrawable drawable = new UserIconDrawable(100 /* size */).setIcon(userBitmap).bake();
-        icons.put(10, drawable);
-        mPrimaryUser.name = TEST_NAME;
-        mPrimaryUser.id = 10;
-
-        mController.handleUserIcons(icons);
-
-        // Doesn't crash
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
deleted file mode 100644
index 9bef5600b4a6edde6cc7b272d50f8fffc1da06fd..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.deviceinfo.storage;
-
-
-import static com.android.settings.applications.ManageApplications.EXTRA_WORK_ID;
-import static com.android.settings.applications.ManageApplications.EXTRA_WORK_ONLY;
-import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.ManageApplications;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.deviceinfo.PrivateVolumeSettings;
-import com.android.settings.deviceinfo.StorageItemPreference;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StorageItemPreferenceControllerTest {
-    private Context mContext;
-    private VolumeInfo mVolume;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private StorageVolumeProvider mSvp;
-    private StorageItemPreferenceController mController;
-    private StorageItemPreference mPreference;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        FakeFeatureFactory.setupForTest(mContext);
-        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        mVolume = spy(new VolumeInfo("id", 0, null, "id"));
-        // Note: null is passed as the Lifecycle because we are handling it outside of the normal
-        //       Settings fragment lifecycle for test purposes.
-        mController = new StorageItemPreferenceController(mContext, mFragment, mVolume, mSvp);
-        mPreference = new StorageItemPreference(mContext);
-
-        // Inflate the preference and the widget.
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        final View view = inflater.inflate(
-                mPreference.getLayoutResource(), new LinearLayout(mContext), false);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void testUpdateStateWithInitialState() {
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                mContext.getString(R.string.memory_calculating_size));
-    }
-
-    @Test
-    public void testClickPhotos() {
-        mPreference.setKey("pref_photos_videos");
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                nullable(UserHandle.class));
-
-        Intent intent = argumentCaptor.getValue();
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
-                .isEqualTo(ManageApplications.class.getName());
-        assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
-                .isEqualTo(R.string.storage_photos_videos);
-    }
-
-    @Test
-    public void testClickAudio() {
-        mPreference.setKey("pref_music_audio");
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                nullable(UserHandle.class));
-        Intent intent = argumentCaptor.getValue();
-
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
-                ManageApplications.class.getName());
-        assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS).getInt(
-                ManageApplications.EXTRA_STORAGE_TYPE, 0)).isEqualTo(
-                ManageApplications.STORAGE_TYPE_MUSIC);
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_tappingAudioWhileUninitializedDoesntCrash() {
-        mController.setVolume(null);
-
-        mPreference.setKey("pref_music_audio");
-        mController.handlePreferenceTreeClick(mPreference);
-    }
-
-    @Test
-    public void testClickApps() {
-        mPreference.setKey("pref_other_apps");
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                nullable(UserHandle.class));
-
-        Intent intent = argumentCaptor.getValue();
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
-                ManageApplications.class.getName());
-        assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
-                .isEqualTo(R.string.apps_storage);
-    }
-
-    @Test
-    public void testClickAppsForWork() {
-        mController = new StorageItemPreferenceController(mContext, mFragment, mVolume, mSvp, true);
-        mPreference.setKey("pref_other_apps");
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity())
-                .startActivityAsUser(argumentCaptor.capture(), nullable(UserHandle.class));
-
-        Intent intent = argumentCaptor.getValue();
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
-                .isEqualTo(ManageApplications.class.getName());
-        assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
-                .isEqualTo(R.string.apps_storage);
-        assertThat(
-                        intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                                .getBoolean(EXTRA_WORK_ONLY))
-                .isTrue();
-        assertThat(
-                        intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                                .getInt(EXTRA_WORK_ID))
-                .isEqualTo(0);
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_tappingAppsWhileUninitializedDoesntCrash() {
-        mController.setVolume(null);
-
-        mPreference.setKey("pref_other_apps");
-        mController.handlePreferenceTreeClick(mPreference);
-    }
-
-    @Test
-    public void testClickFiles() {
-        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
-        mPreference.setKey("pref_files");
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                nullable(UserHandle.class));
-
-        Intent intent = argumentCaptor.getValue();
-        Intent browseIntent = mVolume.buildBrowseIntent();
-        assertThat(intent.getAction()).isEqualTo(browseIntent.getAction());
-        assertThat(intent.getData()).isEqualTo(browseIntent.getData());
-        verify(mMetricsFeatureProvider, times(1)).action(
-                nullable(Context.class), eq(MetricsEvent.STORAGE_FILES));
-    }
-
-    @Test
-    public void testClickGames() {
-        mPreference.setKey("pref_games");
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                nullable(UserHandle.class));
-
-        Intent intent = argumentCaptor.getValue();
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
-                ManageApplications.class.getName());
-        assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
-                .isEqualTo(R.string.game_storage_settings);
-    }
-
-    @Test
-    public void testClickMovies() {
-        mPreference.setKey("pref_movies");
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                nullable(UserHandle.class));
-
-        Intent intent = argumentCaptor.getValue();
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
-                ManageApplications.class.getName());
-        assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
-                .isEqualTo(R.string.storage_movies_tv);
-    }
-
-    @Test
-    public void testClickSystem() {
-        mPreference.setKey("pref_system");
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
-
-        verify(mFragment.getFragmentManager().beginTransaction()).add(
-                nullable(PrivateVolumeSettings.SystemInfoFragment.class), nullable(String.class));
-    }
-
-    @Test
-    public void testMeasurementCompletedUpdatesPreferences() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference movies = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.MOVIES_KEY))).thenReturn(movies);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.OTHER_APPS_KEY))).thenReturn(apps);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.SYSTEM_KEY))).thenReturn(system);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.FILES_KEY))).thenReturn(files);
-        mController.displayPreference(screen);
-
-        mController.setUsedSize(MEGABYTE_IN_BYTES * 970); // There should 870MB attributed.
-        StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
-        result.gamesSize = MEGABYTE_IN_BYTES * 80;
-        result.videoAppsSize = MEGABYTE_IN_BYTES * 160;
-        result.musicAppsSize = MEGABYTE_IN_BYTES * 40;
-        result.otherAppsSize = MEGABYTE_IN_BYTES * 90;
-        result.externalStats =
-                new StorageStatsSource.ExternalStorageStats(
-                        MEGABYTE_IN_BYTES * 500, // total
-                        MEGABYTE_IN_BYTES * 100, // audio
-                        MEGABYTE_IN_BYTES * 150, // video
-                        MEGABYTE_IN_BYTES * 200, 0); // image
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> results = new SparseArray<>();
-        results.put(0, result);
-        mController.onLoadFinished(results, 0);
-
-        assertThat(audio.getSummary().toString()).isEqualTo("0.14 GB");
-        assertThat(image.getSummary().toString()).isEqualTo("0.35 GB");
-        assertThat(games.getSummary().toString()).isEqualTo("0.08 GB");
-        assertThat(movies.getSummary().toString()).isEqualTo("0.16 GB");
-        assertThat(apps.getSummary().toString()).isEqualTo("0.09 GB");
-        assertThat(files.getSummary().toString()).isEqualTo("0.05 GB");
-    }
-
-    @Test
-    public void settingUserIdAppliesNewIcons() {
-        StorageItemPreference audio = spy(new StorageItemPreference(mContext));
-        audio.setIcon(R.drawable.ic_media_stream);
-        StorageItemPreference video = spy(new StorageItemPreference(mContext));
-        video.setIcon(R.drawable.ic_local_movies);
-        StorageItemPreference image = spy(new StorageItemPreference(mContext));
-        image.setIcon(R.drawable.ic_photo_library);
-        StorageItemPreference games = spy(new StorageItemPreference(mContext));
-        games.setIcon(R.drawable.ic_videogame_vd_theme_24);
-        StorageItemPreference apps = spy(new StorageItemPreference(mContext));
-        apps.setIcon(R.drawable.ic_storage_apps);
-        StorageItemPreference system = spy(new StorageItemPreference(mContext));
-        system.setIcon(R.drawable.ic_system_update_vd_theme_24);
-        StorageItemPreference files = spy(new StorageItemPreference(mContext));
-        files.setIcon(R.drawable.ic_folder_vd_theme_24);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.MOVIES_KEY))).thenReturn(video);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.OTHER_APPS_KEY))).thenReturn(apps);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.SYSTEM_KEY))).thenReturn(system);
-        when(screen.findPreference(
-                eq(StorageItemPreferenceController.FILES_KEY))).thenReturn(files);
-        mController.displayPreference(screen);
-
-        mController.setUserId(new UserHandle(10));
-
-        verify(audio, times(2)).setIcon(nullable(Drawable.class));
-        verify(video, times(2)).setIcon(nullable(Drawable.class));
-        verify(image, times(2)).setIcon(nullable(Drawable.class));
-        verify(games, times(2)).setIcon(nullable(Drawable.class));
-        verify(apps, times(2)).setIcon(nullable(Drawable.class));
-        verify(system, times(2)).setIcon(nullable(Drawable.class));
-        verify(files, times(2)).setIcon(nullable(Drawable.class));
-    }
-
-    @Test
-    public void displayPreference_dontHideFilePreferenceWhenEmulatedInternalStorageUsed() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
-                .thenReturn(audio);
-        when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
-                .thenReturn(image);
-        when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
-        when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
-                .thenReturn(apps);
-        when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
-                .thenReturn(system);
-        when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
-                .thenReturn(files);
-
-        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
-        when(mVolume.isMountedReadable()).thenReturn(true);
-
-        mController.displayPreference(screen);
-
-        verify(screen, times(0)).removePreference(files);
-    }
-
-    @Test
-    public void displayPreference_hideFilePreferenceWhenEmulatedStorageUnreadable() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
-                .thenReturn(audio);
-        when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
-                .thenReturn(image);
-        when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
-        when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
-                .thenReturn(apps);
-        when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
-                .thenReturn(system);
-        when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
-                .thenReturn(files);
-
-        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
-        when(mVolume.isMountedReadable()).thenReturn(false);
-
-        mController.displayPreference(screen);
-
-        verify(screen).removePreference(files);
-    }
-
-    @Test
-    public void displayPreference_hideFilePreferenceWhenNoEmulatedInternalStorage() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
-                .thenReturn(audio);
-        when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
-                .thenReturn(image);
-        when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
-        when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
-                .thenReturn(apps);
-        when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
-                .thenReturn(system);
-        when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
-                .thenReturn(files);
-
-        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(null);
-
-        mController.displayPreference(screen);
-
-        verify(screen).removePreference(files);
-    }
-
-    @Test
-    public void displayPreference_updateFilePreferenceToHideAfterSettingVolume() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
-                .thenReturn(audio);
-        when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
-                .thenReturn(image);
-        when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
-        when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
-                .thenReturn(apps);
-        when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
-                .thenReturn(system);
-        when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
-                .thenReturn(files);
-
-        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
-        when(mVolume.isMountedReadable()).thenReturn(true);
-
-        mController.displayPreference(screen);
-        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(null);
-        mController.setVolume(mVolume);
-
-        verify(screen).removePreference(files);
-    }
-
-
-    @Test
-    public void displayPreference_updateFilePreferenceToShowAfterSettingVolume() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
-                .thenReturn(audio);
-        when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
-                .thenReturn(image);
-        when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
-        when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
-                .thenReturn(apps);
-        when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
-                .thenReturn(system);
-        when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
-                .thenReturn(files);
-
-        // This will hide it initially.
-        mController.displayPreference(screen);
-
-        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
-        when(mVolume.isMountedReadable()).thenReturn(true);
-
-        // And we bring it back.
-        mController.setVolume(mVolume);
-
-        verify(screen).addPreference(files);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
deleted file mode 100644
index bd40240a636160ebd8f46c8f9db772d55cb46942..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo.storage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.storage.VolumeInfo;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.io.File;
-
-import static com.android.settings.TestUtils.KILOBYTE;
-import static com.android.settings.TestUtils.GIGABYTE;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-        SettingsShadowResources.class,
-        SettingsShadowResources.SettingsShadowTheme.class
-})
-public class StorageSummaryDonutPreferenceControllerTest {
-    private Context mContext;
-    private StorageSummaryDonutPreferenceController mController;
-    private StorageSummaryDonutPreference mPreference;
-    private PreferenceViewHolder mHolder;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Before
-    public void setUp() throws Exception {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_headlineFontFamily, "");
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        FakeFeatureFactory.setupForTest(mContext);
-        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        mController = new StorageSummaryDonutPreferenceController(mContext);
-        mPreference = new StorageSummaryDonutPreference(mContext);
-
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        final View view =
-                inflater.inflate(
-                        mPreference.getLayoutResource(), new LinearLayout(mContext), false);
-        mHolder = PreferenceViewHolder.createInstanceForTests(view);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void testEmpty() throws Exception {
-        mController.updateBytes(0, 32 * GIGABYTE);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 32GB");
-    }
-
-    @Test
-    public void testTotalStorage() throws Exception {
-        mController.updateBytes(KILOBYTE, KILOBYTE * 10);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
-    }
-
-    @Test
-    public void testPopulateWithVolume() throws Exception {
-        VolumeInfo volume = Mockito.mock(VolumeInfo.class);
-        File file = Mockito.mock(File.class);
-        StorageVolumeProvider svp = Mockito.mock(StorageVolumeProvider.class);
-        when(volume.getPath()).thenReturn(file);
-        when(file.getTotalSpace()).thenReturn(KILOBYTE * 10);
-        when(file.getFreeSpace()).thenReturn(KILOBYTE);
-        when(svp.getPrimaryStorageSize()).thenReturn(KILOBYTE * 10);
-
-        mController.updateSizes(svp, volume);
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
-    }
-
-    @Test
-    public void testFreeUpSpaceMetricIsTriggered() throws Exception {
-        mPreference.onBindViewHolder(mHolder);
-        Button button = (Button) mHolder.findViewById(R.id.deletion_helper_button);
-
-        mPreference.onClick(button);
-
-        verify(mMetricsFeatureProvider, times(1)).action(
-                any(Context.class), eq(MetricsEvent.STORAGE_FREE_UP_SPACE_NOW));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
deleted file mode 100644
index a2e57b95e96e55038226cd6b542cb85f16313297..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo.storage;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.SparseArray;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.UserManagerWrapper;
-import com.android.settings.deviceinfo.StorageProfileFragment;
-import com.android.settingslib.R;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.drawable.UserIconDrawable;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserProfileControllerTest {
-    private static final String TEST_NAME = "Fred";
-
-    @Mock
-    private UserManagerWrapper mUserManager;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private Context mContext;
-    private UserProfileController mController;
-    private UserInfo mPrimaryProfile;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mPrimaryProfile = new UserInfo();
-        mController = new UserProfileController(mContext, mPrimaryProfile, mUserManager, 0);
-        when(mScreen.getContext()).thenReturn(mContext);
-        mPrimaryProfile.name = TEST_NAME;
-        mPrimaryProfile.id = 10;
-        mController.displayPreference(mScreen);
-    }
-
-    @Test
-    public void controllerAddsPrimaryProfilePreference() throws Exception {
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-        verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
-
-        assertThat(preference.getTitle()).isEqualTo(TEST_NAME);
-        assertThat(preference.getKey()).isEqualTo("pref_profile_10");
-    }
-
-    @Test
-    public void tappingProfilePreferenceSendsToStorageProfileFragment() throws Exception {
-
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-        verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
-        assertThat(mController.handlePreferenceTreeClick(preference)).isTrue();
-        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mContext).startActivity(intentCaptor.capture());
-
-        Intent intent = intentCaptor.getValue();
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
-                StorageProfileFragment.class.getName());
-    }
-
-    @Test
-    public void acceptingResultUpdatesPreferenceSize() throws Exception {
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
-        StorageAsyncLoader.AppsStorageResult userResult =
-                new StorageAsyncLoader.AppsStorageResult();
-        userResult.externalStats =
-                new StorageStatsSource.ExternalStorageStats(
-                        99 * MEGABYTE_IN_BYTES,
-                        33 * MEGABYTE_IN_BYTES,
-                        33 * MEGABYTE_IN_BYTES,
-                        33 * MEGABYTE_IN_BYTES, 0);
-        result.put(10, userResult);
-
-        mController.handleResult(result);
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-        verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
-
-        assertThat(preference.getSummary()).isEqualTo("0.10 GB");
-    }
-
-    @Test
-    public void iconCallbackChangesPreferenceIcon() throws Exception {
-        SparseArray<Drawable> icons = new SparseArray<>();
-        Bitmap userBitmap =
-                BitmapFactory.decodeResource(
-                        RuntimeEnvironment.application.getResources(), R.drawable.home);
-        UserIconDrawable drawable = new UserIconDrawable(100 /* size */).setIcon(userBitmap).bake();
-        icons.put(10, drawable);
-
-        mController.handleUserIcons(icons);
-
-        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
-        verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
-        assertThat(preference.getIcon()).isEqualTo(drawable);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
deleted file mode 100644
index 3f9ccaf1009b6b44d8a1333098b3809306b32d2f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.android.settings.deviceinfo.storage;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.os.storage.VolumeInfo;
-
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-
-public class VolumeSizesLoaderTest {
-    @Test
-    public void getVolumeSize_getsValidSizes() throws Exception {
-        VolumeInfo info = mock(VolumeInfo.class);
-        StorageVolumeProvider storageVolumeProvider = mock(StorageVolumeProvider.class);
-        when(storageVolumeProvider.getTotalBytes(any(), any())).thenReturn(10000L);
-        when(storageVolumeProvider.getFreeBytes(any(), any())).thenReturn(1000L);
-
-        PrivateStorageInfo storageInfo =
-                VolumeSizesLoader.getVolumeSize(storageVolumeProvider, null, info);
-
-        assertThat(storageInfo.freeBytes).isEqualTo(1000L);
-        assertThat(storageInfo.totalBytes).isEqualTo(10000L);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
deleted file mode 100644
index 386980709da76afe52c3dcdcc186c96494aa1eae..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.TestConfig;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowSecureSettings.class})
-public class AmbientDisplayAlwaysOnPreferenceControllerTest {
-
-    @Mock Context mContext;
-    @Mock AmbientDisplayConfiguration mConfig;
-    @Mock SwitchPreference mSwitchPreference;
-
-    AmbientDisplayAlwaysOnPreferenceController mController;
-    boolean mCallbackInvoked;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig,
-                () -> { mCallbackInvoked = true; });
-    }
-
-    @Test
-    public void updateState_enabled() throws Exception {
-        when(mConfig.alwaysOnEnabled(anyInt()))
-                .thenReturn(true);
-
-        mController.updateState(mSwitchPreference);
-
-        verify(mSwitchPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_disabled() throws Exception {
-        when(mConfig.alwaysOnEnabled(anyInt()))
-                .thenReturn(false);
-
-        mController.updateState(mSwitchPreference);
-
-        verify(mSwitchPreference).setChecked(false);
-    }
-
-    @Test
-    public void onPreferenceChange_callback() throws Exception {
-        assertThat(mCallbackInvoked).isFalse();
-        mController.onPreferenceChange(mSwitchPreference, true);
-        assertThat(mCallbackInvoked).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChange_enable() throws Exception {
-        mController.onPreferenceChange(mSwitchPreference, true);
-
-        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
-            .isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChange_disable() throws Exception {
-        mController.onPreferenceChange(mSwitchPreference, false);
-
-        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
-            .isEqualTo(0);
-    }
-
-    @Test
-    public void isAvailable_available() throws Exception {
-        when(mConfig.alwaysOnAvailableForUser(anyInt()))
-                .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_unavailable() throws Exception {
-        when(mConfig.alwaysOnAvailableForUser(anyInt()))
-                .thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 0);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
deleted file mode 100644
index 242a05d4fae402ac82bd344f30d2594bfd68ba51..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowSecureSettings.class})
-public class AmbientDisplayNotificationsPreferenceControllerTest {
-
-    @Mock Context mContext;
-    @Mock AmbientDisplayConfiguration mConfig;
-    @Mock SwitchPreference mSwitchPreference;
-    @Mock MetricsFeatureProvider mMetricsFeatureProvider;
-
-    AmbientDisplayNotificationsPreferenceController mController;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mController = new AmbientDisplayNotificationsPreferenceController(mContext, mConfig,
-                mMetricsFeatureProvider);
-    }
-
-    @Test
-    public void updateState_enabled() throws Exception {
-        when(mConfig.pulseOnNotificationEnabled(anyInt()))
-                .thenReturn(true);
-
-        mController.updateState(mSwitchPreference);
-
-        verify(mSwitchPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_disabled() throws Exception {
-        when(mConfig.pulseOnNotificationEnabled(anyInt()))
-                .thenReturn(false);
-
-        mController.updateState(mSwitchPreference);
-
-        verify(mSwitchPreference).setChecked(false);
-    }
-
-    @Test
-    public void onPreferenceChange_enable() throws Exception {
-        mController.onPreferenceChange(mSwitchPreference, true);
-
-        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ENABLED, -1))
-                .isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChange_disable() throws Exception {
-        mController.onPreferenceChange(mSwitchPreference, false);
-
-        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ENABLED, -1))
-                .isEqualTo(0);
-    }
-
-    @Test
-    public void isAvailable_available() throws Exception {
-        when(mConfig.pulseOnNotificationAvailable())
-                .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_unavailable() throws Exception {
-        when(mConfig.pulseOnNotificationAvailable())
-                .thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_reportsEventForItsPreference() throws Exception {
-        when(mSwitchPreference.getKey()).thenReturn(
-                AmbientDisplayNotificationsPreferenceController.KEY_AMBIENT_DISPLAY_NOTIFICATIONS);
-
-        mController.handlePreferenceTreeClick(mSwitchPreference);
-
-        verify(mMetricsFeatureProvider).action(any(), eq(ACTION_AMBIENT_DISPLAY));
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_doesntReportEventForOtherPreferences() throws Exception {
-        when(mSwitchPreference.getKey()).thenReturn("some_other_key");
-
-        mController.handlePreferenceTreeClick(mSwitchPreference);
-
-        verifyNoMoreInteractions(mMetricsFeatureProvider);
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, 0);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ENABLED, 1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
deleted file mode 100644
index 2933517cc11c478307ea5e1bd7175afdd57e76bb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowSecureSettings.class})
-public class AmbientDisplayPreferenceControllerTest {
-
-    @Mock Context mContext;
-    @Mock AmbientDisplayConfiguration mConfig;
-    @Mock Preference mPreference;
-
-    AmbientDisplayPreferenceController mController;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mController = new AmbientDisplayPreferenceController(mContext, mConfig, "key");
-    }
-
-    @Test
-    public void isAvailable_available() throws Exception {
-        when(mConfig.available()).thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_unavailable() throws Exception {
-        when(mConfig.available()).thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void updateState_alwaysOn() throws Exception {
-        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_always_on);
-    }
-
-    @Test
-    public void updateState_notifications() throws Exception {
-        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
-        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_notifications);
-    }
-
-    @Test
-    public void updateState_gestures() throws Exception {
-        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
-        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
-        when(mConfig.enabled(anyInt())).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(R.string.switch_on_text);
-    }
-
-    @Test
-    public void updateState_off() throws Exception {
-        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
-        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
-        when(mConfig.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
-        when(mConfig.pulseOnPickupEnabled(anyInt())).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(R.string.switch_off_text);
-    }
-
-    @Test
-    public void getPreferenceKey() throws Exception {
-        assertThat(mController.getPreferenceKey()).isEqualTo("key");
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
deleted file mode 100644
index 02f46f248fa8b0fde611f349074b74b622996db8..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AutoBrightnessPreferenceControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private AutoBrightnessPreferenceController mController;
-    private final String PREFERENCE_KEY = "auto_brightness";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mController = new AutoBrightnessPreferenceController(mContext, PREFERENCE_KEY);
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOnAuto_ReturnAuto() {
-        mController.onPreferenceChange(null, true);
-
-        final int mode = Settings.System.getInt(mContext.getContentResolver(),
-                SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_MANUAL);
-        assertThat(mode).isEqualTo(SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOffAuto_ReturnManual() {
-        mController.onPreferenceChange(null, false);
-
-        final int mode = Settings.System.getInt(mContext.getContentResolver(),
-                SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
-        assertThat(mode).isEqualTo(SCREEN_BRIGHTNESS_MODE_MANUAL);
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mController = new AutoBrightnessPreferenceController(context, PREFERENCE_KEY);
-        ResultPayload payload = mController.getResultPayload();
-        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.System.getInt(resolver, SCREEN_BRIGHTNESS_MODE, -1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
deleted file mode 100644
index 06fd2972ef6f34d0aeb4223f8266d888a3e4ae59..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowSystemSettings;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = ShadowSystemSettings.class
-)
-public class AutoRotatePreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    private Lifecycle mLifecycle;
-    private SwitchPreference mPreference;
-    private ContentResolver mContentResolver;
-    private AutoRotatePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mContentResolver = RuntimeEnvironment.application.getContentResolver();
-        mLifecycle = new Lifecycle();
-        mPreference = new SwitchPreference(RuntimeEnvironment.application);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getContentResolver()).thenReturn(mContentResolver);
-
-        mController = new AutoRotatePreferenceController(mContext, mLifecycle);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowSystemSettings.reset();
-    }
-
-    @Test
-    public void isAvailableWhenPolicyAllows() {
-        assertThat(mController.isAvailable()).isFalse();
-
-        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
-        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
-        Settings.System.putInt(mContentResolver,
-                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updatePreference_settingsIsOff_shouldTurnOffToggle() {
-        Settings.System.putIntForUser(mContentResolver,
-                Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void updatePreference_settingsIsOn_shouldTurnOnToggle() {
-        Settings.System.putIntForUser(mContentResolver,
-                Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
deleted file mode 100644
index 73c5374555f6f68c2664d88afbc6e484b709da41..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryPercentagePreferenceControllerTest {
-    @Mock private Context mContext;
-    private BatteryPercentagePreferenceController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mController = new BatteryPercentagePreferenceController(mContext);
-    }
-
-    private int getPercentageSetting() {
-        return Settings.System.getInt(mContext.getContentResolver(), SHOW_BATTERY_PERCENT, 0);
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOnPercentage_PercentageOn() {
-        mController.onPreferenceChange(null, true);
-        final int isOn = getPercentageSetting();
-        assertThat(isOn).isEqualTo(1);
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOffPercentage_PercentageOff() {
-        mController.onPreferenceChange(null, false);
-        final int isOn = getPercentageSetting();
-        assertThat(isOn).isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
deleted file mode 100644
index 56b940bbdea0f47bed8796b824e091510b0163d9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings.System;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.internal.ShadowExtractor;
-import org.robolectric.shadows.ShadowContentResolver;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BrightnessLevelPreferenceControllerTest {
-    @Mock
-    private Context mContext;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private PowerManagerWrapper mPowerManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mPreference;
-
-    private BrightnessLevelPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getContentResolver()).thenReturn(mContentResolver);
-        when(mPowerManager.getMinimumScreenBrightnessSetting()).thenReturn(0);
-        when(mPowerManager.getMaximumScreenBrightnessSetting()).thenReturn(100);
-        when(mPowerManager.getMinimumScreenBrightnessForVrSetting()).thenReturn(0);
-        when(mPowerManager.getMaximumScreenBrightnessForVrSetting()).thenReturn(100);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mController = spy(new BrightnessLevelPreferenceController(mContext, null, mPowerManager));
-        doReturn(false).when(mController).isInVrMode();
-
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void onStart_shouldRegisterObserver() {
-        Context context = RuntimeEnvironment.application;
-        BrightnessLevelPreferenceController controller =
-            new BrightnessLevelPreferenceController(context, null, mPowerManager);
-        ShadowContentResolver shadowContentResolver =
-            (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
-
-        controller.onStart();
-
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isNotEmpty();
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_BRIGHTNESS))).isNotEmpty();
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR))).isNotEmpty();
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isNotEmpty();
-    }
-
-    @Test
-    public void onStop_shouldUnregisterObserver() {
-        Context context = RuntimeEnvironment.application;
-        BrightnessLevelPreferenceController controller =
-            new BrightnessLevelPreferenceController(context, null, mPowerManager);
-        ShadowContentResolver shadowContentResolver =
-            (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
-
-        controller.displayPreference(mScreen);
-        controller.onStart();
-        controller.onStop();
-
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isEmpty();
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_BRIGHTNESS))).isEmpty();
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR))).isEmpty();
-        assertThat(shadowContentResolver.getContentObservers(
-            System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isEmpty();
-    }
-
-    @Test
-    public void updateState_inVrMode_shouldSetSummaryToVrBrightness() {
-        doReturn(true).when(mController).isInVrMode();
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, 85);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary("85%");
-    }
-
-    @Test
-    public void updateState_autoBrightness_shouldSetSummaryToAutoBrightness() {
-        doReturn(false).when(mController).isInVrMode();
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
-            System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
-
-        System.putFloat(mContentResolver, System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0.0f);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary("50%");
-    }
-
-    @Test
-    public void updateState_manualBrightness_shouldSetSummaryToScreenBrightness() {
-        doReturn(false).when(mController).isInVrMode();
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
-            System.SCREEN_BRIGHTNESS_MODE_MANUAL);
-
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 45);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary("45%");
-    }
-
-    @Test
-    public void updateState_brightnessOutOfRange_shouldSetSummaryInRange() {
-        // VR mode
-        doReturn(true).when(mController).isInVrMode();
-
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, 105);
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("100%");
-
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, -20);
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("0%");
-
-        // Auto mode
-        doReturn(false).when(mController).isInVrMode();
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
-                System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
-
-        reset(mPreference);
-        System.putFloat(mContentResolver, System.SCREEN_AUTO_BRIGHTNESS_ADJ, 1.5f);
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("100%");
-
-        System.putFloat(mContentResolver, System.SCREEN_AUTO_BRIGHTNESS_ADJ, -1.5f);
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("0%");
-
-        // Manual mode
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
-                System.SCREEN_BRIGHTNESS_MODE_MANUAL);
-
-        reset(mPreference);
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 115);
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("100%");
-
-        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, -10);
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("0%");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
deleted file mode 100644
index 9ee79ffe545e29fd86950f31029c52db96aeb207..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import com.android.internal.app.NightDisplayController;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import com.android.settings.widget.RadioButtonPickerFragment;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ColorModePreferenceFragmentTest {
-
-    private ColorModePreferenceFragment mFragment;
-
-    @Mock
-    private NightDisplayController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        SettingsShadowSystemProperties.clear();
-
-        mFragment = spy(new ColorModePreferenceFragment());
-        ReflectionHelpers.setField(mFragment, "mController", mController);
-    }
-
-    @Test
-    public void verifyMetricsConstant() {
-        assertThat(mFragment.getMetricsCategory())
-                .isEqualTo(MetricsProto.MetricsEvent.COLOR_MODE_SETTINGS);
-    }
-
-    @Test
-    public void getCandidates() {
-        when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
-        List<? extends RadioButtonPickerFragment.CandidateInfo> candidates =
-                mFragment.getCandidates();
-
-        assertThat(candidates.size()).isEqualTo(3);
-        assertThat(candidates.get(0).getKey())
-                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
-        assertThat(candidates.get(1).getKey())
-                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
-        assertThat(candidates.get(2).getKey())
-                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void getKey_natural() {
-        Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_NATURAL);
-
-        assertThat(mFragment.getDefaultKey())
-                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void getKey_boosted() {
-        Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_BOOSTED);
-
-        assertThat(mFragment.getDefaultKey())
-                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void getKey_saturated() {
-        Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_SATURATED);
-
-        assertThat(mFragment.getDefaultKey())
-            .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void setKey_natural() {
-        mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
-        Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void setKey_boosted() {
-        mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
-        Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void setKey_saturated() {
-        mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
-        Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
deleted file mode 100644
index 3d99f658391307e9cae4675cf3e7c79afaa2b329..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.support.v7.preference.ListPreference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.display.ThemePreferenceController.OverlayManager;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ThemePreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private ApplicationInfo mApplicationInfo;
-    @Mock
-    private ListPreference mPreference;
-
-    private ThemePreferenceController mController;
-
-    @Before
-    public void setUp() throws NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        when(mPackageManager.getApplicationInfo(any(), anyInt())).thenReturn(mApplicationInfo);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getString(R.string.default_theme))
-                .thenReturn(RuntimeEnvironment.application.getString(R.string.default_theme));
-
-        mController = spy(new ThemePreferenceController(mContext, mock(OverlayManager.class)));
-    }
-
-    @Test
-    public void updateState_themeSet_shouldSetPreferenceValue() throws NameNotFoundException {
-        final String pkg1 = "pkg1.theme1";
-        final String pkg2 = "pkg2.theme2";
-        final String themeLabel1 = "Theme1";
-        final String themeLabel2 = "Theme2";
-        final String[] themes = {pkg1, pkg2};
-        doReturn("pkg1.theme1").when(mController).getCurrentTheme();
-        doReturn(themes).when(mController).getAvailableThemes();
-        when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
-                .thenReturn(themeLabel1)
-                .thenReturn(themeLabel2);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(themeLabel1);
-        verify(mPreference).setValue(pkg1);
-    }
-
-    @Test
-    public void updateState_themeNull_shouldSetDefaultSummary() throws NameNotFoundException {
-        final String pkg1 = "pkg1.theme1";
-        final String pkg2 = "pkg2.theme2";
-        final String themeLabel1 = "Theme1";
-        final String themeLabel2 = "Theme2";
-        final String[] themes = {pkg1, pkg2};
-        doReturn(null).when(mController).getCurrentTheme();
-        doReturn(themes).when(mController).getAvailableThemes();
-        when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
-                .thenReturn(themeLabel1)
-                .thenReturn(themeLabel2);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference)
-                .setSummary(RuntimeEnvironment.application.getString(R.string.default_theme));
-        verify(mPreference).setValue(null);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
deleted file mode 100644
index 480e41fe84f5159c9fed57c152b3c92bba1faa4a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import android.content.Context;
-import android.provider.Settings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.TimeoutListPreference;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TimeoutPreferenceControllerTest {
-    private static final int TIMEOUT = 30;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private TimeoutListPreference mPreference;
-    private TimeoutPreferenceController mController;
-
-    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mController = new TimeoutPreferenceController(mContext, KEY_SCREEN_TIMEOUT);
-    }
-
-    @Test
-    public void testOnPreferenceChange_SetTimeout_ReturnCorrectTimeout() {
-        mController.onPreferenceChange(mPreference, Integer.toString(TIMEOUT));
-
-        final int mode = Settings.System.getInt(mContext.getContentResolver(),
-                SCREEN_OFF_TIMEOUT, 0);
-        assertThat(mode).isEqualTo(TIMEOUT);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
deleted file mode 100644
index 191a8fb39cdb85e56d0779e4f34c2b321d063abd..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.ContentResolver;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VrDisplayPreferencePickerTest {
-
-    private VrDisplayPreferencePicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mPicker = spy(new VrDisplayPreferencePicker());
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
-    }
-
-    @Test
-    public void verifyMetricsConstant() {
-        assertThat(mPicker.getMetricsCategory())
-                .isEqualTo(MetricsProto.MetricsEvent.VR_DISPLAY_PREFERENCE);
-    }
-
-    @Test
-    public void getCandidates_shouldReturnTwoCandidates() {
-        List<VrDisplayPreferencePicker.VrCandidateInfo> candidates = mPicker.getCandidates();
-
-        assertThat(candidates.size()).isEqualTo(2);
-        assertThat(candidates.get(0).getKey())
-                .isEqualTo(VrDisplayPreferencePicker.PREF_KEY_PREFIX + 0);
-        assertThat(candidates.get(1).getKey())
-                .isEqualTo(VrDisplayPreferencePicker.PREF_KEY_PREFIX + 1);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void getKey_shouldGetFromSettingsProvider() {
-        final ContentResolver cr = RuntimeEnvironment.application.getContentResolver();
-        Settings.Secure.putIntForUser(cr, Settings.Secure.VR_DISPLAY_MODE, 1,
-                UserHandle.myUserId());
-
-        assertThat(mPicker.getDefaultKey())
-                .isEqualTo(VrDisplayPreferencePicker.PREF_KEY_PREFIX + 1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
deleted file mode 100644
index 1419ad551daf8697b5c7b1bacc44e05163b03014..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WallpaperPreferenceControllerTest {
-
-    private static final String WALLPAPER_PACKAGE = "TestPkg";
-    private static final String WALLPAPER_CLASS = "TestCls";
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private WallpaperPreferenceController mController;
-
-    @Before
-    public void setUp() throws PackageManager.NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getString(R.string.config_wallpaper_picker_package))
-                .thenReturn(WALLPAPER_PACKAGE);
-        when(mContext.getString(R.string.config_wallpaper_picker_class))
-                .thenReturn(WALLPAPER_CLASS);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
-        mController = new WallpaperPreferenceController(mContext);
-    }
-
-    @Test
-    public void isAvailable_wallpaerPickerEnabled_shouldReturnTrue() {
-        final List<ResolveInfo> resolveInfos = new ArrayList<>();
-        resolveInfos.add(mock(ResolveInfo.class));
-        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
-                .thenReturn(resolveInfos);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_wallpaerPickerDisbled_shouldReturnFalseAndNoCrash() {
-        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
-
-        assertThat(mController.isAvailable()).isFalse();
-
-        final List<ResolveInfo> resolveInfos = new ArrayList<>();
-        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
-                .thenReturn(resolveInfos);
-
-        assertThat(mController.isAvailable()).isFalse();
-        // should not crash
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
deleted file mode 100644
index bd25d92064b7f851e9b8d46ff09272fe21c811e4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dream;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CurrentDreamPickerTest {
-    private static String COMPONENT_KEY = "mocked_component_name_string";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private DreamBackend mBackend;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    private CurrentDreamPicker mPicker;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        FakeFeatureFactory.setupForTest(mActivity);
-
-        mPicker = new CurrentDreamPicker();
-        mPicker.onAttach((Context)mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mBackend", mBackend);
-    }
-
-    @Test
-    public void getDefaultShouldReturnActiveDream() {
-        ComponentName mockComponentName = mock(ComponentName.class);
-        when(mockComponentName.flattenToString()).thenReturn(COMPONENT_KEY);
-        when(mBackend.getActiveDream()).thenReturn(mockComponentName);
-
-        assertThat(mPicker.getDefaultKey()).isEqualTo(COMPONENT_KEY);
-    }
-
-    @Test
-    public void setDefaultShouldUpdateActiveDream() {
-        DreamInfo mockInfo = mock(DreamInfo.class);
-        ComponentName mockName = mock(ComponentName.class);
-
-        mockInfo.componentName = mockName;
-        when(mockName.flattenToString()).thenReturn(COMPONENT_KEY);
-        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mockInfo)));
-
-        mPicker.setDefaultKey(COMPONENT_KEY);
-
-        verify(mBackend).setActiveDream(mockName);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
deleted file mode 100644
index e3493a17af07b799c1331922a1c3c55ea1f4b534..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dream;
-
-import android.content.ComponentName;
-import android.content.Context;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.widget.GearPreference;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CurrentDreamPreferenceControllerTest {
-    private static String TAG = "CurrentDreamPreferenceControllerTest";
-
-    private CurrentDreamPreferenceController mController;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private DreamBackend mBackend;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private DreamInfo mDreamInfo;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-
-        mController = new CurrentDreamPreferenceController(mContext);
-        ReflectionHelpers.setField(mController, "mBackend", mBackend);
-    }
-
-    @Test
-    public void isDisabledIfNoDreamsAvailable() {
-        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(0));
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isEnabledIfDreamsAvailable() {
-        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void gearShowsIfActiveDreamInfoHasOptions() {
-        mDreamInfo.settingsComponentName = mock(ComponentName.class);
-        mDreamInfo.isActive = true;
-
-        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
-
-        GearPreference mockPref = mock(GearPreference.class);
-        ArgumentCaptor<GearPreference.OnGearClickListener> captor =
-                ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
-
-        // verify that updateState sets a non-null gear click listener
-        mController.updateState(mockPref);
-        verify(mockPref).setOnGearClickListener(captor.capture());
-        captor.getAllValues().forEach(listener -> assertThat(listener).isNotNull());
-    }
-
-    @Test
-    public void gearHidesIfActiveDreamInfoHasNoOptions() {
-        mDreamInfo.settingsComponentName = null;
-        mDreamInfo.isActive = true;
-
-        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
-
-        GearPreference mockPref = mock(GearPreference.class);
-        ArgumentCaptor<GearPreference.OnGearClickListener> captor =
-                ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
-
-        // setting a null onGearClickListener removes the gear from view
-        mController.updateState(mockPref);
-        verify(mockPref).setOnGearClickListener(captor.capture());
-        captor.getAllValues().forEach(listener -> assertThat(listener).isNull());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
deleted file mode 100644
index 73526e5db994f9e7d454fe123f9bf158be59d5aa..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dream;
-
-import android.content.Context;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.WhenToDream;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DreamSettingsTest {
-    private static final List<String> KEYS = Arrays.asList(
-            DreamSettings.WHILE_CHARGING_ONLY,
-            DreamSettings.WHILE_DOCKED_ONLY,
-            DreamSettings.EITHER_CHARGING_OR_DOCKED,
-            DreamSettings.NEVER_DREAM
-        );
-
-    private static final @WhenToDream int[] SETTINGS = {
-                DreamBackend.WHILE_CHARGING,
-                DreamBackend.WHILE_DOCKED,
-                DreamBackend.EITHER,
-                DreamBackend.NEVER,
-        };
-
-    private static final int[] RES_IDS = {
-            R.string.screensaver_settings_summary_sleep,
-            R.string.screensaver_settings_summary_dock,
-            R.string.screensaver_settings_summary_either_long,
-            R.string.screensaver_settings_summary_never
-    };
-
-    @Test
-    public void getSettingFromPrefKey() {
-        for (int i = 0; i < KEYS.size(); i++) {
-            assertThat(DreamSettings.getSettingFromPrefKey(KEYS.get(i)))
-                    .isEqualTo(SETTINGS[i]);
-        }
-        // Default case
-        assertThat(DreamSettings.getSettingFromPrefKey("garbage value"))
-                .isEqualTo(DreamBackend.NEVER);
-    }
-
-    @Test
-    public void getKeyFromSetting() {
-        for (int i = 0; i < SETTINGS.length; i++) {
-            assertThat(DreamSettings.getKeyFromSetting(SETTINGS[i]))
-                    .isEqualTo(KEYS.get(i));
-        }
-        // Default
-        assertThat(DreamSettings.getKeyFromSetting(-1))
-                .isEqualTo(DreamSettings.NEVER_DREAM);
-    }
-
-    @Test
-    public void getDreamSettingDescriptionResId() {
-        for (int i = 0; i < SETTINGS.length; i++) {
-            assertThat(DreamSettings.getDreamSettingDescriptionResId(SETTINGS[i]))
-                    .isEqualTo(RES_IDS[i]);
-        }
-        // Default
-        assertThat(DreamSettings.getDreamSettingDescriptionResId(-1))
-                .isEqualTo(R.string.screensaver_settings_summary_never);
-    }
-
-    @Test
-    public void summaryText_whenDreamsAreOff() {
-        DreamBackend mockBackend = mock(DreamBackend.class);
-        Context mockContext = mock(Context.class);
-        when(mockBackend.isEnabled()).thenReturn(false);
-
-        assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext))
-                .isEqualTo(mockContext.getString(R.string.screensaver_settings_summary_off));
-    }
-
-    @Test
-    public void summaryTest_WhenDreamsAreOn() {
-        final String fakeName = "test_name";
-        DreamBackend mockBackend = mock(DreamBackend.class);
-        Context mockContext = mock(Context.class);
-        when(mockBackend.isEnabled()).thenReturn(true);
-        when(mockBackend.getActiveDreamName()).thenReturn(fakeName);
-
-        assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext))
-                .isEqualTo(fakeName);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
deleted file mode 100644
index 444591a6b64d86543181c56f3ed01b37f3a038eb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dream;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settingslib.dream.DreamBackend;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StartNowPreferenceControllerTest {
-    private StartNowPreferenceController mController;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private LayoutPreference mLayoutPref;
-    @Mock
-    private Button mButton;
-    @Mock
-    private DreamBackend mBackend;
-
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-
-        mController = new StartNowPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mLayoutPref);
-        when(mLayoutPref.findViewById(R.id.dream_start_now_button)).thenReturn(mButton);
-
-        ReflectionHelpers.setField(mController, "mBackend", mBackend);
-    }
-
-    @Test
-    public void setsOnClickListenerForStartNow() {
-        ArgumentCaptor<OnClickListener> captor =
-                ArgumentCaptor.forClass(Button.OnClickListener.class);
-
-        mController.displayPreference(mScreen);
-        verify(mButton).setOnClickListener(captor.capture());
-        assertThat(captor.getValue()).isNotNull();
-    }
-
-    @Test
-    public void buttonIsDisabledWhenNeverDreaming() {
-        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.NEVER);
-
-        mController.updateState(mLayoutPref);
-        verify(mButton).setEnabled(false);
-    }
-
-    @Test
-    public void buttonIsEnabledWhenDreamIsAvailable() {
-        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.EITHER);
-
-        mController.updateState(mLayoutPref);
-        verify(mButton).setEnabled(true);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
deleted file mode 100644
index bafc2d40c744c893872f9cf0335a592babe74cee..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dream;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.dream.DreamBackend;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WhenToDreamPickerTest {
-    private WhenToDreamPicker mPicker;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private DreamBackend mBackend;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        FakeFeatureFactory.setupForTest(mActivity);
-
-        mPicker = new WhenToDreamPicker();
-        mPicker.onAttach((Context)mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mBackend", mBackend);
-    }
-
-    @Test
-    public void getDefaultKeyReturnsCurrentWhenToDreamSetting() {
-        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.WHILE_CHARGING);
-        assertThat(mPicker.getDefaultKey())
-                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING));
-
-        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.WHILE_DOCKED);
-        assertThat(mPicker.getDefaultKey())
-                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED));
-
-        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.EITHER);
-        assertThat(mPicker.getDefaultKey())
-                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.EITHER));
-
-        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.NEVER);
-        assertThat(mPicker.getDefaultKey())
-                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.NEVER));
-    }
-
-    @Test
-    public void setDreamWhileCharging() {
-        String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING);
-        mPicker.setDefaultKey(key);
-        verify(mBackend).setWhenToDream(DreamBackend.WHILE_CHARGING);
-    }
-
-    @Test
-    public void setDreamWhileDocked() {
-        String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED);
-        mPicker.setDefaultKey(key);
-        verify(mBackend).setWhenToDream(DreamBackend.WHILE_DOCKED);
-    }
-
-    @Test
-    public void setDreamWhileChargingOrDocked() {
-        String key = DreamSettings.getKeyFromSetting(DreamBackend.EITHER);
-        mPicker.setDefaultKey(key);
-        verify(mBackend).setWhenToDream(DreamBackend.EITHER);
-    }
-
-    @Test
-    public void setDreamNever() {
-        String key = DreamSettings.getKeyFromSetting(DreamBackend.NEVER);
-        mPicker.setDefaultKey(key);
-        verify(mBackend).setWhenToDream(DreamBackend.NEVER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
deleted file mode 100644
index 2acf82b34cfc2b7e7e43fb64f4ba988940b6b62d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dream;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.WhenToDream;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WhenToDreamPreferenceControllerTest {
-    private WhenToDreamPreferenceController mController;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private DreamBackend mBackend;
-
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mController = new WhenToDreamPreferenceController(mContext);
-        ReflectionHelpers.setField(mController, "mBackend", mBackend);
-    }
-
-    @Test
-    public void updateSummary() {
-        // Don't have to test the other settings because DreamSettings tests that all
-        // @WhenToDream values map to the correct ResId
-        final @WhenToDream int testSetting = DreamBackend.WHILE_CHARGING;
-        final Preference mockPref = mock(Preference.class);
-        when(mockPref.getContext()).thenReturn(mContext);
-        when(mBackend.getWhenToDreamSetting()).thenReturn(testSetting);
-        final String expectedString =
-                mContext.getString(DreamSettings.getDreamSettingDescriptionResId(testSetting));
-
-        mController.updateState(mockPref);
-        verify(mockPref).setSummary(expectedString);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
deleted file mode 100644
index 111e503def9b15ade05e3c5b09770d7cc7113307..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.Date;
-
-import static com.google.common.truth.Truth.assertThat;
-
-/**
- * Tests for {@link AdminActionPreferenceControllerBase}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminActionPreferenceControllerBaseTest extends
-        AdminActionPreferenceControllerTestBase {
-
-    private Date mDate;
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new AdminActionPreferenceControllerBaseTestable();
-    }
-
-    @Override
-    public void setDate(Date date) {
-        mDate = date;
-    }
-
-    @Test
-    public void testIsAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return null;
-    }
-
-    private class AdminActionPreferenceControllerBaseTestable extends
-            AdminActionPreferenceControllerBase {
-        AdminActionPreferenceControllerBaseTestable() {
-            super(AdminActionPreferenceControllerBaseTest.this.mContext);
-        }
-
-        @Override
-        protected Date getAdminActionTimestamp() {
-            return mDate;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return null;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
deleted file mode 100644
index e9b9d86f482bfd45f8a31ff576e26c02c752cd88..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.text.format.DateUtils;
-
-import com.android.settings.R;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * Common base for testing subclasses of {@link AdminActionPreferenceControllerBase}.
- */
-public abstract class AdminActionPreferenceControllerTestBase {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    protected Context mContext;
-    protected FakeFeatureFactory mFeatureFactory;
-
-    protected AdminActionPreferenceControllerBase mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-    }
-
-    public abstract void setDate(Date date);
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        when(mContext.getString(R.string.enterprise_privacy_none)).thenReturn("None");
-        Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24, "24");
-
-        setDate(null);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("None");
-
-        final Date date = new GregorianCalendar(2011 /* year */, 10 /* month */, 9 /* dayOfMonth */,
-                8 /* hourOfDay */, 7 /* minute */, 6 /* second */).getTime();
-        setDate(date);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo(DateUtils.formatDateTime(
-                mContext, date.getTime(), DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE));
-    }
-
-    @Test
-    public void testIsAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    public abstract String getPreferenceKey();
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(getPreferenceKey());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
deleted file mode 100644
index 491fcdba99d1a53df18519b1d4be2080581cab20..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.Manifest;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link AdminGrantedCameraPermissionPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedCameraPermissionPreferenceControllerTest extends
-        AdminGrantedPermissionsPreferenceControllerTestBase {
-
-    public AdminGrantedCameraPermissionPreferenceControllerTest() {
-        super("enterprise_privacy_number_camera_access_packages",
-                new String[] {Manifest.permission.CAMERA},
-                Manifest.permission_group.CAMERA);
-    }
-
-    @Override
-    protected AdminGrantedPermissionsPreferenceControllerBase createController(boolean async) {
-        return new AdminGrantedCameraPermissionPreferenceController(mContext,null /* lifecycle */,
-                async);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
deleted file mode 100644
index 01a13d29394ddfe4a4863a99963654af552fd8e1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.Manifest;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link AdminGrantedLocationPermissionsPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedLocationPermissionsPreferenceControllerTest extends
-        AdminGrantedPermissionsPreferenceControllerTestBase {
-
-    public AdminGrantedLocationPermissionsPreferenceControllerTest() {
-        super("enterprise_privacy_number_location_access_packages",
-                new String[] {Manifest.permission.ACCESS_COARSE_LOCATION,
-                        Manifest.permission.ACCESS_FINE_LOCATION},
-                Manifest.permission_group.LOCATION);
-    }
-
-    @Override
-    protected AdminGrantedPermissionsPreferenceControllerBase createController(boolean async) {
-        return new AdminGrantedLocationPermissionsPreferenceController(mContext,
-                null /* lifecycle */, async);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
deleted file mode 100644
index fed16317219639df2b3ea920f9932924ff0a8265..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.Manifest;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedMicrophonePermissionPreferenceControllerTest extends
-        AdminGrantedPermissionsPreferenceControllerTestBase {
-
-    public AdminGrantedMicrophonePermissionPreferenceControllerTest() {
-        super("enterprise_privacy_number_microphone_access_packages",
-                new String[] {Manifest.permission.RECORD_AUDIO},
-                Manifest.permission_group.MICROPHONE);
-    }
-
-    @Override
-    protected AdminGrantedPermissionsPreferenceControllerBase createController(boolean async) {
-        return new AdminGrantedMicrophonePermissionPreferenceController(mContext,
-                null /* lifecycle */, async);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
deleted file mode 100644
index a209a46256ef52ee7caa470e7fb1eccdde140b9d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedPermissionsPreferenceControllerBaseTest extends
-        AdminGrantedPermissionsPreferenceControllerTestBase {
-
-    public AdminGrantedPermissionsPreferenceControllerBaseTest() {
-        super("some.key", new String[] {"some.permission"}, "some.permission");
-    }
-
-    @Override
-    protected AdminGrantedPermissionsPreferenceControllerBase createController(boolean async) {
-        return new AdminGrantedPermissionsPreferenceControllerBaseTestable(async);
-    }
-
-    private class AdminGrantedPermissionsPreferenceControllerBaseTestable extends
-            AdminGrantedPermissionsPreferenceControllerBase {
-
-        AdminGrantedPermissionsPreferenceControllerBaseTestable(boolean async) {
-            super(AdminGrantedPermissionsPreferenceControllerBaseTest.this.mContext,
-                    null /* lifecycle */, async, mPermissions, mPermissionGroup);
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return "some.key";
-        }
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
deleted file mode 100644
index c1a3143065b403709ad99e5dfc6e312b5ef1d953..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Common base for testing subclasses of {@link AdminGrantedPermissionsPreferenceControllerBase}.
- */
-public abstract class AdminGrantedPermissionsPreferenceControllerTestBase {
-    protected final String mKey;
-    protected final String[] mPermissions;
-    protected final String mPermissionGroup;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    protected Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    protected AdminGrantedPermissionsPreferenceControllerBase mController;
-
-    public AdminGrantedPermissionsPreferenceControllerTestBase(String key, String[] permissions,
-            String permissionGroup) {
-        mKey = key;
-        mPermissions = permissions;
-        mPermissionGroup = permissionGroup;
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = createController(true /* async */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    private void setNumberOfPackagesWithAdminGrantedPermissions(int number, boolean async) {
-        doAnswer(new Answer() {
-            public Object answer(InvocationOnMock invocation) {
-                ((ApplicationFeatureProvider.NumberOfAppsCallback)
-                        invocation.getArguments()[2]).onNumberOfAppsResult(number);
-                return null;
-            }}).when(mFeatureFactory.applicationFeatureProvider)
-                    .calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions),
-                            eq(async), anyObject());
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setVisible(true);
-
-        setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
-        mController.updateState(preference);
-        assertThat(preference.isVisible()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
-
-        setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
-        when(mContext.getResources().getQuantityString(
-                R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))
-                .thenReturn("minimum 20 apps");
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
-        assertThat(preference.isVisible()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
-    }
-
-    @Test
-    public void testIsAvailableSync() {
-        final AdminGrantedPermissionsPreferenceControllerBase controller
-                = createController(false /* async */);
-        controller.setAvailabilityObserver(mObserver);
-
-        setNumberOfPackagesWithAdminGrantedPermissions(0, false /* async */);
-        assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
-
-        setNumberOfPackagesWithAdminGrantedPermissions(20, false /* async */);
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
-    }
-
-    @Test
-    public void testIsAvailableAsync() {
-        setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
-
-        setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(mKey);
-    }
-
-    protected abstract AdminGrantedPermissionsPreferenceControllerBase createController(
-            boolean async);
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
deleted file mode 100644
index 045acf2ebd0df5a94575f29bcdb59829f27a9514..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import com.android.settings.R;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link AlwaysOnVpnCurrentUserPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AlwaysOnVpnCurrentUserPreferenceControllerTest {
-
-    private static final String VPN_SET_DEVICE = "VPN set";
-    private static final String VPN_SET_PERSONAL = "VPN set in personal profile";
-    private static final String KEY_ALWAYS_ON_VPN_PRIMARY_USER = "always_on_vpn_primary_user";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private AlwaysOnVpnCurrentUserPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AlwaysOnVpnCurrentUserPreferenceController(mContext,
-                null /* lifecycle */);
-        when(mContext.getString(R.string.enterprise_privacy_always_on_vpn_device))
-                .thenReturn(VPN_SET_DEVICE);
-        when(mContext.getString(R.string.enterprise_privacy_always_on_vpn_personal))
-                .thenReturn(VPN_SET_PERSONAL);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
-                .thenReturn(true);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(false);
-        mController.updateState(preference);
-        assertThat(preference.getTitle()).isEqualTo(VPN_SET_DEVICE);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(true);
-        mController.updateState(preference);
-        assertThat(preference.getTitle()).isEqualTo(VPN_SET_PERSONAL);
-    }
-
-    @Test
-    public void testIsAvailable() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
-                .thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, false);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
-                .thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ALWAYS_ON_VPN_PRIMARY_USER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
deleted file mode 100644
index b321652168b5a3f5407fa53d739e80d3592a34e7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link AlwaysOnVpnManagedProfilePreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AlwaysOnVpnManagedProfilePreferenceControllerTest {
-
-    private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private AlwaysOnVpnManagedProfilePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AlwaysOnVpnManagedProfilePreferenceController(mContext,
-                null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testIsAvailable() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
-                .thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, false);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
-                .thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
deleted file mode 100644
index a6f95aac599f17e3caff75945c0571cb9b84d265..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.enterprise;
-
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.applications.UserAppInfo;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ApplicationListFragmentTest {
-    private static final int USER_ID = 0;
-    private static final int USER_APP_UID = 0;
-
-    private static final String APP = "APP";
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceManager mPreferenceManager;
-
-    private ApplicationListFragment mFragment;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        when(mPreferenceManager.getContext()).thenReturn(mContext);
-
-        mFragment = new ApplicationListFragmentTestable(mPreferenceManager, mScreen);
-    }
-
-    @Test
-    public void getLogTag() {
-        assertThat(mFragment.getLogTag())
-                .isEqualTo("EnterprisePrivacySettings");
-    }
-
-    @Test
-    public void getScreenResource() {
-        assertThat(mFragment.getPreferenceScreenResId())
-                .isEqualTo(R.xml.app_list_disclosure_settings);
-    }
-
-    @Test
-    public void getPreferenceControllers() {
-        final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
-        assertThat(controllers).isNotNull();
-        assertThat(controllers.size()).isEqualTo(1);
-        int position = 0;
-        assertThat(controllers.get(position++)).isInstanceOf(
-                ApplicationListPreferenceController.class);
-    }
-
-    @Test public void getCategories() {
-        assertThat(new ApplicationListFragment.AdminGrantedPermissionCamera().getMetricsCategory())
-                .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS);
-        assertThat(new ApplicationListFragment.AdminGrantedPermissionLocation().
-                getMetricsCategory()).isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS);
-        assertThat(new ApplicationListFragment.AdminGrantedPermissionMicrophone().
-                getMetricsCategory()).isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS);
-        assertThat(new ApplicationListFragment.EnterpriseInstalledPackages().getMetricsCategory())
-                .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_INSTALLED_APPS);
-    }
-
-    private static class ApplicationListFragmentTestable extends ApplicationListFragment {
-
-        private final PreferenceManager mPreferenceManager;
-        private final PreferenceScreen mPreferenceScreen;
-
-        public ApplicationListFragmentTestable(PreferenceManager preferenceManager,
-                PreferenceScreen screen) {
-            this.mPreferenceManager = preferenceManager;
-            this.mPreferenceScreen = screen;
-        }
-
-        @Override
-        public void buildApplicationList(Context context,
-                ApplicationFeatureProvider.ListOfAppsCallback callback) {
-            final List<UserAppInfo> apps = new ArrayList<>();
-            final UserInfo user = new UserInfo(USER_ID, "main", UserInfo.FLAG_ADMIN);
-            apps.add(new UserAppInfo(user, buildInfo(USER_APP_UID, APP, 0, 0)));
-            callback.onListOfAppsResult(apps);
-        }
-
-        @Override
-        public PreferenceManager getPreferenceManager() {
-            return mPreferenceManager;
-        }
-
-        @Override
-        public PreferenceScreen getPreferenceScreen() {
-            return mPreferenceScreen;
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return MetricsEvent.VIEW_UNKNOWN;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
deleted file mode 100644
index 0d22d2e64a2473668c2abb46584ff2c38ce34054..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.applications.UserAppInfo;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ApplicationListPreferenceControllerTest {
-
-    private static final int MAIN_USER_ID = 0;
-
-    private static final int MANAGED_PROFILE_ID = 10;
-    private static final int PER_USER_UID_RANGE = 100000;
-    private static final int MAIN_USER_APP_UID = MAIN_USER_ID * PER_USER_UID_RANGE;
-    private static final int MANAGED_PROFILE_APP_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE;
-
-    private static final String APP_1 = "APP_1";
-    private static final String APP_2 = "APP_2";
-    private static final String APP_3 = "APP_3";
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PackageManager mPackageManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private SettingsPreferenceFragment mFragment;
-
-    private Context mContext;
-    private ApplicationListPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = shadowContext.getApplicationContext();
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
-        when(mPackageManager.getText(eq(APP_1), anyInt(), any())).thenReturn(APP_1);
-        when(mPackageManager.getText(eq(APP_2), anyInt(), any())).thenReturn(APP_2);
-        when(mPackageManager.getText(eq(APP_3), anyInt(), any())).thenReturn(APP_3);
-
-        mController = new ApplicationListPreferenceController(mContext, new ThreeAppsBuilder(),
-                mPackageManager, mFragment);
-    }
-
-    @Test
-    public void checkNumberAndTitlesOfApps() {
-        ArgumentCaptor<Preference> apps = ArgumentCaptor.forClass(Preference.class);
-        verify(mScreen, times(3)).addPreference(apps.capture());
-        final Set<String> expectedPackages = new HashSet<>(Arrays.asList(APP_1, APP_2, APP_3));
-        final Set<String> packages = new HashSet<>();
-
-        for (Preference p : apps.getAllValues()) {
-            packages.add(p.getTitle().toString());
-        }
-        assertThat(packages).isEqualTo(expectedPackages);
-    }
-
-    @Test
-    public void isAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isNull();
-    }
-
-    private static class ThreeAppsBuilder
-            implements ApplicationListPreferenceController.ApplicationListBuilder {
-        @Override
-        public void buildApplicationList(Context context,
-                                         ApplicationFeatureProvider.ListOfAppsCallback callback) {
-            final List<UserAppInfo> apps = new ArrayList<>();
-            final UserInfo user = new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN);
-            apps.add(new UserAppInfo(user, buildInfo(MAIN_USER_APP_UID, APP_1, 0, 0)));
-            apps.add(new UserAppInfo(user, buildInfo(MAIN_USER_APP_UID, APP_2, 0, 0)));
-            apps.add(new UserAppInfo(user, buildInfo(MANAGED_PROFILE_APP_UID, APP_3, 0, 0)));
-            callback.onListOfAppsResult(apps);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
deleted file mode 100644
index 0b97353f7d79d66bac5856bec25e4d326108c217..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.Date;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link BugReportsPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class BugReportsPreferenceControllerTest extends
-        AdminActionPreferenceControllerTestBase {
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new BugReportsPreferenceController(mContext);
-    }
-
-    @Override
-    public void setDate(Date date) {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastBugReportRequestTime())
-                .thenReturn(date);
-    }
-
-    @Test
-    public void testIsAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return "bug_reports";
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
deleted file mode 100644
index 35d78a57c346a9c245e13c66f6a135b944fbeac1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.when;
-
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link CaCertsCurrentUserPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class CaCertsCurrentUserPreferenceControllerTest extends
-        CaCertsPreferenceControllerTestBase {
-
-    private static final String CA_CERT_DEVICE = "CA certs";
-    private static final String CA_CERT_PERSONAL = "CA certs in personal profile";
-
-    @Before
-    public void mockGetString() {
-        when(mContext.getString(R.string.enterprise_privacy_ca_certs_device))
-                .thenReturn(CA_CERT_DEVICE);
-        when(mContext.getString(R.string.enterprise_privacy_ca_certs_personal))
-                .thenReturn(CA_CERT_PERSONAL);
-    }
-
-    @Test
-    public void testUpdateState_nonCompMode() {
-        assertUpdateState(false /* isCompMode */, CA_CERT_DEVICE);
-    }
-
-    @Test
-    public void testUpdateState_compMode() {
-        assertUpdateState(true /* isCompMode */, CA_CERT_PERSONAL);
-    }
-
-    @Override
-    void mockGetNumberOfCaCerts(int numOfCaCerts) {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getNumberOfOwnerInstalledCaCertsForCurrentUser()).thenReturn(numOfCaCerts);
-    }
-
-    @Override
-    String getPreferenceKey() {
-        return CaCertsCurrentUserPreferenceController.CA_CERTS_CURRENT_USER;
-    }
-
-    @Override
-    CaCertsPreferenceControllerBase createController() {
-        return new CaCertsCurrentUserPreferenceController(mContext, null /* lifecycle */);
-    }
-
-    private void assertUpdateState(boolean isCompMode, String expectedTitle) {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-
-        mockGetNumberOfCaCerts(2);
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode())
-                .thenReturn(isCompMode);
-        mController.updateState(preference);
-        assertThat(preference.getTitle()).isEqualTo(expectedTitle);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
deleted file mode 100644
index 41b7f45da1e6cf33db8d46d8d342b722efea257b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import static org.mockito.Mockito.when;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link CaCertsManagedProfilePreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class CaCertsManagedProfilePreferenceControllerTest extends
-        CaCertsPreferenceControllerTestBase {
-
-    @Override
-    void mockGetNumberOfCaCerts(int numOfCaCerts) {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getNumberOfOwnerInstalledCaCertsForManagedProfile()).thenReturn(numOfCaCerts);
-    }
-
-    @Override
-    String getPreferenceKey() {
-        return CaCertsManagedProfilePreferenceController.CA_CERTS_MANAGED_PROFILE;
-    }
-
-    @Override
-    CaCertsPreferenceControllerBase createController() {
-        return new CaCertsManagedProfilePreferenceController(mContext, null /* lifecycle */);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
deleted file mode 100644
index 37b903acd4fa1f7af222c8261af95352651f7ade..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link CaCertsPreferenceControllerBase}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase {
-    private static final String PREF_KEY = "pref";
-
-    private int mNumOfCaCerts;
-
-    void mockGetNumberOfCaCerts(int numOfCaCerts) {
-        mNumOfCaCerts = numOfCaCerts;
-    }
-
-    String getPreferenceKey() {
-        return PREF_KEY;
-    }
-
-    CaCertsPreferenceControllerBase createController() {
-        return new CaCertsPreferenceControllerBaseTestable(mContext);
-    }
-
-    private class CaCertsPreferenceControllerBaseTestable extends
-            CaCertsPreferenceControllerBase {
-
-        public CaCertsPreferenceControllerBaseTestable(Context context) {
-            super(context, null);
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return PREF_KEY;
-        }
-
-        @Override
-        protected int getNumberOfCaCerts() {
-            return mNumOfCaCerts;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
deleted file mode 100644
index c171fba6ab654877e445ae5585e464408e5e18e4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-/**
- * Base test class for testing {@link CaCertsPreferenceControllerBase}'s subclass.
- */
-public abstract class CaCertsPreferenceControllerTestBase {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    protected Context mContext;
-    protected FakeFeatureFactory mFeatureFactory;
-    protected CaCertsPreferenceControllerBase mController;
-    @Mock
-    private PreferenceAvailabilityObserver mObserver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = createController();
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-
-        when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs,
-                10, 10)).thenReturn("10 certs");
-        mockGetNumberOfCaCerts(10);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("10 certs");
-    }
-
-    @Test
-    public void testIsAvailable() {
-        mockGetNumberOfCaCerts(0);
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), false);
-
-        mockGetNumberOfCaCerts(10);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(getPreferenceKey());
-    }
-
-    abstract void mockGetNumberOfCaCerts(int numOfCaCerts);
-
-    abstract String getPreferenceKey();
-
-    abstract CaCertsPreferenceControllerBase createController();
-
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
deleted file mode 100644
index cc6335fea57fdbf060536cfa6a2db27f28d5541d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyObject;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link EnterpriseInstalledPackagesPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterpriseInstalledPackagesPreferenceControllerTest {
-
-    private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES
-            = "number_enterprise_installed_packages";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private EnterpriseInstalledPackagesPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new EnterpriseInstalledPackagesPreferenceController(mContext,
-                null /* lifecycle */, true /* async */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    private void setNumberOfEnterpriseInstalledPackages(int number, boolean async) {
-        doAnswer(new Answer() {
-            public Object answer(InvocationOnMock invocation) {
-                ((ApplicationFeatureProvider.NumberOfAppsCallback)
-                        invocation.getArguments()[1]).onNumberOfAppsResult(number);
-                return null;
-            }}).when(mFeatureFactory.applicationFeatureProvider)
-                    .calculateNumberOfPolicyInstalledApps(eq(async), anyObject());
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setVisible(true);
-
-        setNumberOfEnterpriseInstalledPackages(0, true /* async */);
-        mController.updateState(preference);
-        assertThat(preference.isVisible()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
-                false);
-
-        setNumberOfEnterpriseInstalledPackages(20, true /* async */);
-        when(mContext.getResources().getQuantityString(
-                R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))
-                .thenReturn("minimum 20 apps");
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
-        assertThat(preference.isVisible()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
-                true);
-    }
-
-    @Test
-    public void testIsAvailableSync() {
-        final EnterpriseInstalledPackagesPreferenceController controller
-                = new EnterpriseInstalledPackagesPreferenceController(mContext,
-                        null /* lifecycle */, false /* async */);
-        controller.setAvailabilityObserver(mObserver);
-
-        setNumberOfEnterpriseInstalledPackages(0, false /* async */);
-        assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(
-                KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, false);
-
-        setNumberOfEnterpriseInstalledPackages(20, false /* async */);
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(
-                KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, true);
-    }
-
-    @Test
-    public void testIsAvailableAsync() {
-        setNumberOfEnterpriseInstalledPackages(0, true /* async */);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
-
-        setNumberOfEnterpriseInstalledPackages(20, true /* async */);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey())
-                .isEqualTo(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
deleted file mode 100644
index 899ff5c66db248c667a2c68c7035cb190819ffc2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.content.res.Resources;
-import android.net.ProxyInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.text.SpannableStringBuilder;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.vpn2.ConnectivityManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link EnterprisePrivacyFeatureProviderImpl}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterprisePrivacyFeatureProviderImplTest {
-
-    private final ComponentName OWNER = new ComponentName("dummy", "component");
-    private final ComponentName ADMIN_1 = new ComponentName("dummy", "admin1");
-    private final ComponentName ADMIN_2 = new ComponentName("dummy", "admin2");
-    private final String OWNER_ORGANIZATION = new String("ACME");
-    private final Date TIMESTAMP = new Date(2011, 11, 11);
-    private final int MY_USER_ID = UserHandle.myUserId();
-    private final int MANAGED_PROFILE_USER_ID = MY_USER_ID + 1;
-    private final String VPN_PACKAGE_ID = "com.example.vpn";
-    private final String IME_PACKAGE_ID = "com.example.ime";
-    private final String OTHER_PACKAGE_ID = "com.example.other";
-    private final String IME_PACKAGE_LABEL = "Test IME";
-
-    private List<UserInfo> mProfiles = new ArrayList();
-
-    private @Mock Context mContext;
-    private @Mock DevicePolicyManagerWrapper mDevicePolicyManager;
-    private @Mock PackageManagerWrapper mPackageManagerWrapper;
-    private @Mock PackageManager mPackageManager;
-    private @Mock UserManager mUserManager;
-    private @Mock ConnectivityManagerWrapper mConnectivityManger;
-    private Resources mResources;
-
-    private EnterprisePrivacyFeatureProvider mProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        resetAndInitializePackageManagerWrapper();
-        when(mUserManager.getProfiles(MY_USER_ID)).thenReturn(mProfiles);
-        mProfiles.add(new UserInfo(MY_USER_ID, "", "", 0 /* flags */));
-        mResources = ShadowApplication.getInstance().getApplicationContext().getResources();
-
-        mProvider = new EnterprisePrivacyFeatureProviderImpl(mContext, mDevicePolicyManager,
-                mPackageManagerWrapper, mUserManager, mConnectivityManger, mResources);
-    }
-
-    @Test
-    public void testHasDeviceOwner() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
-        assertThat(mProvider.hasDeviceOwner()).isFalse();
-
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
-        assertThat(mProvider.hasDeviceOwner()).isTrue();
-    }
-
-    @Test
-    public void testIsInCompMode() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
-        assertThat(mProvider.isInCompMode()).isFalse();
-
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-        assertThat(mProvider.isInCompMode()).isTrue();
-    }
-
-    @Test
-    public void testGetDeviceOwnerOrganizationName() {
-        when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);
-        assertThat(mProvider.getDeviceOwnerOrganizationName()).isNull();
-
-        when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION);
-        assertThat(mProvider.getDeviceOwnerOrganizationName()).isEqualTo(OWNER_ORGANIZATION);
-    }
-
-    @Test
-    public void testGetDeviceOwnerDisclosure() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
-        assertThat(mProvider.getDeviceOwnerDisclosure()).isNull();
-
-        SpannableStringBuilder disclosure = new SpannableStringBuilder();
-        disclosure.append(mResources.getString(R.string.do_disclosure_generic));
-        disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
-        disclosure.append(mResources.getString(R.string.do_disclosure_learn_more),
-                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
-        when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);
-        assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);
-
-        disclosure = new SpannableStringBuilder();
-        disclosure.append(mResources.getString(R.string.do_disclosure_with_name,
-                OWNER_ORGANIZATION));
-        disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
-        disclosure.append(mResources.getString(R.string.do_disclosure_learn_more),
-                new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
-        when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION);
-        assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);
-    }
-
-    @Test
-    public void testGetLastSecurityLogRetrievalTime() {
-        when(mDevicePolicyManager.getLastSecurityLogRetrievalTime()).thenReturn(-1L);
-        assertThat(mProvider.getLastSecurityLogRetrievalTime()).isNull();
-
-        when(mDevicePolicyManager.getLastSecurityLogRetrievalTime())
-                .thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastSecurityLogRetrievalTime()).isEqualTo(TIMESTAMP);
-    }
-
-    @Test
-    public void testGetLastBugReportRequestTime() {
-        when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(-1L);
-        assertThat(mProvider.getLastBugReportRequestTime()).isNull();
-
-        when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastBugReportRequestTime()).isEqualTo(TIMESTAMP);
-    }
-
-    @Test
-    public void testGetLastNetworkLogRetrievalTime() {
-        when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(-1L);
-        assertThat(mProvider.getLastNetworkLogRetrievalTime()).isNull();
-
-        when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(TIMESTAMP);
-    }
-
-    @Test
-    public void testIsSecurityLoggingEnabled() {
-        when(mDevicePolicyManager.isSecurityLoggingEnabled(null)).thenReturn(false);
-        assertThat(mProvider.isSecurityLoggingEnabled()).isFalse();
-
-        when(mDevicePolicyManager.isSecurityLoggingEnabled(null)).thenReturn(true);
-        assertThat(mProvider.isSecurityLoggingEnabled()).isTrue();
-    }
-
-    @Test
-    public void testIsNetworkLoggingEnabled() {
-        when(mDevicePolicyManager.isNetworkLoggingEnabled(null)).thenReturn(false);
-        assertThat(mProvider.isNetworkLoggingEnabled()).isFalse();
-
-        when(mDevicePolicyManager.isNetworkLoggingEnabled(null)).thenReturn(true);
-        assertThat(mProvider.isNetworkLoggingEnabled()).isTrue();
-    }
-
-    @Test
-    public void testIsAlwaysOnVpnSetInCurrentUser() {
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MY_USER_ID)).thenReturn(null);
-        assertThat(mProvider.isAlwaysOnVpnSetInCurrentUser()).isFalse();
-
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MY_USER_ID))
-                .thenReturn(VPN_PACKAGE_ID);
-        assertThat(mProvider.isAlwaysOnVpnSetInCurrentUser()).isTrue();
-    }
-
-    @Test
-    public void testIsAlwaysOnVpnSetInManagedProfileProfile() {
-        assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isFalse();
-
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MANAGED_PROFILE_USER_ID))
-                .thenReturn(null);
-        assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isFalse();
-
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MANAGED_PROFILE_USER_ID))
-                .thenReturn(VPN_PACKAGE_ID);
-        assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isTrue();
-    }
-
-    @Test
-    public void testIsGlobalHttpProxySet() {
-        when(mConnectivityManger.getGlobalProxy()).thenReturn(null);
-        assertThat(mProvider.isGlobalHttpProxySet()).isFalse();
-
-        when(mConnectivityManger.getGlobalProxy()).thenReturn(
-                ProxyInfo.buildDirectProxy("localhost", 123));
-        assertThat(mProvider.isGlobalHttpProxySet()).isTrue();
-    }
-
-    @Test
-    public void testGetMaximumFailedPasswordsForWipeInCurrentUser() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(null);
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
-        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MY_USER_ID))
-                .thenReturn(10);
-        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(0);
-
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(OWNER);
-        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
-
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(OWNER);
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
-        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
-    }
-
-    @Test
-    public void testGetMaximumFailedPasswordsForWipeInManagedProfile() {
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MANAGED_PROFILE_USER_ID)).thenReturn(OWNER);
-        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MANAGED_PROFILE_USER_ID))
-                .thenReturn(10);
-        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(0);
-
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(10);
-    }
-
-    @Test
-    public void testGetImeLabelIfOwnerSet() throws Exception {
-        final ApplicationInfo applicationInfo = mock(ApplicationInfo.class);
-        when(applicationInfo.loadLabel(mPackageManager)).thenReturn(IME_PACKAGE_LABEL);
-
-        Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
-        when(mPackageManagerWrapper.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
-                .thenReturn(applicationInfo);
-
-        // IME not set by Device Owner.
-        when(mDevicePolicyManager.isCurrentInputMethodSetByOwner()).thenReturn(false);
-        assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
-
-        // Device Owner set IME to empty string.
-        when(mDevicePolicyManager.isCurrentInputMethodSetByOwner()).thenReturn(true);
-        Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, null);
-        assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
-
-        // Device Owner set IME to nonexistent package.
-        Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
-        when(mPackageManagerWrapper.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
-                .thenThrow(new PackageManager.NameNotFoundException());
-        assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
-
-        // Device Owner set IME to existent package.
-        resetAndInitializePackageManagerWrapper();
-        when(mPackageManagerWrapper.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
-                .thenReturn(applicationInfo);
-        assertThat(mProvider.getImeLabelIfOwnerSet()).isEqualTo(IME_PACKAGE_LABEL);
-    }
-
-    @Test
-    public void testGetNumberOfOwnerInstalledCaCertsForCurrent() {
-        final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
-        final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
-        final UserInfo managedProfile =
-                new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE);
-
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
-                .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
-
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
-                .thenReturn(null);
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
-                .isEqualTo(0);
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
-                .thenReturn(new ArrayList<>());
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
-                .isEqualTo(0);
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
-                .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
-                .isEqualTo(2);
-    }
-
-    @Test
-    public void testGetNumberOfOwnerInstalledCaCertsForManagedProfile() {
-        final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
-        final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
-        final UserInfo managedProfile =
-                new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE);
-
-        // Without a profile
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
-                .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
-                .isEqualTo(0);
-
-        // With a profile
-        mProfiles.add(managedProfile);
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
-                .thenReturn(null);
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
-                .isEqualTo(0);
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
-                .thenReturn(new ArrayList<>());
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
-                .isEqualTo(0);
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
-                .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
-                .isEqualTo(2);
-    }
-
-    @Test
-    public void testGetNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile() {
-        when(mDevicePolicyManager.getActiveAdminsAsUser(MY_USER_ID))
-                .thenReturn(Arrays.asList(new ComponentName[] {ADMIN_1, ADMIN_2}));
-        when(mDevicePolicyManager.getActiveAdminsAsUser(MANAGED_PROFILE_USER_ID))
-                .thenReturn(Arrays.asList(new ComponentName[] {ADMIN_1}));
-
-        assertThat(mProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile())
-                .isEqualTo(2);
-
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-        assertThat(mProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile())
-                .isEqualTo(3);
-    }
-
-    private void resetAndInitializePackageManagerWrapper() {
-        reset(mPackageManagerWrapper);
-        when(mPackageManagerWrapper.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN))
-                .thenReturn(true);
-        when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
deleted file mode 100644
index 7077ad52a2ab81b019f5587f3e9098329eb143dc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link EnterprisePrivacyPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterprisePrivacyPreferenceControllerTest {
-
-    private static final String MANAGED_GENERIC = "managed by organization";
-    private static final String MANAGED_WITH_NAME = "managed by Foo, Inc.";
-    private static final String MANAGING_ORGANIZATION = "Foo, Inc.";
-    private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private EnterprisePrivacyPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new EnterprisePrivacyPreferenceController(mContext, null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-
-        when(mContext.getString(R.string.enterprise_privacy_settings_summary_generic))
-                .thenReturn(MANAGED_GENERIC);
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getDeviceOwnerOrganizationName())
-                .thenReturn(null);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo(MANAGED_GENERIC);
-
-        when(mContext.getResources().getString(
-                R.string.enterprise_privacy_settings_summary_with_name, MANAGING_ORGANIZATION))
-                .thenReturn(MANAGED_WITH_NAME);
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getDeviceOwnerOrganizationName())
-                .thenReturn(MANAGING_ORGANIZATION);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo(MANAGED_WITH_NAME);
-      }
-
-    @Test
-    public void testIsAvailable() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, false);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ENTERPRISE_PRIVACY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
deleted file mode 100644
index 4da328977c2ea564ffed51810e7d251cbfcaaaef..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.xmlpull.v1.XmlPullParser;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Tests for {@link EnterprisePrivacySettings}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterprisePrivacySettingsTest {
-
-    private final static String RESOURCES_NAMESPACE = "http://schemas.android.com/apk/res/android";
-    private final static String ATTR_KEY = "key";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    private EnterprisePrivacySettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        mSettings = new EnterprisePrivacySettings();
-    }
-
-    @Test
-    public void testGetMetricsCategory() {
-        assertThat(mSettings.getMetricsCategory())
-                .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_SETTINGS);
-    }
-
-    @Test
-    public void testGetCategoryKey() {
-        assertThat(mSettings.getCategoryKey()).isNull();
-    }
-
-    @Test
-    public void testGetLogTag() {
-        assertThat(mSettings.getLogTag()).isEqualTo("EnterprisePrivacySettings");
-    }
-
-    @Test
-    public void testGetPreferenceScreenResId() {
-        assertThat(mSettings.getPreferenceScreenResId())
-                .isEqualTo(R.xml.enterprise_privacy_settings);
-    }
-
-    @Test
-    public void isPageEnabled_hasDeviceOwner_shouldReturnTrue() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner())
-                .thenReturn(true);
-
-        assertThat(EnterprisePrivacySettings.isPageEnabled(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void isPageEnabled_noDeviceOwner_shouldReturnFalse() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner())
-                .thenReturn(false);
-
-        assertThat(EnterprisePrivacySettings.isPageEnabled(mContext))
-                .isFalse();
-    }
-
-    @Test
-    public void getPreferenceControllers() throws Exception {
-        final List<AbstractPreferenceController> controllers = mSettings.getPreferenceControllers(
-                ShadowApplication.getInstance().getApplicationContext());
-        verifyPreferenceControllers(controllers);
-    }
-
-    @Test
-    public void getSearchIndexProviderPreferenceControllers() throws Exception {
-        final List<AbstractPreferenceController> controllers
-                = EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(
-                        ShadowApplication.getInstance().getApplicationContext());
-        verifyPreferenceControllers(controllers);
-    }
-
-    private void verifyPreferenceControllers(List<AbstractPreferenceController> controllers)
-            throws Exception {
-        assertThat(controllers).isNotNull();
-        assertThat(controllers.size()).isEqualTo(17);
-        int position = 0;
-        assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                SecurityLogsPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                EnterpriseInstalledPackagesPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                AdminGrantedLocationPermissionsPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                AdminGrantedMicrophonePermissionPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                AdminGrantedCameraPermissionPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                EnterpriseSetDefaultAppsPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                AlwaysOnVpnCurrentUserPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                AlwaysOnVpnManagedProfilePreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(ImePreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                GlobalHttpProxyPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                CaCertsCurrentUserPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                CaCertsManagedProfilePreferenceController.class);
-        final AbstractPreferenceController exposureChangesCategoryController =
-                controllers.get(position);
-        final int exposureChangesCategoryControllerIndex = position;
-        assertThat(controllers.get(position++)).isInstanceOf(
-                ExposureChangesCategoryPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                FailedPasswordWipeCurrentUserPreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(
-                FailedPasswordWipeManagedProfilePreferenceController.class);
-
-        // The "Changes made by your organization's admin" category is hidden when all Preferences
-        // inside it become unavailable. To do this correctly, the category's controller must:
-        // a) Observe the availability of all Preferences in the category and
-        // b) Be listed after those Preferences' controllers, so that availability is updated in
-        //    the correct order
-
-        // Find all Preferences in the category.
-        final XmlResourceParser parser = RuntimeEnvironment.application.getResources().getXml(
-                R.xml.enterprise_privacy_settings);
-        boolean done = false;
-        int type;
-        final Set<String> expectedObserved = new HashSet<>();
-        while (!done && (type = parser.next()) != XmlPullParser.END_DOCUMENT) {
-            if (type != XmlPullParser.START_TAG || !"exposure_changes_category".equals(
-                    parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY))) {
-                continue;
-            }
-            int depth = 1;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
-                if (type == XmlPullParser.START_TAG) {
-                    final String key = parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY);
-                    if (key != null) {
-                        expectedObserved.add(key);
-                    }
-                    depth++;
-                } else if (type == XmlPullParser.END_TAG) {
-                    depth--;
-                    if (depth == 0) {
-                        done = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Find all Preferences the category's controller is observing.
-        final Set<String> actualObserved = new HashSet<>();
-        int maxObservedIndex = -1;
-        for (int i = 0; i < controllers.size(); i++) {
-            final AbstractPreferenceController controller = controllers.get(i);
-            if (controller instanceof DynamicAvailabilityPreferenceController &&
-                    ((DynamicAvailabilityPreferenceController) controller).getAvailabilityObserver()
-                            == exposureChangesCategoryController) {
-                actualObserved.add(controller.getPreferenceKey());
-                maxObservedIndex = i;
-            }
-        }
-
-        // Verify that the category's controller is observing the Preferences inside it.
-        assertThat(actualObserved).isEqualTo(expectedObserved);
-        // Verify that the category's controller is listed after the Preferences' controllers.
-        assertThat(maxObservedIndex).isLessThan(exposureChangesCategoryControllerIndex);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
deleted file mode 100644
index 567c06f7a7457d8e2ab7b1f3cc1f9cc9b75b926e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.enterprise;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EnterpriseSetDefaultAppsListFragmentTest {
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceManager mPreferenceManager;
-
-    private EnterpriseSetDefaultAppsListFragment mFragment;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        when(mPreferenceManager.getContext()).thenReturn(mContext);
-        when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);
-        mFragment = new EnterpriseSetDefaultAppsListFragmentTestable(mPreferenceManager, mScreen);
-    }
-
-    @Test
-    public void getMetricsCategory() {
-        assertThat(mFragment.getMetricsCategory())
-                .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_DEFAULT_APPS);
-    }
-
-    @Test
-    public void getLogTag() {
-        assertThat(mFragment.getLogTag()).isEqualTo("EnterprisePrivacySettings");
-    }
-
-    @Test
-    public void getScreenResource() {
-        assertThat(mFragment.getPreferenceScreenResId())
-                .isEqualTo(R.xml.enterprise_set_default_apps_settings);
-    }
-
-    @Test
-    public void getPreferenceControllers() {
-        final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
-        assertThat(controllers).isNotNull();
-        assertThat(controllers.size()).isEqualTo(1);
-        int position = 0;
-        assertThat(controllers.get(position++)).isInstanceOf(
-                EnterpriseSetDefaultAppsListPreferenceController.class);
-    }
-
-    private static class EnterpriseSetDefaultAppsListFragmentTestable extends
-            EnterpriseSetDefaultAppsListFragment {
-
-        private final PreferenceManager mPreferenceManager;
-        private final PreferenceScreen mPreferenceScreen;
-
-        public EnterpriseSetDefaultAppsListFragmentTestable(PreferenceManager preferenceManager,
-                PreferenceScreen screen) {
-            this.mPreferenceManager = preferenceManager;
-            this.mPreferenceScreen = screen;
-        }
-
-        @Override
-        public PreferenceManager getPreferenceManager() {
-            return mPreferenceManager;
-        }
-
-        @Override
-        public PreferenceScreen getPreferenceScreen() {
-            return mPreferenceScreen;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
deleted file mode 100644
index c38f56a46b72ef150de3214b9b35947455c2262d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.content.res.Resources;
-import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.EnterpriseDefaultApps;
-import com.android.settings.applications.UserAppInfo;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.testutils.ApplicationTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EnterpriseSetDefaultAppsListPreferenceControllerTest {
-    private static final int USER_ID = 0;
-    private static final int APP_UID = 0;
-
-    private static final String APP_1 = "APP_1";
-    private static final String APP_2 = "APP_2";
-    private static final String BROWSER_TITLE = "Browser app";
-    private static final String PHONE_TITLE = "Phone apps";
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceManager mPrefenceManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PackageManager mPackageManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private SettingsPreferenceFragment mFragment;
-
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = spy(shadowContext.getApplicationContext());
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FeatureFactory.getFactory(mContext);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mPrefenceManager.getContext()).thenReturn(mContext);
-        when(mFragment.getPreferenceManager()).thenReturn(mPrefenceManager);
-
-        when(mContext.getString(R.string.default_browser_title)).thenReturn(BROWSER_TITLE);
-        Resources resources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(resources);
-        when(resources.getQuantityString(R.plurals.default_phone_app_title, 2))
-                .thenReturn(PHONE_TITLE);
-        when(mContext.getString(R.string.app_names_concatenation_template_2))
-                .thenReturn("%1$s, %2$s");
-
-        when(mPackageManager.getText(eq(APP_1), anyInt(), any())).thenReturn(APP_1);
-        when(mPackageManager.getText(eq(APP_2), anyInt(), any())).thenReturn(APP_2);
-    }
-
-    @Test
-    public void testMultipleAppsForOneTypeOfDefault() {
-        final UserInfo user = new UserInfo(USER_ID, "main", UserInfo.FLAG_ADMIN);
-        final ApplicationInfo appInfo1 = ApplicationTestUtils.buildInfo(APP_UID, APP_1, 0, 0);
-        final ApplicationInfo appInfo2 = ApplicationTestUtils.buildInfo(APP_UID, APP_2, 0, 0);
-
-        when(mFeatureFactory.userFeatureProvider.getUserProfiles())
-                .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(false);
-        when(mFeatureFactory.applicationFeatureProvider
-                .findPersistentPreferredActivities(anyInt(), any()))
-                .thenReturn(Collections.emptyList());
-        when(mFeatureFactory.applicationFeatureProvider
-                .findPersistentPreferredActivities(eq(USER_ID),
-                        eq(EnterpriseDefaultApps.BROWSER.getIntents())))
-                .thenReturn(Arrays.asList(new UserAppInfo(user, appInfo1)));
-        when(mFeatureFactory.applicationFeatureProvider
-                .findPersistentPreferredActivities(eq(USER_ID),
-                        eq(EnterpriseDefaultApps.PHONE.getIntents()))).thenReturn(
-                                Arrays.asList(new UserAppInfo(user, appInfo1),
-                                        new UserAppInfo(user, appInfo2)));
-
-        new EnterpriseSetDefaultAppsListPreferenceController(mContext, mFragment, mPackageManager);
-        ShadowApplication.runBackgroundTasks();
-
-        ArgumentCaptor<Preference> apps = ArgumentCaptor.forClass(Preference.class);
-        verify(mScreen, times(2)).addPreference(apps.capture());
-
-        assertThat(apps.getAllValues().get(0).getTitle()).isEqualTo(BROWSER_TITLE);
-        assertThat(apps.getAllValues().get(0).getSummary()).isEqualTo(APP_1);
-
-        assertThat(apps.getAllValues().get(1).getTitle()).isEqualTo(PHONE_TITLE);
-        assertThat(apps.getAllValues().get(1).getSummary()).isEqualTo(APP_1 + ", " + APP_2);
-    }
-
-    @Test
-    public void isAvailable() {
-        when(mFeatureFactory.userFeatureProvider.getUserProfiles())
-                .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
-        when(mFeatureFactory.applicationFeatureProvider
-                .findPersistentPreferredActivities(anyInt(), any()))
-                .thenReturn(Collections.emptyList());
-        final EnterpriseSetDefaultAppsListPreferenceController controller =
-                new EnterpriseSetDefaultAppsListPreferenceController(mContext, mFragment,
-                        mPackageManager);
-        assertThat(controller.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getPreferenceKey() {
-        when(mFeatureFactory.userFeatureProvider.getUserProfiles())
-                .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
-        when(mFeatureFactory.applicationFeatureProvider
-                .findPersistentPreferredActivities(anyInt(), any()))
-                .thenReturn(Collections.emptyList());
-        final EnterpriseSetDefaultAppsListPreferenceController controller =
-                new EnterpriseSetDefaultAppsListPreferenceController(mContext, mFragment,
-                        mPackageManager);
-        assertThat(controller.getPreferenceKey()).isNull();
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
deleted file mode 100644
index bb21bf7c56122e25023fde2dcdcff407c73028bb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.EnterpriseDefaultApps;
-import com.android.settings.applications.UserAppInfo;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.mockito.Mockito.verify;
-/**
- * Tests for {@link EnterpriseSetDefaultAppsPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
-
-    private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private UserManager mUm;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private EnterpriseSetDefaultAppsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new EnterpriseSetDefaultAppsPreferenceController(mContext,
-                null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    private void setEnterpriseSetDefaultApps(Intent[] intents, int number) {
-        final ApplicationInfo appInfo = new ApplicationInfo();
-        appInfo.packageName = "app";
-        for (int i = 0; i < number; i++) {
-            final List<UserAppInfo> apps = new ArrayList<>(number);
-            apps.add(new UserAppInfo(new UserInfo(i, "user." + i, UserInfo.FLAG_ADMIN), appInfo));
-            when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(eq(i),
-                    argThat(matchesIntents(intents)))).thenReturn(apps);
-        }
-    }
-
-    private void configureUsers(int number) {
-        final List<UserHandle> users = new ArrayList<>(number);
-        for (int i = 0; i < 64; i++) {
-            users.add(new UserHandle(i));
-        }
-        when(mFeatureFactory.userFeatureProvider.getUserProfiles()).thenReturn(users);
-    }
-
-    @Test
-    public void testUpdateState() {
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.BROWSER.getIntents(), 1);
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CAMERA.getIntents(), 2);
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.MAP.getIntents(), 4);
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.EMAIL.getIntents(), 8);
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CALENDAR.getIntents(), 16);
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CONTACTS.getIntents(), 32);
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.PHONE.getIntents(), 64);
-        when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_packages,
-                127, 127)).thenReturn("127 apps");
-
-        // As setEnterpriseSetDefaultApps uses fake Users, we need to list them via UserManager.
-        configureUsers(64);
-
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("127 apps");
-    }
-
-    @Test
-    public void testIsAvailable() {
-        when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(anyInt(),
-                any(Intent[].class))).thenReturn(new ArrayList<>());
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, false);
-
-        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.BROWSER.getIntents(), 1);
-        configureUsers(1);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_DEFAULT_APPS);
-    }
-
-    private ArgumentMatcher<Intent[]> matchesIntents(Intent[] intents) {
-        return (Intent[] actualIntents) -> {
-            if (actualIntents == null) {
-                return false;
-            }
-            if (actualIntents.length != intents.length) {
-                return false;
-            }
-            for (int i = 0; i < intents.length; i++) {
-                if (!intents[i].filterEquals(actualIntents[i])) {
-                    return false;
-                }
-            }
-            return true;
-        };
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
deleted file mode 100644
index f77aef84b0eb5afa12d1386afa99a498f0a69618..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-
-/**
- * Tests for {@link ExposureChangesCategoryPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class ExposureChangesCategoryPreferenceControllerTest {
-
-    private static final String KEY_1 = "key_1";
-    private static final String KEY_2 = "key_2";
-    private static final String KEY_EXPOSURE_CHANGES_CATEGORY = "exposure_changes_category";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private List<DynamicAvailabilityPreferenceController> mControllers;
-    private ExposureChangesCategoryPreferenceController mController;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mControllers = Arrays.asList(mock(DynamicAvailabilityPreferenceController.class),
-                mock(DynamicAvailabilityPreferenceController.class));
-        mController = new ExposureChangesCategoryPreferenceController(mContext,
-                null /* lifecycle */, mControllers, true /* controllingUi */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testInitialization() {
-        verify(mControllers.get(0)).setAvailabilityObserver(mController);
-        verify(mControllers.get(1)).setAvailabilityObserver(mController);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testOnPreferenceAvailabilityUpdated() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setVisible(true);
-
-        mController.updateState(preference);
-        assertThat(preference.isVisible()).isFalse();
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        assertThat(preference.isVisible()).isTrue();
-        reset(mObserver);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_2, true);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        assertThat(preference.isVisible()).isTrue();
-        reset(mObserver);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, false);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        assertThat(preference.isVisible()).isTrue();
-        reset(mObserver);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_2, false);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
-        assertThat(preference.isVisible()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setVisible(false);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
-        mController.updateState(preference);
-        assertThat(preference.isVisible()).isTrue();
-    }
-
-    @Test
-    public void testIsAvailableForUi() {
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
-        reset(mObserver);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, false);
-        reset(mObserver);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-    }
-
-    @Test
-    public void testIsAvailableForSearch() {
-        final ExposureChangesCategoryPreferenceController controller
-                = new ExposureChangesCategoryPreferenceController(mContext, null /* lifecycle */,
-                        mControllers, false /* controllingUi */);
-        controller.setAvailabilityObserver(mObserver);
-        verify(mControllers.get(0)).setAvailabilityObserver(controller);
-        verify(mControllers.get(1)).setAvailabilityObserver(controller);
-
-        assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_1, true);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_2, true);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_1, false);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_2, false);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_EXPOSURE_CHANGES_CATEGORY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
deleted file mode 100644
index db9182bcf812fddc5375f7bb7376d76555a11354..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link FailedPasswordWipeCurrentUserPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class FailedPasswordWipeCurrentUserPreferenceControllerTest extends
-        FailedPasswordWipePreferenceControllerTestBase {
-
-    private int mMaximumFailedPasswordsBeforeWipe = 0;
-
-    public FailedPasswordWipeCurrentUserPreferenceControllerTest() {
-        super("failed_password_wipe_current_user");
-    }
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new FailedPasswordWipeCurrentUserPreferenceController(mContext,
-                null /* lifecycle */);
-    }
-
-    @Override
-    public void setMaximumFailedPasswordsBeforeWipe(int maximum) {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getMaximumFailedPasswordsBeforeWipeInCurrentUser()).thenReturn(maximum);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
deleted file mode 100644
index 329c52694b170f65f5ec4ca9194a2f2f3d81048d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link FailedPasswordWipeManagedProfilePreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class FailedPasswordWipeManagedProfilePreferenceControllerTest extends
-        FailedPasswordWipePreferenceControllerTestBase {
-
-    private int mMaximumFailedPasswordsBeforeWipe = 0;
-
-    public FailedPasswordWipeManagedProfilePreferenceControllerTest() {
-        super("failed_password_wipe_managed_profile");
-    }
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new FailedPasswordWipeManagedProfilePreferenceController(mContext,
-                null /* lifecycle */);
-    }
-
-    @Override
-    public void setMaximumFailedPasswordsBeforeWipe(int maximum) {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getMaximumFailedPasswordsBeforeWipeInManagedProfile()).thenReturn(maximum);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
deleted file mode 100644
index 5d1b28a314270dbdbb91c69333f46110e6de3fd3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests for {@link FailedPasswordWipePreferenceControllerBase}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class FailedPasswordWipePreferenceControllerBaseTest extends
-        FailedPasswordWipePreferenceControllerTestBase {
-
-    private int mMaximumFailedPasswordsBeforeWipe = 0;
-
-    public FailedPasswordWipePreferenceControllerBaseTest() {
-        super(null);
-    }
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new FailedPasswordWipePreferenceControllerBaseTestable();
-    }
-
-    @Override
-    public void setMaximumFailedPasswordsBeforeWipe(int maximum) {
-        mMaximumFailedPasswordsBeforeWipe = maximum;
-    }
-
-    private class FailedPasswordWipePreferenceControllerBaseTestable extends
-            FailedPasswordWipePreferenceControllerBase {
-        FailedPasswordWipePreferenceControllerBaseTestable() {
-            super(FailedPasswordWipePreferenceControllerBaseTest.this.mContext,
-                    null /* lifecycle */);
-        }
-
-        @Override
-        protected int getMaximumFailedPasswordsBeforeWipe() {
-            return mMaximumFailedPasswordsBeforeWipe;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return null;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
deleted file mode 100644
index cbc220fbd7e6a14a7c2da2fcc7801333d986b790..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Common base for testing subclasses of {@link FailedPasswordWipePreferenceControllerBase}.
- */
-public abstract class FailedPasswordWipePreferenceControllerTestBase {
-
-    protected final String mKey;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    protected Context mContext;
-    protected FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    protected FailedPasswordWipePreferenceControllerBase mController;
-
-    public FailedPasswordWipePreferenceControllerTestBase(String key) {
-        mKey = key;
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        mController.setAvailabilityObserver(mObserver);
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    public abstract void setMaximumFailedPasswordsBeforeWipe(int maximum);
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-
-        setMaximumFailedPasswordsBeforeWipe(10);
-        when(mContext.getResources().getQuantityString(
-                R.plurals.enterprise_privacy_number_failed_password_wipe, 10, 10))
-                .thenReturn("10 attempts");
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("10 attempts");
-    }
-
-    @Test
-    public void testIsAvailable() {
-        mController.setAvailabilityObserver(mObserver);
-
-        setMaximumFailedPasswordsBeforeWipe(0);
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
-
-        setMaximumFailedPasswordsBeforeWipe(10);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(mKey);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
deleted file mode 100644
index d5ce1024beedaaa946c02951b769bc203c14762a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link GlobalHttpProxyPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class GlobalHttpProxyPreferenceControllerTest {
-
-    private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private GlobalHttpProxyPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new GlobalHttpProxyPreferenceController(mContext, null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testIsAvailable() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
-                .thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, false);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
-                .thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_GLOBAL_HTTP_PROXY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
deleted file mode 100644
index 22d2a7d50a02b1bad2c60a0444d79c1d9522611e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link ImePreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class ImePreferenceControllerTest {
-
-    private static final String DEFAULT_IME_LABEL = "Test IME";
-    private static final String DEFAULT_IME_TEXT = "Set to Test IME";
-    private static final String KEY_INPUT_METHOD = "input_method";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private ImePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new ImePreferenceController(mContext, null /* lifecycle */);
-        when(mContext.getResources().getString(R.string.enterprise_privacy_input_method_name,
-                DEFAULT_IME_LABEL)).thenReturn(DEFAULT_IME_TEXT);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
-            .thenReturn(DEFAULT_IME_LABEL);
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo(DEFAULT_IME_TEXT);
-    }
-
-    @Test
-    public void testIsAvailable() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
-            .thenReturn(null);
-        assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, false);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
-            .thenReturn(DEFAULT_IME_LABEL);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, true);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_INPUT_METHOD);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
deleted file mode 100644
index 2df05c211c1872679c812cb2a2c888d92c5eab09..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link ManageDeviceAdminPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class ManageDeviceAdminPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-
-    private ManageDeviceAdminPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new ManageDeviceAdminPreferenceController(mContext);
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(0);
-        when(mContext.getResources().getString(R.string.number_of_device_admins_none))
-                .thenReturn("no apps");
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("no apps");
-
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(5);
-        when(mContext.getResources().getQuantityString(R.plurals.number_of_device_admins, 5, 5))
-                .thenReturn("5 active apps");
-        mController.updateState(preference);
-        assertThat(preference.getSummary()).isEqualTo("5 active apps");
-    }
-
-    @Test
-    public void testIsAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("manage_device_admin");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
deleted file mode 100644
index 43b793d86d353946d030fc374fdee37f314abfd2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.Date;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link NetworkLogsPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class NetworkLogsPreferenceControllerTest extends
-        AdminActionPreferenceControllerTestBase {
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new NetworkLogsPreferenceController(mContext);
-    }
-
-    @Override
-    public void setDate(Date date) {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastNetworkLogRetrievalTime())
-                .thenReturn(date);
-    }
-
-    @Test
-    public void testIsAvailable() {
-        setDate(null);
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isNetworkLoggingEnabled())
-                .thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-
-        setDate(new Date());
-        assertThat(mController.isAvailable()).isTrue();
-
-        setDate(null);
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isNetworkLoggingEnabled())
-                .thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return "network_logs";
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
deleted file mode 100644
index 11e219a3efcc34d6ba2e86cc5d6edf0f02a8e42f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.enterprise;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.Date;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link SecurityLogsPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class SecurityLogsPreferenceControllerTest extends
-        AdminActionPreferenceControllerTestBase {
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        mController = new SecurityLogsPreferenceController(mContext);
-    }
-
-    @Override
-    public void setDate(Date date) {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastSecurityLogRetrievalTime())
-                .thenReturn(date);
-    }
-
-    @Test
-    public void testIsAvailable() {
-        setDate(null);
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isSecurityLoggingEnabled())
-                .thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-
-        setDate(new Date());
-        assertThat(mController.isAvailable()).isTrue();
-
-        setDate(null);
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isSecurityLoggingEnabled())
-                .thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return "security_logs";
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
deleted file mode 100644
index c3c1b42fefb553b89abebeba6b6b1c8d10e902aa..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fingerprint;
-
-
-import android.app.Dialog;
-import android.hardware.fingerprint.Fingerprint;
-
-import com.android.settings.TestConfig;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment
-        .DeleteFingerprintDialog;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.FragmentTestUtil;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowEventLogWriter.class
-        })
-public class DeleteFingerprintDialogTest {
-
-    @Mock
-    private FingerprintSettingsFragment mTarget;
-    @Mock
-    private Fingerprint mFingerprint;
-    private DeleteFingerprintDialog mFragment;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFragment = DeleteFingerprintDialog.newInstance(mFingerprint, mTarget);
-    }
-
-    @Test
-    public void launchDialog_clickPositive_shouldDeleteFingerprint() {
-        FragmentTestUtil.startFragment(mFragment);
-
-        mFragment.onClick(mFragment.getDialog(), Dialog.BUTTON_POSITIVE);
-
-        verify(mTarget).deleteFingerPrint(mFingerprint);
-    }
-
-    @Test
-    public void launchDialog_clickNegative_shouldDoNothing() {
-        FragmentTestUtil.startFragment(mFragment);
-
-        mFragment.onClick(mFragment.getDialog(), Dialog.BUTTON_NEGATIVE);
-
-        verify(mTarget, never()).deleteFingerPrint(mFingerprint);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
deleted file mode 100644
index ad52bf6026e4c8f35ee2fd2810d06a4b01699f8d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.fingerprint;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.verify;
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
-import android.os.CancellationSignal;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settings.password.IFingerprintManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowActivity.IntentForResult;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEventLogWriter.class,
-                ShadowUtils.class
-        })
-public class FingerprintEnrollFindSensorTest {
-
-    @Mock
-    private IFingerprintManager mFingerprintManager;
-
-    private FingerprintEnrollFindSensor mActivity;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowUtils.setFingerprintManager(mFingerprintManager);
-
-        RuntimeEnvironment.getAppResourceLoader().getResourceIndex();
-
-        mActivity = Robolectric.buildActivity(
-                FingerprintEnrollFindSensor.class,
-                new Intent()
-                        // Set the challenge token so the confirm screen will not be shown
-                        .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]))
-                .setup().get();
-    }
-
-    @After
-    public void tearDown() {
-        ShadowUtils.reset();
-    }
-
-    @Test
-    public void enrollFingerprint_shouldProceed() {
-        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
-
-        enrollmentCallback.onEnrollmentProgress(123);
-        enrollmentCallback.onEnrollmentError(FingerprintManager.FINGERPRINT_ERROR_CANCELED, "test");
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
-        IntentForResult startedActivity =
-                shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
-        assertThat(startedActivity.intent.getComponent())
-                .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
-    }
-
-    @Test
-    public void enrollFingerprintTwice_shouldStartOneEnrolling() {
-        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
-
-        enrollmentCallback.onEnrollmentProgress(123);
-        enrollmentCallback.onEnrollmentProgress(123);  // A second enroll should be a no-op
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
-        IntentForResult startedActivity =
-                shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
-        assertThat(startedActivity.intent.getComponent())
-                .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
-
-        // Should only start one next activity
-        assertThat(shadowActivity.getNextStartedActivityForResult()).named("Next activity 2")
-                .isNull();
-    }
-
-    // Use a non-default resource qualifier to load the test layout in
-    // robotests/res/layout-mcc999/fingerprint_enroll_find_sensor. This layout is a copy of the
-    // regular find sensor layout, with the animation removed.
-    @Config(qualifiers = "mcc999")
-    @Test
-    public void layoutWithoutAnimation_shouldNotCrash() {
-        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
-        enrollmentCallback.onEnrollmentProgress(123);
-        enrollmentCallback.onEnrollmentError(FingerprintManager.FINGERPRINT_ERROR_CANCELED, "test");
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
-        IntentForResult startedActivity =
-                shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
-        assertThat(startedActivity.intent.getComponent())
-                .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
-    }
-
-    @Test
-    public void clickSkip_shouldReturnResultSkip() {
-        Button skipButton = mActivity.findViewById(R.id.skip_button);
-        skipButton.performClick();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
-        assertThat(shadowActivity.getResultCode()).named("result code")
-                .isEqualTo(FingerprintEnrollBase.RESULT_SKIP);
-    }
-
-    private EnrollmentCallback verifyAndCaptureEnrollmentCallback() {
-        ArgumentCaptor<EnrollmentCallback> callbackCaptor =
-                ArgumentCaptor.forClass(EnrollmentCallback.class);
-        verify(mFingerprintManager).enroll(
-                any(byte[].class),
-                any(CancellationSignal.class),
-                anyInt(),
-                anyInt(),
-                callbackCaptor.capture());
-
-        return callbackCaptor.getValue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
deleted file mode 100644
index 7b7e440ef69bf80d629d837374f8c2c50ee47802..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.fingerprint;
-
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.net.Uri;
-import android.view.TextureView.SurfaceTextureListener;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FingerprintLocationAnimationVideoViewTest {
-
-    private Context mContext;
-    private FingerprintLocationAnimationVideoView mView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-        mView = spy(new FingerprintLocationAnimationVideoView(mContext, null));
-    }
-
-    @Test
-    public void onSurfaceTextureAvailable_nullMediaPlayer_shouldNotCrash() {
-        mView.onFinishInflate();
-        final SurfaceTextureListener listener = mView.getSurfaceTextureListener();
-        when(mView.createMediaPlayer(any(Context.class), any(Uri.class))).thenReturn(null);
-
-        listener.onSurfaceTextureAvailable(mock(SurfaceTexture.class), 48, 48);
-        // should not crash
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
deleted file mode 100644
index 29c6f10d666cb744ec1066a0c7d45aef929ca0c6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fingerprint;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FingerprintPreferenceTest {
-
-    @Mock
-    private FingerprintPreference.OnDeleteClickListener mOnDeleteClickListener;
-
-    private Context mContext;
-    private FingerprintPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mPreference = new FingerprintPreference(mContext, mOnDeleteClickListener);
-    }
-
-    @Test
-    public void shouldShowDeleteButton() {
-        assertThat(mPreference.getSecondTargetResId()).isEqualTo(R.layout.preference_widget_delete);
-    }
-
-    @Test
-    public void bindAndClickDeleteButton_shouldInvokeOnDeleteListener() {
-        final FrameLayout layout = new FrameLayout(mContext);
-        final View deleteButton = LayoutInflater.from(mContext)
-                .inflate(mPreference.getSecondTargetResId(), layout, true);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(layout);
-        mPreference.onBindViewHolder(holder);
-
-        layout.findViewById(R.id.delete_button).performClick();
-
-        verify(mOnDeleteClickListener).onDeleteClick(mPreference);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
deleted file mode 100644
index bf2dfaedfffc34eae862a675f0bea400eb5069a0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fingerprint;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.app.Activity;
-import android.app.KeyguardManager;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowKeyguardManager;
-import org.robolectric.util.ActivityController;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowEventLogWriter.class,
-                ShadowLockPatternUtils.class,
-                ShadowUserManager.class
-        })
-public class FingerprintSuggestionActivityTest {
-
-    @Mock
-    private UserInfo mUserInfo;
-
-    private ActivityController<FingerprintSuggestionActivity> mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        final Intent intent = new Intent();
-        mController = Robolectric.buildActivity(FingerprintSuggestionActivity.class, intent);
-
-        ShadowUserManager.getShadow().setUserInfo(0, mUserInfo);
-    }
-
-    @Test
-    public void testKeyguardSecure_shouldFinishWithFingerprintResultSkip() {
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-
-        mController.create().resume();
-
-        final Button cancelButton = mController.get().findViewById(R.id.fingerprint_cancel_button);
-        assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
-        assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE);
-        cancelButton.performClick();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
-                .isEqualTo(Activity.RESULT_CANCELED);
-    }
-
-    private ShadowKeyguardManager getShadowKeyguardManager() {
-        return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
deleted file mode 100644
index ce31328edb82bca9b60a3eb8350be6dfce72a9de..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fingerprint;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.app.AlertDialog;
-import android.content.Intent;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settings.password.IFingerprintManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEventLogWriter.class,
-                ShadowUtils.class
-        })
-public class SetupFingerprintEnrollFindSensorTest {
-
-    @Mock
-    private IFingerprintManager mFingerprintManager;
-
-    private SetupFingerprintEnrollFindSensor mActivity;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowUtils.setFingerprintManager(mFingerprintManager);
-        RuntimeEnvironment.getAppResourceLoader().getResourceIndex();
-
-    }
-
-    private void createActivity(Intent intent) {
-        mActivity = Robolectric.buildActivity(
-                SetupFingerprintEnrollFindSensor.class, intent)
-                .setup().get();
-    }
-
-    private Intent createIntent() {
-        return new Intent()
-                // Set the challenge token so the confirm screen will not be shown
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowUtils.reset();
-    }
-
-    @Test
-    public void fingerprintEnroll_showsAlert_whenClickingSkip() {
-        createActivity(createIntent());
-        Button skipButton = mActivity.findViewById(R.id.skip_button);
-        skipButton.performClick();
-        AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
-        assertNotNull(alertDialog);
-        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
-        int titleRes = R.string.setup_fingerprint_enroll_skip_title;
-        assertEquals(application.getString(titleRes), shadowAlertDialog.getTitle());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
deleted file mode 100644
index f5859acf52d957d773237d9d8587ba5e150a3737..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fingerprint;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.app.KeyguardManager;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest
-        .ShadowStorageManagerWrapper;
-import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
-import com.android.settings.password.SetupSkipDialog;
-import com.android.settings.password.StorageManagerWrapper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowFingerprintManager;
-import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowActivity.IntentForResult;
-import org.robolectric.shadows.ShadowKeyguardManager;
-import org.robolectric.util.ActivityController;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowEventLogWriter.class,
-                ShadowFingerprintManager.class,
-                ShadowLockPatternUtils.class,
-                ShadowStorageManagerWrapper.class,
-                ShadowUserManager.class
-        })
-public class SetupFingerprintEnrollIntroductionTest {
-
-    @Mock
-    private UserInfo mUserInfo;
-
-    private ActivityController<SetupFingerprintEnrollIntroduction> mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        RuntimeEnvironment.getRobolectricPackageManager()
-                .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
-        ShadowFingerprintManager.addToServiceMap();
-
-        final Intent intent = new Intent();
-        mController = Robolectric.buildActivity(SetupFingerprintEnrollIntroduction.class, intent);
-
-        ShadowUserManager.getShadow().setUserInfo(0, mUserInfo);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowStorageManagerWrapper.reset();
-        ShadowFingerprintManager.reset();
-    }
-
-    @Test
-    public void testKeyguardNotSecure_shouldFinishWithSetupSkipDialogResultSkip() {
-        getShadowKeyguardManager().setIsKeyguardSecure(false);
-
-        mController.create().resume();
-
-        final Button skipButton = mController.get().findViewById(R.id.fingerprint_cancel_button);
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
-        skipButton.performClick();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
-                .isEqualTo(SetupSkipDialog.RESULT_SKIP);
-    }
-
-    @Test
-    public void testKeyguardSecure_shouldFinishWithFingerprintResultSkip() {
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-
-        mController.create().resume();
-
-        final Button skipButton = mController.get().findViewById(R.id.fingerprint_cancel_button);
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
-        skipButton.performClick();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
-                .isEqualTo(FingerprintEnrollBase.RESULT_SKIP);
-    }
-
-    @Test
-    public void testBackKeyPress_shouldSetIntentDataIfLockScreenAdded() {
-        getShadowKeyguardManager().setIsKeyguardSecure(false);
-
-        mController.create().resume();
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-        SetupFingerprintEnrollIntroduction activity = mController.get();
-        activity.onBackPressed();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        assertThat(shadowActivity.getResultIntent()).isNotNull();
-        assertThat(shadowActivity.getResultIntent().hasExtra(
-                SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
-    }
-
-    @Test
-    public void testBackKeyPress_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-
-        mController.create().resume();
-        SetupFingerprintEnrollIntroduction activity = mController.get();
-        activity.onBackPressed();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        assertThat(shadowActivity.getResultIntent()).isNull();
-    }
-
-    @Test
-    public void testCancelClicked_shouldSetIntentDataIfLockScreenAdded() {
-        getShadowKeyguardManager().setIsKeyguardSecure(false);
-
-        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
-        final Button skipButton = activity.findViewById(R.id.fingerprint_cancel_button);
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-        skipButton.performClick();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        assertThat(shadowActivity.getResultIntent()).isNotNull();
-        assertThat(shadowActivity.getResultIntent().hasExtra(
-                SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
-    }
-
-    @Test
-    public void testCancelClicked_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-
-        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
-        final Button skipButton = activity.findViewById(R.id.fingerprint_cancel_button);
-        skipButton.performClick();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        assertThat(shadowActivity.getResultIntent()).isNull();
-    }
-
-    @Test
-    public void testOnResultFromFindSensor_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
-        activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
-                FingerprintEnrollBase.RESULT_FINISHED, null);
-        assertThat(Shadows.shadowOf(activity).getResultIntent()).isNull();
-    }
-
-    @Test
-    public void testOnResultFromFindSensor_shouldSetIntentDataIfLockScreenAdded() {
-        getShadowKeyguardManager().setIsKeyguardSecure(false);
-        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
-        getShadowKeyguardManager().setIsKeyguardSecure(true);
-        activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
-                FingerprintEnrollBase.RESULT_FINISHED, null);
-        assertThat(Shadows.shadowOf(activity).getResultIntent()).isNotNull();
-    }
-
-    @Test
-    public void testOnResultFromFindSensor_shouldNotSetIntentDataIfLockScreenNotAdded() {
-        getShadowKeyguardManager().setIsKeyguardSecure(false);
-        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
-        activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
-                FingerprintEnrollBase.RESULT_FINISHED, null);
-        assertThat(Shadows.shadowOf(activity).getResultIntent()).isNull();
-    }
-
-    @Test
-    public void testLockPattern() {
-        ShadowStorageManagerWrapper.sIsFileEncrypted = false;
-
-        mController.create().postCreate(null).resume();
-
-        SetupFingerprintEnrollIntroduction activity = mController.get();
-
-        final Button nextButton = activity.findViewById(R.id.fingerprint_next_button);
-        nextButton.performClick();
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).isNotNull();
-        assertThat(startedActivity.intent.hasExtra(
-                SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isFalse();
-    }
-
-
-    private ShadowKeyguardManager getShadowKeyguardManager() {
-        return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
-    }
-
-    @Implements(StorageManagerWrapper.class)
-    public static class ShadowStorageManagerWrapper {
-
-        private static boolean sIsFileEncrypted = true;
-
-        public static void reset() {
-            sIsFileEncrypted = true;
-        }
-
-        @Implementation
-        public static boolean isFileEncryptedNativeOrEmulated() {
-            return sIsFileEncrypted;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
deleted file mode 100644
index 54d043c419d84145a31c050b405cb5275c2e204c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.Activity;
-import android.app.AppOpsManager;
-import android.app.Fragment;
-import android.app.LoaderManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.os.BatteryStats;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-import android.support.v7.widget.RecyclerView;
-
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.SettingsActivity;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.R;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.stubbing.Answer;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowEntityHeaderController.class)
-public class AdvancedPowerUsageDetailTest {
-    private static final String APP_LABEL = "app label";
-    private static final String SUMMARY = "summary";
-    private static final String[] PACKAGE_NAME = {"com.android.app"};
-    private static final String USAGE_PERCENT = "16%";
-    private static final int ICON_ID = 123;
-    private static final int UID = 1;
-    private static final int POWER_MAH = 150;
-    private static final long BACKGROUND_TIME_MS = 100;
-    private static final long FOREGROUND_ACTIVITY_TIME_MS = 123;
-    private static final long FOREGROUND_SERVICE_TIME_MS = 444;
-    private static final long FOREGROUND_TIME_MS =
-            FOREGROUND_ACTIVITY_TIME_MS + FOREGROUND_SERVICE_TIME_MS;
-    private static final long PROCSTATE_TOP_TIME_MS = FOREGROUND_ACTIVITY_TIME_MS;
-    private static final long BACKGROUND_TIME_US = BACKGROUND_TIME_MS * 1000;
-    private static final long FOREGROUND_ACTIVITY_TIME_US = FOREGROUND_ACTIVITY_TIME_MS * 1000;
-    private static final long FOREGROUND_SERVICE_TIME_US = FOREGROUND_SERVICE_TIME_MS * 1000;
-    private static final long FOREGROUND_TIME_US = FOREGROUND_TIME_MS * 1000;
-    private static final long PROCSTATE_TOP_TIME_US = PROCSTATE_TOP_TIME_MS * 1000;
-    private static final long PHONE_FOREGROUND_TIME_MS = 250 * 1000;
-    private static final long PHONE_BACKGROUND_TIME_MS = 0;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private EntityHeaderController mEntityHeaderController;
-    @Mock
-    private LayoutPreference mHeaderPreference;
-    @Mock
-    private ApplicationsState mState;
-    @Mock
-    private ApplicationsState.AppEntry mAppEntry;
-    @Mock
-    private Bundle mBundle;
-    @Mock
-    private BatteryEntry mBatteryEntry;
-    @Mock
-    private BatterySipper mBatterySipper;
-    @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private BatteryStats.Uid mUid;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private AppOpsManager mAppOpsManager;
-    @Mock
-    private LoaderManager mLoaderManager;
-    @Mock
-    private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
-    @Mock
-    private BatteryStats.Timer mForegroundActivityTimer;
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    private Context mContext;
-    private Preference mForegroundPreference;
-    private Preference mBackgroundPreference;
-    private Preference mPowerUsagePreference;
-    private AdvancedPowerUsageDetail mFragment;
-    private FakeFeatureFactory mFeatureFactory;
-    private SettingsActivity mTestActivity;
-    private List<Anomaly> mAnomalies;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        mFragment = spy(new AdvancedPowerUsageDetail());
-        doReturn(mContext).when(mFragment).getContext();
-        doReturn(mActivity).when(mFragment).getActivity();
-        doReturn(SUMMARY).when(mFragment).getString(anyInt());
-        doReturn(APP_LABEL).when(mBundle).getString(nullable(String.class));
-        doReturn(mBundle).when(mFragment).getArguments();
-        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
-
-        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
-        doReturn(mEntityHeaderController).when(mEntityHeaderController)
-                .setRecyclerView(nullable(RecyclerView.class), nullable(Lifecycle.class));
-        doReturn(mEntityHeaderController).when(mEntityHeaderController)
-                .setButtonActions(anyInt(), anyInt());
-        doReturn(mEntityHeaderController).when(mEntityHeaderController)
-                .setIcon(nullable(Drawable.class));
-        doReturn(mEntityHeaderController).when(mEntityHeaderController).setIcon(nullable(
-                ApplicationsState.AppEntry.class));
-        doReturn(mEntityHeaderController).when(mEntityHeaderController)
-                .setLabel(nullable(String.class));
-        doReturn(mEntityHeaderController).when(mEntityHeaderController)
-                .setLabel(nullable(String.class));
-        doReturn(mEntityHeaderController).when(mEntityHeaderController)
-                .setLabel(nullable(ApplicationsState.AppEntry.class));
-        doReturn(mEntityHeaderController).when(mEntityHeaderController)
-                .setSummary(nullable(String.class));
-
-        doReturn(UID).when(mBatterySipper).getUid();
-        doReturn(APP_LABEL).when(mBatteryEntry).getLabel();
-        doReturn(BACKGROUND_TIME_US).when(mUid).getProcessStateTime(
-                eq(BatteryStats.Uid.PROCESS_STATE_BACKGROUND), anyLong(), anyInt());
-        doReturn(PROCSTATE_TOP_TIME_US).when(mUid).getProcessStateTime(
-                eq(BatteryStats.Uid.PROCESS_STATE_TOP), anyLong(), anyInt());
-        doReturn(mForegroundActivityTimer).when(mUid).getForegroundActivityTimer();
-        doReturn(FOREGROUND_ACTIVITY_TIME_US).when(mForegroundActivityTimer)
-                .getTotalTimeLocked(anyLong(), anyInt());
-        ReflectionHelpers.setField(mBatteryEntry, "sipper", mBatterySipper);
-        mBatteryEntry.iconId = ICON_ID;
-        mBatterySipper.uidObj = mUid;
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        mFragment.mHeaderPreference = mHeaderPreference;
-        mFragment.mState = mState;
-        mFragment.mBatteryUtils = new BatteryUtils(RuntimeEnvironment.application);
-        mAppEntry.info = mock(ApplicationInfo.class);
-
-        mTestActivity = spy(new SettingsActivity());
-        doReturn(mPackageManager).when(mTestActivity).getPackageManager();
-        doReturn(mAppOpsManager).when(mTestActivity).getSystemService(Context.APP_OPS_SERVICE);
-
-        mBatteryUtils = spy(BatteryUtils.getInstance(mTestActivity));
-        doReturn(FOREGROUND_SERVICE_TIME_US).when(mBatteryUtils).getForegroundServiceTotalTimeUs(
-                any(BatteryStats.Uid.class), anyLong());
-
-        final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
-
-        Answer<Void> callable = invocation -> {
-            mBundle = captor.getValue();
-            return null;
-        };
-        doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(
-                nullable(Fragment.class), nullable(String.class), captor.capture(), anyInt(),
-                nullable(CharSequence.class), nullable(UserHandle.class));
-
-        mForegroundPreference = new Preference(mContext);
-        mBackgroundPreference = new Preference(mContext);
-        mPowerUsagePreference = new Preference(mContext);
-        mFragment.mForegroundPreference = mForegroundPreference;
-        mFragment.mBackgroundPreference = mBackgroundPreference;
-        mFragment.mPowerUsagePreference = mPowerUsagePreference;
-        mFragment.mAnomalySummaryPreferenceController = mAnomalySummaryPreferenceController;
-
-        mAnomalies = new ArrayList<>();
-        mAnomalies.add(new Anomaly.Builder().setUid(UID).setType(
-                Anomaly.AnomalyType.WAKE_LOCK).build());
-    }
-
-    @After
-    public void reset() {
-        ShadowEntityHeaderController.reset();
-    }
-
-    @Test
-    public void testInitHeader_NoAppEntry_BuildByBundle() {
-        mFragment.mAppEntry = null;
-        mFragment.initHeader();
-
-        verify(mEntityHeaderController).setIcon(nullable(Drawable.class));
-        verify(mEntityHeaderController).setLabel(APP_LABEL);
-    }
-
-    @Test
-    public void testInitHeader_HasAppEntry_BuildByAppEntry() {
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                new InstantAppDataProvider() {
-                    @Override
-                    public boolean isInstantApp(ApplicationInfo info) {
-                        return false;
-                    }
-                });
-        mFragment.mAppEntry = mAppEntry;
-        mFragment.initHeader();
-
-        verify(mEntityHeaderController).setIcon(mAppEntry);
-        verify(mEntityHeaderController).setLabel(mAppEntry);
-        verify(mEntityHeaderController).setIsInstantApp(false);
-    }
-
-    @Test
-    public void testInitHeader_HasAppEntry_InstantApp() {
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                new InstantAppDataProvider() {
-                    @Override
-                    public boolean isInstantApp(ApplicationInfo info) {
-                        return true;
-                    }
-                });
-        mFragment.mAppEntry = mAppEntry;
-        mFragment.initHeader();
-
-        verify(mEntityHeaderController).setIcon(mAppEntry);
-        verify(mEntityHeaderController).setLabel(mAppEntry);
-        verify(mEntityHeaderController).setIsInstantApp(true);
-        verify(mEntityHeaderController).setSummary((CharSequence) null);
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_hasBasicData() {
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, mAnomalies);
-
-        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
-        assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)).isEqualTo(
-                BACKGROUND_TIME_MS);
-        assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)).isEqualTo(
-                FOREGROUND_TIME_MS);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
-                USAGE_PERCENT);
-        assertThat(mBundle.getParcelableArrayList(
-                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalies);
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_typeNotApp_hasBasicData() {
-        mBatterySipper.drainType = BatterySipper.DrainType.PHONE;
-        mBatterySipper.usageTimeMs = PHONE_FOREGROUND_TIME_MS;
-
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
-
-        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
-        assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)).isEqualTo(
-                PHONE_FOREGROUND_TIME_MS);
-        assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)).isEqualTo(
-                PHONE_BACKGROUND_TIME_MS);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
-                USAGE_PERCENT);
-        assertThat(mBundle.getParcelableArrayList(
-                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isNull();
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_NormalApp() {
-        mBatterySipper.mPackages = PACKAGE_NAME;
-        mBatteryEntry.defaultPackageName = PACKAGE_NAME[0];
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, mAnomalies);
-
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
-                PACKAGE_NAME[0]);
-        assertThat(mBundle.getParcelableArrayList(
-                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalies);
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_SystemApp() {
-        mBatterySipper.mPackages = null;
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
-
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_LABEL)).isEqualTo(APP_LABEL);
-        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isNull();
-        assertThat(mBundle.getParcelableArrayList(
-                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isNull();
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_WorkApp() {
-        final int appUid = 1010019;
-        mBatterySipper.mPackages = PACKAGE_NAME;
-        doReturn(appUid).when(mBatterySipper).getUid();
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
-
-        verify(mTestActivity).startPreferencePanelAsUser(
-                nullable(Fragment.class), nullable(String.class), nullable(Bundle.class), anyInt(),
-                nullable(CharSequence.class), eq(new UserHandle(10)));
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_noBatteryUsage_hasBasicData() {
-        final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
-        Answer<Void> callable = invocation -> {
-            mBundle = captor.getValue();
-            return null;
-        };
-        doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(nullable(Fragment.class),
-                nullable(String.class), captor.capture(), anyInt(), nullable(CharSequence.class),
-                nullable(UserHandle.class));
-
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
-
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
-                PACKAGE_NAME[0]);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
-                "0%");
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName() throws
-            PackageManager.NameNotFoundException{
-        doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */);
-
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
-
-        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
-    }
-
-    @Test
-    public void testStartBatteryDetailPage_defaultPackageNull_chooseFromBatterySipper() {
-        mBatteryEntry.defaultPackageName = null;
-        mBatteryEntry.sipper.mPackages = PACKAGE_NAME;
-
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
-
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
-                PACKAGE_NAME[0]);
-    }
-
-    @Test
-    public void testInitPreference_hasCorrectSummary() {
-        Bundle bundle = new Bundle(4);
-        bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, BACKGROUND_TIME_MS);
-        bundle.putLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME, FOREGROUND_TIME_MS);
-        bundle.putString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT, USAGE_PERCENT);
-        bundle.putInt(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_AMOUNT, POWER_MAH);
-        doReturn(bundle).when(mFragment).getArguments();
-
-        doReturn(mContext.getText(R.string.battery_used_for)).when(mFragment).getText(
-                R.string.battery_used_for);
-        doReturn(mContext.getText(R.string.battery_active_for)).when(mFragment).getText(
-                R.string.battery_active_for);
-        doReturn(mContext.getString(R.string.battery_detail_power_percentage, USAGE_PERCENT,
-                POWER_MAH)).when(mFragment)
-                .getString(R.string.battery_detail_power_percentage, USAGE_PERCENT, POWER_MAH);
-
-        mFragment.initPreference();
-
-        assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0m");
-        assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0m");
-        assertThat(mPowerUsagePreference.getSummary()).isEqualTo("16% of total app usage (150mAh)");
-    }
-
-    @Test
-    public void testInitAnomalyInfo_anomalyNull_startAnomalyLoader() {
-        doReturn(null).when(mBundle).getParcelableArrayList(
-                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
-
-        mFragment.initAnomalyInfo();
-
-        verify(mLoaderManager).initLoader(eq(0), eq(Bundle.EMPTY), any());
-    }
-
-    @Test
-    public void testInitAnomalyInfo_anomalyExisted_updateAnomaly() {
-        doReturn(mAnomalies).when(mBundle).getParcelableArrayList(
-                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
-
-        mFragment.initAnomalyInfo();
-
-        verify(mAnomalySummaryPreferenceController).updateAnomalySummaryPreference(mAnomalies);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
deleted file mode 100644
index 92df48e262a58d1dcce086713542509686a176f2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.ActivityManager;
-import android.app.Application;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.UserManager;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppButtonsPreferenceControllerTest {
-    private static final String PACKAGE_NAME = "com.android.settings";
-    private static final String RESOURCE_STRING = "string";
-    private static final boolean ALL_USERS = false;
-    private static final boolean DISABLE_AFTER_INSTALL = true;
-    private static final int REQUEST_UNINSTALL = 0;
-    private static final int REQUEST_REMOVE_DEVICE_ADMIN = 1;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SettingsActivity mSettingsActivity;
-    @Mock
-    private TestFragment mFragment;
-    @Mock
-    private Lifecycle mLifecycle;
-    @Mock
-    private ApplicationsState mState;
-    @Mock
-    private ApplicationsState.AppEntry mAppEntry;
-    @Mock
-    private ApplicationInfo mAppInfo;
-    @Mock
-    private PackageManager mPackageManger;
-    @Mock
-    private DevicePolicyManagerWrapper mDpm;
-    @Mock
-    private ActivityManager mAm;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Application mApplication;
-    @Mock
-    private PackageInfo mPackageInfo;
-    @Mock
-    private Button mUninstallButton;
-    @Mock
-    private Button mForceStopButton;
-
-    private Intent mUninstallIntent;
-    private AppButtonsPreferenceController mController;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        FakeFeatureFactory.setupForTest(mSettingsActivity);
-        doReturn(mUserManager).when(mSettingsActivity).getSystemService(Context.USER_SERVICE);
-        doReturn(mPackageManger).when(mSettingsActivity).getPackageManager();
-        doReturn(mAm).when(mSettingsActivity).getSystemService(Context.ACTIVITY_SERVICE);
-        doReturn(mAppEntry).when(mState).getEntry(anyString(), anyInt());
-        doReturn(mApplication).when(mSettingsActivity).getApplication();
-        when(mSettingsActivity.getResources().getString(anyInt())).thenReturn(RESOURCE_STRING);
-
-        mController = spy(new AppButtonsPreferenceController(mSettingsActivity, mFragment,
-                mLifecycle, PACKAGE_NAME, mState, mDpm, mUserManager, mPackageManger,
-                REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN));
-        doReturn(false).when(mController).isFallbackPackage(anyString());
-
-        mAppEntry.info = mAppInfo;
-        mAppInfo.packageName = PACKAGE_NAME;
-        mAppInfo.flags = 0;
-        mPackageInfo.packageName = PACKAGE_NAME;
-        mPackageInfo.applicationInfo = mAppInfo;
-
-        mController.mUninstallButton = mUninstallButton;
-        mController.mForceStopButton = mForceStopButton;
-        mController.mPackageInfo = mPackageInfo;
-
-        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        Answer<Void> callable = new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Exception {
-                mUninstallIntent = captor.getValue();
-                return null;
-            }
-        };
-        doAnswer(callable).when(mFragment).startActivityForResult(captor.capture(), anyInt());
-    }
-
-    @Test
-    public void testRetrieveAppEntry_hasAppEntry_notNull()
-            throws PackageManager.NameNotFoundException {
-        doReturn(mPackageInfo).when(mPackageManger).getPackageInfo(anyString(), anyInt());
-
-        mController.retrieveAppEntry();
-
-        assertThat(mController.mAppEntry).isNotNull();
-        assertThat(mController.mPackageInfo).isNotNull();
-    }
-
-
-    @Test
-    public void testRetrieveAppEntry_noAppEntry_null() throws PackageManager.NameNotFoundException {
-        doReturn(null).when(mState).getEntry(eq(PACKAGE_NAME), anyInt());
-        doReturn(mPackageInfo).when(mPackageManger).getPackageInfo(anyString(), anyInt());
-
-        mController.retrieveAppEntry();
-
-        assertThat(mController.mAppEntry).isNull();
-        assertThat(mController.mPackageInfo).isNull();
-    }
-
-    @Test
-    public void testRetrieveAppEntry_throwException_null() throws
-            PackageManager.NameNotFoundException {
-        doReturn(mAppEntry).when(mState).getEntry(anyString(), anyInt());
-        doThrow(new PackageManager.NameNotFoundException()).when(mPackageManger).getPackageInfo(
-                anyString(), anyInt());
-
-        mController.retrieveAppEntry();
-
-        assertThat(mController.mAppEntry).isNotNull();
-        assertThat(mController.mPackageInfo).isNull();
-    }
-
-    @Test
-    public void testUpdateUninstallButton_isSystemApp_handleAsDisableableButton() {
-        doReturn(false).when(mController).handleDisableable(any());
-        mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
-
-        mController.updateUninstallButton();
-
-        verify(mController).handleDisableable(any());
-        verify(mUninstallButton).setEnabled(false);
-    }
-
-    @Test
-    public void testIsAvailable_nonInstantApp() throws Exception {
-        mController.mAppEntry = mAppEntry;
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                new InstantAppDataProvider() {
-                    @Override
-                    public boolean isInstantApp(ApplicationInfo info) {
-                        return false;
-                    }
-                });
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testIsAvailable_instantApp() throws Exception {
-        mController.mAppEntry = mAppEntry;
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                new InstantAppDataProvider() {
-                    @Override
-                    public boolean isInstantApp(ApplicationInfo info) {
-                        return true;
-                    }
-                });
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testUpdateUninstallButton_isDeviceAdminApp_setButtonDisable() {
-        doReturn(true).when(mController).handleDisableable(any());
-        mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
-        doReturn(true).when(mDpm).packageHasActiveAdmins(anyString());
-
-        mController.updateUninstallButton();
-
-        verify(mController).handleDisableable(any());
-        verify(mUninstallButton).setEnabled(false);
-    }
-
-    @Test
-    public void testUpdateUninstallButton_isProfileOrDeviceOwner_setButtonDisable() {
-        doReturn(true).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString());
-
-        mController.updateUninstallButton();
-
-        verify(mUninstallButton).setEnabled(false);
-    }
-
-    @Test
-    public void testUpdateUninstallButton_isDeviceProvisioningApp_setButtonDisable() {
-        doReturn(true).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString());
-        when(mSettingsActivity.getResources().getString(anyInt())).thenReturn(PACKAGE_NAME);
-
-        mController.updateUninstallButton();
-
-        verify(mUninstallButton).setEnabled(false);
-    }
-
-    @Test
-    public void testUpdateUninstallButton_isUninstallInQueue_setButtonDisable() {
-        doReturn(true).when(mDpm).isUninstallInQueue(any());
-
-        mController.updateUninstallButton();
-
-        verify(mUninstallButton).setEnabled(false);
-    }
-
-    @Test
-    public void testUpdateUninstallButton_isHomeAppAndBundled_setButtonDisable() {
-        mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
-        mController.mHomePackages.add(PACKAGE_NAME);
-
-        mController.updateUninstallButton();
-
-        verify(mUninstallButton).setEnabled(false);
-    }
-
-    @Test
-    public void testUpdateForceStopButton_HasActiveAdmins_setButtonDisable() {
-        doReturn(true).when(mDpm).packageHasActiveAdmins(anyString());
-
-        mController.updateForceStopButton();
-
-        verify(mController).updateForceStopButtonInner(false);
-    }
-
-    @Test
-    public void testUpdateForceStopButton_AppNotStopped_setButtonEnable() {
-        mController.updateForceStopButton();
-
-        verify(mController).updateForceStopButtonInner(true);
-    }
-
-    @Test
-    public void testUninstallPkg_intentSent() {
-        mController.uninstallPkg(PACKAGE_NAME, ALL_USERS, DISABLE_AFTER_INSTALL);
-
-        verify(mFragment).startActivityForResult(any(), eq(REQUEST_UNINSTALL));
-        assertThat(
-                mUninstallIntent.getBooleanExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, true))
-                .isEqualTo(ALL_USERS);
-        assertThat(mUninstallIntent.getAction()).isEqualTo(Intent.ACTION_UNINSTALL_PACKAGE);
-        assertThat(mController.mDisableAfterUninstall).isEqualTo(DISABLE_AFTER_INSTALL);
-    }
-
-    @Test
-    public void testForceStopPackage_methodInvokedAndUpdated() {
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        doReturn(appEntry).when(mState).getEntry(anyString(), anyInt());
-        doNothing().when(mController).updateForceStopButton();
-
-        mController.forceStopPackage(PACKAGE_NAME);
-
-        verify(mAm).forceStopPackage(PACKAGE_NAME);
-        assertThat(mController.mAppEntry).isSameAs(appEntry);
-        verify(mController).updateForceStopButton();
-    }
-
-    @Test
-    public void testHandleDisableable_isHomeApp_notControllable() {
-        mController.mHomePackages.add(PACKAGE_NAME);
-
-        final boolean controllable = mController.handleDisableable(mUninstallButton);
-
-        verify(mUninstallButton).setText(R.string.disable_text);
-        assertThat(controllable).isFalse();
-
-    }
-
-    @Test
-    public void testHandleDisableable_isAppEnabled_controllable() {
-        mAppEntry.info.enabled = true;
-        mAppEntry.info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
-        doReturn(false).when(mController).isSystemPackage(any(), any(), any());
-
-        final boolean controllable = mController.handleDisableable(mUninstallButton);
-
-        verify(mUninstallButton).setText(R.string.disable_text);
-        assertThat(controllable).isTrue();
-
-    }
-
-    @Test
-    public void testHandleDisableable_isAppDisabled_controllable() {
-        mAppEntry.info.enabled = false;
-        mAppEntry.info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
-        doReturn(false).when(mController).isSystemPackage(any(), any(), any());
-
-        final boolean controllable = mController.handleDisableable(mUninstallButton);
-
-        verify(mUninstallButton).setText(R.string.enable_text);
-        assertThat(controllable).isTrue();
-    }
-
-    @Test
-    public void testRefreshUi_packageNull_shouldNotCrash() {
-        mController.mPackageName = null;
-
-        // Should not crash in this method
-        assertThat(mController.refreshUi()).isFalse();
-    }
-
-    /**
-     * The test fragment which implements
-     * {@link ButtonActionDialogFragment.AppButtonsDialogListener}
-     */
-    private static class TestFragment extends Fragment implements
-            ButtonActionDialogFragment.AppButtonsDialogListener {
-
-        @Override
-        public void handleDialogClick(int type) {
-            // Do nothing
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
deleted file mode 100644
index 91f4a2b606e9b845f58706615ad202b7bba7ceb5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import android.app.AppOpsManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.UserManager;
-import android.support.v14.preference.SwitchPreference;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BackgroundActivityPreferenceControllerTest {
-    private static final int UID_NORMAL = 1234;
-    private static final int UID_SPECIAL = 2345;
-    private static final String HIGH_SDK_PACKAGE = "com.android.package.high";
-    private static final String LOW_SDK_PACKAGE = "com.android.package.low";
-    private static final String[] PACKAGES_NORMAL = {LOW_SDK_PACKAGE};
-    private static final String[] PACKAGES_SPECIAL = {HIGH_SDK_PACKAGE, LOW_SDK_PACKAGE};
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private AppOpsManager mAppOpsManager;
-    @Mock
-    private ApplicationInfo mHighApplicationInfo;
-    @Mock
-    private ApplicationInfo mLowApplicationInfo;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private DevicePolicyManager mDevicePolicyManager;
-    @Mock
-    private DevicePolicyManagerWrapper mDevicePolicyManagerWrapper;
-    private BackgroundActivityPreferenceController mController;
-    private SwitchPreference mPreference;
-    private Context mShadowContext;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        mShadowContext = RuntimeEnvironment.application;
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(
-                mDevicePolicyManager);
-        when(mPackageManager.getPackagesForUid(UID_NORMAL)).thenReturn(PACKAGES_NORMAL);
-        when(mPackageManager.getPackagesForUid(UID_SPECIAL)).thenReturn(PACKAGES_SPECIAL);
-
-        when(mPackageManager.getApplicationInfo(HIGH_SDK_PACKAGE, PackageManager.GET_META_DATA))
-                .thenReturn(mHighApplicationInfo);
-        when(mPackageManager.getApplicationInfo(LOW_SDK_PACKAGE, PackageManager.GET_META_DATA))
-                .thenReturn(mLowApplicationInfo);
-        mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
-        mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
-
-        mPreference = new SwitchPreference(mShadowContext);
-        mController = spy(new BackgroundActivityPreferenceController(mContext, UID_NORMAL));
-        mController.isAvailable();
-        mController.mDpm = mDevicePolicyManagerWrapper;
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOnCheck_MethodInvoked() {
-        mController.onPreferenceChange(mPreference, true);
-
-        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL,
-                mController.getTargetPackage(), AppOpsManager.MODE_ALLOWED);
-        verify(mController).updateSummary(mPreference);
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOffCheck_MethodInvoked() {
-        mController.onPreferenceChange(mPreference, false);
-
-        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL,
-                mController.getTargetPackage(), AppOpsManager.MODE_IGNORED);
-        verify(mController).updateSummary(mPreference);
-    }
-
-    @Test
-    public void testUpdateState_CheckOn_SetCheckedTrue() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_DEFAULT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-        verify(mController).updateSummary(mPreference);
-    }
-
-    @Test
-    public void testUpdateState_CheckOff_SetCheckedFalse() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_IGNORED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-        verify(mController).updateSummary(mPreference);
-    }
-
-    @Test
-    public void testUpdateSummary_modeError_showSummaryDisabled() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_ERRORED);
-        final CharSequence expectedSummary = mShadowContext.getText(
-                R.string.background_activity_summary_disabled);
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary()).isEqualTo(expectedSummary);
-    }
-
-    @Test
-    public void testUpdateSummary_modeDefault_showSummaryOn() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_DEFAULT);
-        final CharSequence expectedSummary = mShadowContext.getText(
-                R.string.background_activity_summary_on);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary()).isEqualTo(expectedSummary);
-    }
-
-    @Test
-    public void testUpdateSummary_modeIgnored_showSummaryOff() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_IGNORED);
-        final CharSequence expectedSummary = mShadowContext.getText(
-                R.string.background_activity_summary_off);
-
-        mController.updateSummary(mPreference);
-
-        assertThat(mPreference.getSummary()).isEqualTo(expectedSummary);
-    }
-
-    @Test
-    public void testIsPackageAvailable_SdkLowerThanO_ReturnTrue() {
-        assertThat(mController.isLegacyApp(LOW_SDK_PACKAGE)).isTrue();
-    }
-
-    @Test
-    public void testIsPackageAvailable_SdkLargerOrEqualThanO_ReturnFalse() {
-        assertThat(mController.isLegacyApp(HIGH_SDK_PACKAGE)).isFalse();
-    }
-
-    @Test
-    public void testMultiplePackages_ReturnStatusForTargetPackage() {
-        mController = new BackgroundActivityPreferenceController(mContext, UID_SPECIAL);
-        mController.mDpm = mDevicePolicyManagerWrapper;
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_ALLOWED);
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, HIGH_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_IGNORED);
-
-        final boolean available = mController.isAvailable();
-        mController.updateState(mPreference);
-
-        assertThat(available).isTrue();
-        // Should get status from LOW_SDK_PACKAGE
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
deleted file mode 100644
index a163a43989b73158525f7506e737aed0ac906262..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.Utils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryBroadcastReceiverTest {
-    private static final String BATTERY_INIT_LEVEL = "100%";
-    private static final String BATTERY_INIT_STATUS = "Not charging";
-    private static final int BATTERY_INTENT_LEVEL = 80;
-    private static final int BATTERY_INTENT_SCALE = 100;
-
-    @Mock
-    private BatteryBroadcastReceiver.OnBatteryChangedListener mBatteryListener;
-    private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
-    private Context mContext;
-    private Intent mChargingIntent;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-
-        mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
-        mBatteryBroadcastReceiver.mBatteryLevel = BATTERY_INIT_LEVEL;
-        mBatteryBroadcastReceiver.mBatteryStatus = BATTERY_INIT_STATUS;
-        mBatteryBroadcastReceiver.setBatteryChangedListener(mBatteryListener);
-
-        mChargingIntent = new Intent(Intent.ACTION_BATTERY_CHANGED);
-        mChargingIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_INTENT_LEVEL);
-        mChargingIntent.putExtra(BatteryManager.EXTRA_SCALE, BATTERY_INTENT_SCALE);
-        mChargingIntent.putExtra(BatteryManager.EXTRA_STATUS,
-                BatteryManager.BATTERY_STATUS_CHARGING);
-    }
-
-    @Test
-    public void testOnReceive_batteryDataChanged_dataUpdated() {
-        mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
-
-        assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(
-                Utils.getBatteryPercentage(mChargingIntent));
-        assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(
-                Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
-        verify(mBatteryListener).onBatteryChanged();
-    }
-
-    @Test
-    public void testOnReceive_batteryDataNotChanged_listenerNotInvoked() {
-        final String batteryLevel = Utils.getBatteryPercentage(mChargingIntent);
-        final String batteryStatus = Utils.getBatteryStatus(mContext.getResources(),
-                mChargingIntent);
-        mBatteryBroadcastReceiver.mBatteryLevel = batteryLevel;
-        mBatteryBroadcastReceiver.mBatteryStatus = batteryStatus;
-
-        mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
-
-        assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(batteryLevel);
-        assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(batteryStatus);
-        verify(mBatteryListener, never()).onBatteryChanged();
-    }
-
-    @Test
-    public void testRegister_updateBatteryStatus() {
-        doReturn(mChargingIntent).when(mContext).registerReceiver(any(), any());
-
-        mBatteryBroadcastReceiver.register();
-        mBatteryBroadcastReceiver.register();
-
-        assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(
-                Utils.getBatteryPercentage(mChargingIntent));
-        assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(
-                Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
-        // 2 times because register will force update the battery
-        verify(mBatteryListener, times(2)).onBatteryChanged();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
deleted file mode 100644
index a461f4663314661f8af23252a0e94e0a225eb1a6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Handler;
-import android.os.Process;
-import android.os.UserManager;
-
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatterySipper.DrainType;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoRule;
-import org.mockito.junit.MockitoJUnit;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryEntryTest {
-
-    private static final int APP_UID = 123;
-    private static final int SYSTEM_UID = Process.SYSTEM_UID;
-    private static final String APP_DEFAULT_PACKAGE_NAME = "com.android.test";
-    private static final String APP_LABEL = "Test App Name";
-    private static final String HIGH_DRAIN_PACKAGE = "com.android.test.screen";
-    private static final String ANDROID_PACKAGE = "android";
-    private static final String[] SYSTEM_PACKAGES = {HIGH_DRAIN_PACKAGE, ANDROID_PACKAGE};
-
-    @Rule public MockitoRule mocks = MockitoJUnit.rule();
-
-    @Mock private Context mockContext;
-    @Mock private Handler mockHandler;
-    @Mock private PackageManager mockPackageManager;
-    @Mock private UserManager mockUserManager;
-
-    @Before
-    public void stubContextToReturnMockPackageManager() {
-        when(mockContext.getPackageManager()).thenReturn(mockPackageManager);
-    }
-
-    @Before
-    public void stubPackageManagerToReturnAppPackageAndName() throws NameNotFoundException {
-        when(mockPackageManager.getPackagesForUid(APP_UID)).thenReturn(
-            new String[]{APP_DEFAULT_PACKAGE_NAME});
-
-        ApplicationInfo appInfo = mock(ApplicationInfo.class);
-        when(mockPackageManager.getApplicationInfo(APP_DEFAULT_PACKAGE_NAME, 0 /* no flags */))
-            .thenReturn(appInfo);
-        when(mockPackageManager.getApplicationLabel(appInfo)).thenReturn(APP_LABEL);
-    }
-
-    private BatteryEntry createBatteryEntryForApp() {
-        return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForApp());
-    }
-
-    private BatterySipper createSipperForApp() {
-        BatterySipper sipper =
-            new BatterySipper(DrainType.APP, new FakeUid(APP_UID), 0 /* power use */);
-        sipper.packageWithHighestDrain = HIGH_DRAIN_PACKAGE;
-        return sipper;
-    }
-
-    private BatteryEntry createBatteryEntryForSystem() {
-        return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForSystem());
-    }
-
-    private BatterySipper createSipperForSystem() {
-        BatterySipper sipper =
-                new BatterySipper(DrainType.APP, new FakeUid(SYSTEM_UID), 0 /* power use */);
-        sipper.packageWithHighestDrain = HIGH_DRAIN_PACKAGE;
-        sipper.mPackages = SYSTEM_PACKAGES;
-        return sipper;
-    }
-
-    @Test
-    public void batteryEntryForApp_shouldSetDefaultPackageNameAndLabel() throws Exception {
-        BatteryEntry entry = createBatteryEntryForApp();
-
-        assertThat(entry.defaultPackageName).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
-        assertThat(entry.getLabel()).isEqualTo(APP_LABEL);
-    }
-
-    @Test
-    public void batteryEntryForApp_shouldSetLabelAsPackageName_whenPackageCannotBeFound()
-        throws Exception {
-      when(mockPackageManager.getApplicationInfo(APP_DEFAULT_PACKAGE_NAME, 0 /* no flags */))
-          .thenThrow(new NameNotFoundException());
-
-      BatteryEntry entry = createBatteryEntryForApp();
-
-      assertThat(entry.getLabel()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
-    }
-
-    @Test
-    public void batteryEntryForApp_shouldSetHighestDrainPackage_whenPackagesCannotBeFoundForUid() {
-        when(mockPackageManager.getPackagesForUid(APP_UID)).thenReturn(null);
-
-        BatteryEntry entry = createBatteryEntryForApp();
-
-        assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);
-    }
-
-    @Test
-    public void batteryEntryForApp_shouldSetHighestDrainPackage_whenMultiplePackagesFoundForUid() {
-        when(mockPackageManager.getPackagesForUid(APP_UID)).thenReturn(
-            new String[]{APP_DEFAULT_PACKAGE_NAME, "package2", "package3"});
-
-        BatteryEntry entry = createBatteryEntryForApp();
-
-        assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);
-    }
-
-    @Test
-    public void extractPackageFromSipper_systemSipper_returnSystemPackage() {
-        BatteryEntry entry = createBatteryEntryForSystem();
-
-        assertThat(entry.extractPackagesFromSipper(entry.sipper)).isEqualTo(
-                new String[]{ANDROID_PACKAGE});
-    }
-
-    @Test
-    public void extractPackageFromSipper_normalSipper_returnDefaultPakcage() {
-        BatteryEntry entry = createBatteryEntryForApp();
-
-        assertThat(entry.extractPackagesFromSipper(entry.sipper)).isEqualTo(entry.sipper.mPackages);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
deleted file mode 100644
index e434bb327fd51084351315ad119e22503de358b9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.widget.RecyclerView;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEntityHeaderController.class
-        })
-public class BatteryHeaderPreferenceControllerTest {
-    private static final int BATTERY_LEVEL = 60;
-    private static final String TIME_LEFT = "2h30min";
-    private static final String BATTERY_STATUS = "Charging";
-
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private PreferenceFragment mPreferenceFragment;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private BatteryInfo mBatteryInfo;
-    @Mock
-    private EntityHeaderController mEntityHeaderController;
-    private BatteryHeaderPreferenceController mController;
-    private Context mContext;
-    private BatteryMeterView mBatteryMeterView;
-    private TextView mBatteryPercentText;
-    private TextView mSummary;
-    private TextView mSummary2;
-    private LayoutPreference mBatteryLayoutPref;
-    private Intent mBatteryIntent;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mLifecycle = new Lifecycle();
-        mContext = spy(RuntimeEnvironment.application);
-        mBatteryMeterView = new BatteryMeterView(mContext);
-        mBatteryPercentText = new TextView(mContext);
-        mSummary = new TextView(mContext);
-        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
-        mSummary2 = new TextView(mContext);
-
-        mBatteryIntent = new Intent();
-        mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
-        mBatteryIntent.putExtra(BatteryManager.EXTRA_SCALE, 100);
-        mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
-        doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
-
-        mBatteryLayoutPref = new LayoutPreference(mContext, R.layout.battery_header);
-        doReturn(mBatteryLayoutPref).when(mPreferenceScreen).findPreference(
-                BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
-
-        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
-
-        mController = new BatteryHeaderPreferenceController(
-                mContext, mActivity, mPreferenceFragment, mLifecycle);
-        mController.mBatteryMeterView = mBatteryMeterView;
-        mController.mBatteryPercentText = mBatteryPercentText;
-        mController.mSummary1 = mSummary;
-        mController.mSummary2 = mSummary2;
-    }
-
-    @After
-    public void tearDown() {
-        ShadowEntityHeaderController.reset();
-    }
-
-    @Test
-    public void testDisplayPreference_displayBatteryLevel() {
-        mController.displayPreference(mPreferenceScreen);
-
-        assertThat(((BatteryMeterView) mBatteryLayoutPref.findViewById(
-                R.id.battery_header_icon)).getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-        assertThat(((TextView) mBatteryLayoutPref.findViewById(
-                R.id.battery_percent)).getText()).isEqualTo("60%");
-    }
-
-    @Test
-    public void testUpdatePreference_hasRemainingTime_showRemainingLabel() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        assertThat(mSummary.getText()).isEqualTo(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void testUpdatePreference_updateBatteryInfo() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
-        mBatteryInfo.discharging = true;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        assertThat(mBatteryMeterView.mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-        assertThat(mBatteryMeterView.mDrawable.getCharging()).isEqualTo(false);
-    }
-
-    @Test
-    public void testUpdatePreference_noRemainingTime_showStatusLabel() {
-        mBatteryInfo.remainingLabel = null;
-        mBatteryInfo.statusLabel = BATTERY_STATUS;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
-    }
-
-    @Test
-    public void testOnStart_shouldStyleActionBar() {
-        when(mEntityHeaderController.setRecyclerView(nullable(RecyclerView.class), eq(mLifecycle)))
-                .thenReturn(mEntityHeaderController);
-
-        mController.displayPreference(mPreferenceScreen);
-        mLifecycle.onStart();
-
-        verify(mEntityHeaderController).styleActionBar(mActivity);
-    }
-
-    @Test
-    public void testQuickUpdateHeaderPreference_showBatteryLevelAndChargingState() {
-        mController.quickUpdateHeaderPreference();
-
-        assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-        assertThat(mBatteryMeterView.getCharging()).isTrue();
-        assertThat(mBatteryPercentText.getText()).isEqualTo("60%");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
deleted file mode 100644
index 0d03512c8d41899baeea4e47ffc90d22c67d4788..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.graph.UsageView;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class
-        })
-public class BatteryHistoryPreferenceTest {
-    public static final String TEST_STRING = "test";
-    @Mock
-    private PreferenceViewHolder mViewHolder;
-    @Mock
-    private BatteryInfo mBatteryInfo;
-    @Mock
-    private TextView mTextView;
-    @Mock
-    private View mItemView;
-    @Mock
-    private UsageView mUsageView;
-    @Mock
-    private View mLabelView;
-    private BatteryHistoryPreference mBatteryHistoryPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final Context context = RuntimeEnvironment.application;
-        final View itemView = LayoutInflater.from(context).inflate(R.layout.battery_usage_graph,
-                null);
-
-        mBatteryHistoryPreference = new BatteryHistoryPreference(context, null);
-        mBatteryHistoryPreference.mBatteryInfo = mBatteryInfo;
-        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(itemView));
-        when(mViewHolder.findViewById(R.id.battery_usage)).thenReturn(mUsageView);
-        when(mViewHolder.findViewById(R.id.charge)).thenReturn(mTextView);
-        when(mUsageView.findViewById(anyInt())).thenReturn(mLabelView);
-    }
-
-    @Test
-    public void testOnBindViewHolder_updateBatteryUsage() {
-        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
-
-        verify(mViewHolder).findViewById(R.id.battery_usage);
-        verify(mTextView).setText(nullable(String.class));
-        verify(mBatteryInfo).bindHistory(mUsageView);
-    }
-
-    @Test
-    public void testSetBottomSummary_updatesBottomSummaryTextIfSet() {
-        mBatteryHistoryPreference.setBottomSummary(TEST_STRING);
-        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
-
-        TextView view = (TextView) mViewHolder.findViewById(R.id.bottom_summary);
-        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(view.getText()).isEqualTo(TEST_STRING);
-        assertThat(mBatteryHistoryPreference.hideSummary).isFalse();
-    }
-
-    @Test
-    public void testSetBottomSummary_leavesBottomSummaryTextBlankIfNotSet() {
-        mBatteryHistoryPreference.hideBottomSummary();
-        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
-
-        TextView view = (TextView) mViewHolder.findViewById(R.id.bottom_summary);
-        assertThat(view.getVisibility()).isEqualTo(View.GONE);
-        assertThat(view.getText()).isEqualTo("");
-        assertThat(mBatteryHistoryPreference.hideSummary).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
deleted file mode 100644
index 796e63c745dacdf563a6ab94fc2afbac3985d4dc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-import android.os.BatteryStats;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.BatteryTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryInfoLoaderTest {
-    private static final long TEST_TIME_REMAINING = 1000L;
-
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mHelper;
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
-    private PowerUsageFeatureProvider mProvider;
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStats mStats;
-
-    private Intent mDisChargingBatteryBroadcast;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mProvider = FakeFeatureFactory
-                .setupForTest(mContext)
-                .getPowerUsageFeatureProvider(mContext);
-
-        mDisChargingBatteryBroadcast = BatteryTestUtils.getDischargingIntent();
-
-        doReturn(mContext).when(mContext).getApplicationContext();
-        when(mStats.computeBatteryTimeRemaining(anyLong())).thenReturn(TEST_TIME_REMAINING);
-        doReturn(mStats).when(mHelper).getStats();
-        doReturn(mDisChargingBatteryBroadcast).when(mContext).registerReceiver(any(), any());
-    }
-
-    @Test
-    public void test_loadInBackground_dischargingOldEstimate_dischargingLabelNotNull() {
-        BatteryInfoLoader loader = new BatteryInfoLoader(mContext, mHelper);
-
-        BatteryInfo info = loader.loadInBackground();
-
-        assertThat(info.remainingLabel).isNotNull();
-        assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
deleted file mode 100644
index d82a89b5f938f80f33566135b374950163d00653..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.BatteryManager;
-import android.os.BatteryStats;
-import android.os.SystemClock;
-import android.util.SparseIntArray;
-
-import com.android.settings.TestConfig;
-import com.android.settings.graph.UsageView;
-import com.android.settings.testutils.BatteryTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.concurrent.TimeUnit;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryInfoTest {
-
-    private static final String STATUS_FULL = "Full";
-    private static final String STATUS_CHARGING_NO_TIME = "50% - charging";
-    private static final String STATUS_CHARGING_TIME = "50% - 0m until fully charged";
-    private static final String STATUS_NOT_CHARGING = "Not charging";
-    private static final int PLUGGED_IN = 1;
-    private static final long REMAINING_TIME_NULL = -1;
-    private static final long REMAINING_TIME = 2;
-    public static final String ENHANCED_STRING_SUFFIX = "left based on your usage";
-    public static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);
-    public static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =
-            "1m left until fully charged";
-    private Intent mDisChargingBatteryBroadcast;
-    private Intent mChargingBatteryBroadcast;
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStats mBatteryStats;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Resources mResources;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
-
-        mDisChargingBatteryBroadcast = BatteryTestUtils.getDischargingIntent();
-
-        mChargingBatteryBroadcast = BatteryTestUtils.getChargingIntent();
-    }
-
-    @Test
-    public void testGetBatteryInfo_hasStatusLabel() {
-        doReturn(REMAINING_TIME_NULL).when(mBatteryStats).computeBatteryTimeRemaining(anyLong());
-        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext,
-                mDisChargingBatteryBroadcast, mBatteryStats, SystemClock.elapsedRealtime() * 1000,
-                true /* shortString */);
-
-        assertThat(info.statusLabel).isEqualTo(STATUS_NOT_CHARGING);
-    }
-
-    @Test
-    public void testGetBatteryInfo_doNotShowChargingMethod_hasRemainingTime() {
-        doReturn(REMAINING_TIME).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
-        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
-
-        assertThat(info.chargeLabel.toString()).isEqualTo(STATUS_CHARGING_TIME);
-    }
-
-    @Test
-    public void testGetBatteryInfo_doNotShowChargingMethod_noRemainingTime() {
-        doReturn(REMAINING_TIME_NULL).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
-        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
-
-        assertThat(info.chargeLabel.toString()).isEqualTo(STATUS_CHARGING_NO_TIME);
-    }
-
-    @Test
-    public void testGetBatteryInfo_pluggedInUsingShortString_usesCorrectData() {
-        doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryStats).computeChargeTimeRemaining(
-                anyLong());
-        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
-
-        assertThat(info.discharging).isEqualTo(false);
-        assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1m until fully charged");
-    }
-
-    @Test
-    public void testGetBatteryInfo_basedOnUsageTrue_usesCorrectString() {
-        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
-                1000, true /* basedOnUsage */);
-        BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
-                1000, true /* basedOnUsage */);
-
-        // We only add special mention for the long string
-        assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
-        // shortened string should not have extra text
-        assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
-    }
-
-    @Test
-    public void testGetBatteryInfo_basedOnUsageFalse_usesDefaultString() {
-        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
-                1000, false /* basedOnUsage */);
-        BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
-                1000, false /* basedOnUsage */);
-
-        assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
-        assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
-    }
-
-    @Test
-    public void testGetBatteryInfo_charging_usesChargeTime() {
-        doReturn(TEST_CHARGE_TIME_REMAINING)
-                .when(mBatteryStats)
-                .computeChargeTimeRemaining(anyLong());
-        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false, 1000, false);
-        assertThat(info.remainingTimeUs).isEqualTo(TEST_CHARGE_TIME_REMAINING);
-        assertThat(info.remainingLabel.toString())
-                .isEqualTo(TEST_CHARGE_TIME_REMAINING_STRINGIFIED);
-    }
-
-    @Test
-    public void testGetBatteryInfo_pluggedInWithFullBattery_onlyShowBatteryLevel() {
-        mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
-
-        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
-                1000, false /* basedOnUsage */);
-
-        assertThat(info.chargeLabel).isEqualTo("100%");
-    }
-
-    // Make our battery stats return a sequence of battery events.
-    private void mockBatteryStatsHistory() {
-        // Mock out new data every time start...Locked is called.
-        doAnswer(invocation -> {
-            doAnswer(new Answer() {
-                private int count = 0;
-                private long[] times = {1000, 1500, 2000};
-                private byte[] levels = {99, 98, 97};
-
-                @Override
-                public Object answer(InvocationOnMock invocation) throws Throwable {
-                    if (count == times.length) {
-                        return false;
-                    }
-                    BatteryStats.HistoryItem record = invocation.getArgument(0);
-                    record.cmd = BatteryStats.HistoryItem.CMD_UPDATE;
-                    record.time = times[count];
-                    record.batteryLevel = levels[count];
-                    count++;
-                    return true;
-                }
-            }).when(mBatteryStats).getNextHistoryLocked(any(BatteryStats.HistoryItem.class));
-            return true;
-        }).when(mBatteryStats).startIteratingHistoryLocked();
-    }
-
-    private void assertOnlyHistory(BatteryInfo info) {
-        mockBatteryStatsHistory();
-        UsageView view = mock(UsageView.class);
-        doReturn(mContext).when(view).getContext();
-
-        info.bindHistory(view);
-        verify(view, times(1)).configureGraph(anyInt(), anyInt());
-        verify(view, times(1)).addPath(any(SparseIntArray.class));
-        verify(view, never()).addProjectedPath(any(SparseIntArray.class));
-    }
-
-    private void assertHistoryAndLinearProjection(BatteryInfo info) {
-        mockBatteryStatsHistory();
-        UsageView view = mock(UsageView.class);
-        doReturn(mContext).when(view).getContext();
-
-        info.bindHistory(view);
-        verify(view, times(2)).configureGraph(anyInt(), anyInt());
-        verify(view, times(1)).addPath(any(SparseIntArray.class));
-        ArgumentCaptor<SparseIntArray> pointsActual = ArgumentCaptor.forClass(SparseIntArray.class);
-        verify(view, times(1)).addProjectedPath(pointsActual.capture());
-
-        // Check that we have two points and the first is correct.
-        assertThat(pointsActual.getValue().size()).isEqualTo(2);
-        assertThat(pointsActual.getValue().keyAt(0)).isEqualTo(2000);
-        assertThat(pointsActual.getValue().valueAt(0)).isEqualTo(97);
-    }
-
-    private void assertHistoryAndEnhancedProjection(BatteryInfo info) {
-        mockBatteryStatsHistory();
-        UsageView view = mock(UsageView.class);
-        doReturn(mContext).when(view).getContext();
-        SparseIntArray pointsExpected = new SparseIntArray();
-        pointsExpected.append(2000, 96);
-        pointsExpected.append(2500, 95);
-        pointsExpected.append(3000, 94);
-        doReturn(pointsExpected).when(mFeatureFactory.powerUsageFeatureProvider)
-                .getEnhancedBatteryPredictionCurve(any(Context.class), anyLong());
-
-        info.bindHistory(view);
-        verify(view, times(2)).configureGraph(anyInt(), anyInt());
-        verify(view, times(1)).addPath(any(SparseIntArray.class));
-        ArgumentCaptor<SparseIntArray> pointsActual = ArgumentCaptor.forClass(SparseIntArray.class);
-        verify(view, times(1)).addProjectedPath(pointsActual.capture());
-        assertThat(pointsActual.getValue()).isEqualTo(pointsExpected);
-    }
-
-    private BatteryInfo getBatteryInfo(boolean charging, boolean enhanced, boolean estimate) {
-        if (charging && estimate) {
-            doReturn(1000L).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
-        } else {
-            doReturn(0L).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
-        }
-        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext,
-                charging ? mChargingBatteryBroadcast : mDisChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false,
-                estimate ? 1000 : 0 /* drainTimeUs */, false);
-        doReturn(enhanced).when(mFeatureFactory.powerUsageFeatureProvider)
-                .isEnhancedBatteryPredictionEnabled(mContext);
-        return info;
-    }
-
-    @Test
-    public void testBindHistory() {
-        BatteryInfo info;
-
-        info = getBatteryInfo(false /* charging */, false /* enhanced */, false /* estimate */);
-        assertOnlyHistory(info);
-
-        info = getBatteryInfo(false /* charging */, false /* enhanced */, true /* estimate */);
-        assertHistoryAndLinearProjection(info);
-
-        info = getBatteryInfo(false /* charging */, true /* enhanced */, false /* estimate */);
-        assertOnlyHistory(info);
-
-        info = getBatteryInfo(false /* charging */, true /* enhanced */, true /* estimate */);
-        assertHistoryAndEnhancedProjection(info);
-
-        info = getBatteryInfo(true /* charging */, false /* enhanced */, false /* estimate */);
-        assertOnlyHistory(info);
-
-        info = getBatteryInfo(true /* charging */, false /* enhanced */, true /* estimate */);
-        assertHistoryAndLinearProjection(info);
-
-        info = getBatteryInfo(true /* charging */, true /* enhanced */, false /* estimate */);
-        assertOnlyHistory(info);
-
-        // Linear projection for charging even in enhanced mode.
-        info = getBatteryInfo(true /* charging */, true /* enhanced */, true /* estimate */);
-        assertHistoryAndLinearProjection(info);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
deleted file mode 100644
index 3a1fad0fcbfa42b3e093b8f0dd45c9f6fb0c645a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.graphics.ColorFilter;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-// TODO: Consider making the shadow class set global using a robolectric.properties file.
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowTheme.class,
-        })
-public class BatteryMeterViewTest {
-    private static final int BATTERY_LEVEL = 100;
-    private static final int BATTERY_CRITICAL_LEVEL = 15;
-    private static final int BATTERY_LOW_LEVEL = 3;
-    @Mock
-    private ColorFilter mErrorColorFilter;
-    @Mock
-    private ColorFilter mAccentColorFilter;
-    private Context mContext;
-    private BatteryMeterView mBatteryMeterView;
-    private BatteryMeterView.BatteryMeterDrawable mDrawable;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mBatteryMeterView = new BatteryMeterView(mContext);
-        mDrawable = spy(new BatteryMeterView.BatteryMeterDrawable(mContext, 0));
-
-        mBatteryMeterView.mDrawable = mDrawable;
-        mBatteryMeterView.mAccentColorFilter = mAccentColorFilter;
-        mBatteryMeterView.mErrorColorFilter = mErrorColorFilter;
-
-        doReturn(BATTERY_CRITICAL_LEVEL).when(mDrawable).getCriticalLevel();
-    }
-
-    @Test
-    public void testSetBatteryInfo_setCorrectly() {
-        mBatteryMeterView.setBatteryLevel(BATTERY_LEVEL);
-
-        assertThat(mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-    }
-
-    @Test
-    public void testSetBatteryInfo_levelLow_setErrorColor() {
-        mBatteryMeterView.setBatteryLevel(BATTERY_LOW_LEVEL);
-
-        verify(mDrawable).setBatteryColorFilter(mErrorColorFilter);
-    }
-
-    @Test
-    public void testSetBatteryInfo_levelNormal_setNormalColor() {
-        mBatteryMeterView.setBatteryLevel(BATTERY_LEVEL);
-
-        verify(mDrawable).setBatteryColorFilter(mAccentColorFilter);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
deleted file mode 100644
index 77e3198661ee518db1fba59798b2cb90b6571a62..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryOptimizationPreferenceControllerTest {
-    private static final String PKG_IN_WHITELIST = "com.pkg.in.whitelist";
-    private static final String PKG_NOT_IN_WHITELIST = "com.pkg.not.in.whitelist";
-    private static final String KEY_OPTIMIZATION = "battery_optimization";
-    private static final String KEY_OTHER = "other";
-    @Mock
-    private SettingsActivity mSettingsActivity;
-    @Mock
-    private Fragment mFragment;
-    @Mock
-    private TestPowerWhitelistBackend mBackend;
-
-    private BatteryOptimizationPreferenceController mController;
-    private Preference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        doReturn(false).when(mBackend).isWhitelisted(PKG_NOT_IN_WHITELIST);
-        doReturn(true).when(mBackend).isWhitelisted(PKG_IN_WHITELIST);
-
-        mPreference = new SwitchPreference(mContext);
-        mController = spy(new BatteryOptimizationPreferenceController(mSettingsActivity, mFragment,
-                PKG_NOT_IN_WHITELIST, mBackend));
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_OptimizationPreference_HandleClick() {
-        mPreference.setKey(KEY_OPTIMIZATION);
-
-        final boolean handled = mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(handled).isTrue();
-        verify(mSettingsActivity).startPreferencePanel(nullable(Fragment.class),
-                nullable(String.class), nullable(Bundle.class), anyInt(),
-                nullable(CharSequence.class), nullable(Fragment.class), anyInt());
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_OtherPreference_NotHandleClick() {
-        mPreference.setKey(KEY_OTHER);
-
-        final boolean handled = mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(handled).isFalse();
-        verify(mSettingsActivity, never()).startPreferencePanel(nullable(Fragment.class),
-                nullable(String.class), nullable(Bundle.class), anyInt(),
-                nullable(CharSequence.class), nullable(Fragment.class), anyInt());
-    }
-
-    @Test
-    public void testUpdateState_appInWhitelist_showSummaryNotOptimized() {
-        BatteryOptimizationPreferenceController controller =
-                new BatteryOptimizationPreferenceController(mSettingsActivity, mFragment,
-                        PKG_IN_WHITELIST, mBackend);
-
-        controller.updateState(mPreference);
-
-        assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.high_power_on));
-    }
-
-    @Test
-    public void testUpdateState_appNotInWhitelist_showSummaryOptimized() {
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.high_power_off));
-    }
-
-    /**
-     * Create this test class so we could mock it
-     */
-    public static class TestPowerWhitelistBackend extends PowerWhitelistBackend {
-
-        @Override
-        void refreshList() {
-            // Do nothing so we could mock it without error
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
deleted file mode 100644
index c75a6a6377ea13edb43056d23af8e2c291e4cd83..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-import android.os.PowerManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.widget.MasterSwitchPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatterySaverControllerTest {
-    @Mock
-    private MasterSwitchPreference mBatterySaverPref;
-    @Mock
-    private PowerManager mPowerManager;
-    @Mock
-    private Context mContext;
-    @Mock
-    private Lifecycle mLifecycle;
-    private BatterySaverController mBatterySaverController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mBatterySaverController = spy(new BatterySaverController(mContext, mLifecycle));
-        ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
-        ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
-        doNothing().when(mBatterySaverController).refreshConditionManager();
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOnBatterySaver_BatterySaverOn() {
-        testOnPreferenceChangeInner(true);
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOffBatterySaver_BatterySaverOff() {
-        testOnPreferenceChangeInner(false);
-    }
-
-    @Test
-    public void testUpdateState_SaverModeOn_PreferenceChecked() {
-        testUpdateStateInner(true);
-    }
-
-    @Test
-    public void testUpdateState_SaverModeOff_PreferenceUnChecked() {
-        testUpdateStateInner(false);
-    }
-
-    @Test
-    public void testOnBatteryChanged_pluggedIn_setDisable() {
-        mBatterySaverController.onBatteryChanged(true /* pluggedIn */);
-
-        verify(mBatterySaverPref).setSwitchEnabled(false);
-    }
-
-    @Test
-    public void testOnBatteryChanged_notPluggedIn_setEnable() {
-        mBatterySaverController.onBatteryChanged(false /* pluggedIn */);
-
-        verify(mBatterySaverPref).setSwitchEnabled(true);
-    }
-
-    private void testOnPreferenceChangeInner(final boolean saverOn) {
-        when(mPowerManager.setPowerSaveMode(saverOn)).thenReturn(true);
-        when(mPowerManager.isPowerSaveMode()).thenReturn(!saverOn);
-
-        mBatterySaverController.onPreferenceChange(mBatterySaverPref, saverOn);
-        verify(mPowerManager).setPowerSaveMode(saverOn);
-    }
-
-    private void testUpdateStateInner(final boolean saverOn) {
-        when(mPowerManager.isPowerSaveMode()).thenReturn(saverOn);
-
-        mBatterySaverController.updateState(mBatterySaverPref);
-        verify(mBatterySaverPref).setChecked(saverOn);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
deleted file mode 100644
index 259bcd29656ce0736ca48734c9f7d791779db05c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-import android.os.PowerManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatterySaverReceiverTest {
-    @Mock
-    private BatterySaverReceiver.BatterySaverListener mBatterySaverListener;
-    @Mock
-    private Context mContext;
-    private BatterySaverReceiver mBatterySaverReceiver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mBatterySaverReceiver = new BatterySaverReceiver(mContext);
-        mBatterySaverReceiver.setBatterySaverListener(mBatterySaverListener);
-    }
-
-    @Test
-    public void testOnReceive_devicePluggedIn_pluggedInTrue() {
-        Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
-        intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_AC);
-
-        mBatterySaverReceiver.onReceive(mContext, intent);
-
-        verify(mBatterySaverListener).onBatteryChanged(true);
-    }
-
-    @Test
-    public void testOnReceive_deviceNotPluggedIn_pluggedInFalse() {
-        Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
-        intent.putExtra(BatteryManager.EXTRA_PLUGGED, 0);
-
-        mBatterySaverReceiver.onReceive(mContext, intent);
-
-        verify(mBatterySaverListener).onBatteryChanged(false);
-    }
-
-    @Test
-    public void testOnReceive_powerSaveModeChanged_invokeCallback() {
-        Intent intent = new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGING);
-
-        mBatterySaverReceiver.onReceive(mContext, intent);
-
-        verify(mBatterySaverListener).onPowerSaveModeChanged();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java
deleted file mode 100644
index 1e173a2ba52ea02af6c29b189afdaa6c8b90fa1c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.SwitchBar;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatterySaverSettingsTest {
-    private Context mContext;
-    private BatterySaverSettings mBatterySaverSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mBatterySaverSettings = new BatterySaverSettings();
-        mBatterySaverSettings.mSwitchBar = new SwitchBar(mContext);
-    }
-
-    @Test
-    public void testOnBatteryChanged_pluggedIn_setDisable() {
-        mBatterySaverSettings.onBatteryChanged(true /* pluggedIn */);
-
-        assertThat(mBatterySaverSettings.mSwitchBar.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testOnBatteryChanged_notPluggedIn_setEnable() {
-        mBatterySaverSettings.onBatteryChanged(false /* pluggedIn */);
-
-        assertThat(mBatterySaverSettings.mSwitchBar.isEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
deleted file mode 100644
index 5f8d7cfc244bef6406c1de7fd7cede1dd9cffe15..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryStatsHelperLoaderTest {
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-
-    private Context mContext;
-    private BatteryStatsHelperLoader mBatteryStatsHelperLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mConnectivityManager).when(mContext).getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-
-        mBatteryStatsHelperLoader = spy(new BatteryStatsHelperLoader(mContext));
-        mBatteryStatsHelperLoader.mBatteryUtils = mBatteryUtils;
-    }
-
-    @Test
-    public void testLoadInBackground_loadWithoutBundle() {
-        doReturn(mContext).when(mBatteryStatsHelperLoader).getContext();
-        mBatteryStatsHelperLoader.loadInBackground();
-
-        verify(mBatteryUtils).initBatteryStatsHelper(any(), eq(null), any());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
deleted file mode 100644
index c08b01ddc46f383ee508f23e5a7636a853e242b5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.BatteryStats;
-import android.os.Bundle;
-import android.os.Build;
-import android.os.Process;
-import android.os.SystemClock;
-import android.os.UserManager;
-import android.text.format.DateUtils;
-
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.R;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.os.BatteryStats.Uid.PROCESS_STATE_BACKGROUND;
-import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND;
-import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE;
-import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP;
-import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.spy;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryUtilsTest {
-    // unit that used to converted ms to us
-    private static final long UNIT = 1000;
-    private static final long TIME_STATE_TOP = 1500 * UNIT;
-    private static final long TIME_STATE_FOREGROUND_SERVICE = 2000 * UNIT;
-    private static final long TIME_STATE_TOP_SLEEPING = 2500 * UNIT;
-    private static final long TIME_STATE_FOREGROUND = 3000 * UNIT;
-    private static final long TIME_STATE_BACKGROUND = 6000 * UNIT;
-    private static final long TIME_FOREGROUND_ZERO = 0;
-    private static final long TIME_FOREGROUND = 100 * DateUtils.MINUTE_IN_MILLIS;
-    private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
-    private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
-            TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
-
-    private static final int UID = 123;
-    private static final long TIME_EXPECTED_FOREGROUND = 1500;
-    private static final long TIME_EXPECTED_BACKGROUND = 6000;
-    private static final long TIME_EXPECTED_ALL = 7500;
-    private static final double BATTERY_SCREEN_USAGE = 300;
-    private static final double BATTERY_IDLE_USAGE = 600;
-    private static final double BATTERY_SYSTEM_USAGE = 600;
-    private static final double BATTERY_OVERACCOUNTED_USAGE = 500;
-    private static final double BATTERY_UNACCOUNTED_USAGE = 700;
-    private static final double BATTERY_APP_USAGE = 100;
-    private static final double BATTERY_WIFI_USAGE = 200;
-    private static final double BATTERY_BLUETOOTH_USAGE = 300;
-    private static final double TOTAL_BATTERY_USAGE = 1000;
-    private static final double HIDDEN_USAGE = 200;
-    private static final int DISCHARGE_AMOUNT = 80;
-    private static final double PERCENT_SYSTEM_USAGE = 60;
-    private static final double PRECISION = 0.001;
-    private static final int SDK_VERSION = Build.VERSION_CODES.L;
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    @Mock
-    private BatteryStats.Uid mUid;
-    @Mock
-    private BatteryStats.Timer mTimer;
-    @Mock
-    private BatterySipper mNormalBatterySipper;
-    @Mock
-    private BatterySipper mWifiBatterySipper;
-    @Mock
-    private BatterySipper mBluetoothBatterySipper;
-    @Mock
-    private BatterySipper mScreenBatterySipper;
-    @Mock
-    private BatterySipper mOvercountedBatterySipper;
-    @Mock
-    private BatterySipper mUnaccountedBatterySipper;
-    @Mock
-    private BatterySipper mSystemBatterySipper;
-    @Mock
-    private BatterySipper mCellBatterySipper;
-    @Mock
-    private BatterySipper mIdleBatterySipper;
-    @Mock
-    private Bundle mBundle;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private AppOpsManager mAppOpsManager;
-    @Mock
-    private ApplicationInfo mApplicationInfo;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryStatsHelper;
-    private BatteryUtils mBatteryUtils;
-    private FakeFeatureFactory mFeatureFactory;
-    private PowerUsageFeatureProvider mProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mProvider = mFeatureFactory.powerUsageFeatureProvider;
-
-        doReturn(TIME_STATE_TOP).when(mUid).getProcessStateTime(eq(PROCESS_STATE_TOP), anyLong(),
-                anyInt());
-        doReturn(TIME_STATE_FOREGROUND_SERVICE).when(mUid).getProcessStateTime(
-                eq(PROCESS_STATE_FOREGROUND_SERVICE), anyLong(), anyInt());
-        doReturn(TIME_STATE_TOP_SLEEPING).when(mUid).getProcessStateTime(
-                eq(PROCESS_STATE_TOP_SLEEPING), anyLong(), anyInt());
-        doReturn(TIME_STATE_FOREGROUND).when(mUid).getProcessStateTime(eq(PROCESS_STATE_FOREGROUND),
-                anyLong(), anyInt());
-        doReturn(TIME_STATE_BACKGROUND).when(mUid).getProcessStateTime(eq(PROCESS_STATE_BACKGROUND),
-                anyLong(), anyInt());
-        when(mBatteryStatsHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
-                TIME_SINCE_LAST_FULL_CHARGE_US);
-
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE;
-
-        mWifiBatterySipper.drainType = BatterySipper.DrainType.WIFI;
-        mWifiBatterySipper.totalPowerMah = BATTERY_WIFI_USAGE;
-
-        mBluetoothBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
-        mBluetoothBatterySipper.totalPowerMah = BATTERY_BLUETOOTH_USAGE;
-
-        mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
-        mScreenBatterySipper.totalPowerMah = BATTERY_SCREEN_USAGE;
-
-        mSystemBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mSystemBatterySipper.totalPowerMah = BATTERY_SYSTEM_USAGE;
-        when(mSystemBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
-
-        mOvercountedBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
-        mOvercountedBatterySipper.totalPowerMah = BATTERY_OVERACCOUNTED_USAGE;
-
-        mUnaccountedBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
-        mUnaccountedBatterySipper.totalPowerMah = BATTERY_UNACCOUNTED_USAGE;
-
-        mIdleBatterySipper.drainType = BatterySipper.DrainType.IDLE;
-        mIdleBatterySipper.totalPowerMah = BATTERY_IDLE_USAGE;
-
-        final Context shadowContext = spy(RuntimeEnvironment.application);
-        doReturn(mPackageManager).when(shadowContext).getPackageManager();
-        doReturn(mAppOpsManager).when(shadowContext).getSystemService(Context.APP_OPS_SERVICE);
-        mBatteryUtils = spy(new BatteryUtils(shadowContext));
-        mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
-        doReturn(0L).when(mBatteryUtils).getForegroundServiceTotalTimeUs(
-                any(BatteryStats.Uid.class), anyLong());
-    }
-
-    @Test
-    public void testGetProcessTimeMs_typeForeground_timeCorrect() {
-        doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils).getForegroundActivityTotalTimeUs(
-                eq(mUid), anyLong());
-
-        final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.FOREGROUND, mUid,
-                BatteryStats.STATS_SINCE_CHARGED);
-
-        assertThat(time).isEqualTo(TIME_EXPECTED_FOREGROUND);
-    }
-
-    @Test
-    public void testGetProcessTimeMs_typeBackground_timeCorrect() {
-        final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.BACKGROUND, mUid,
-                BatteryStats.STATS_SINCE_CHARGED);
-
-        assertThat(time).isEqualTo(TIME_EXPECTED_BACKGROUND);
-    }
-
-    @Test
-    public void testGetProcessTimeMs_typeAll_timeCorrect() {
-        doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils).getForegroundActivityTotalTimeUs(
-                eq(mUid), anyLong());
-
-        final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.ALL, mUid,
-                BatteryStats.STATS_SINCE_CHARGED);
-
-        assertThat(time).isEqualTo(TIME_EXPECTED_ALL);
-    }
-
-    @Test
-    public void testGetProcessTimeMs_uidNull_returnZero() {
-        final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.ALL, null,
-                BatteryStats.STATS_SINCE_CHARGED);
-
-        assertThat(time).isEqualTo(0);
-    }
-
-    @Test
-    public void testRemoveHiddenBatterySippers_ContainsHiddenSippers_RemoveAndReturnValue() {
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(mNormalBatterySipper);
-        sippers.add(mScreenBatterySipper);
-        sippers.add(mSystemBatterySipper);
-        sippers.add(mOvercountedBatterySipper);
-        sippers.add(mUnaccountedBatterySipper);
-        sippers.add(mWifiBatterySipper);
-        sippers.add(mBluetoothBatterySipper);
-        sippers.add(mIdleBatterySipper);
-        when(mProvider.isTypeSystem(mSystemBatterySipper))
-                .thenReturn(true);
-        doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any());
-
-        final double totalUsage = mBatteryUtils.removeHiddenBatterySippers(sippers);
-
-        assertThat(sippers).containsExactly(mNormalBatterySipper);
-        assertThat(totalUsage).isWithin(PRECISION).of(BATTERY_SYSTEM_USAGE);
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeUnAccounted_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeOverAccounted_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeIdle_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.IDLE;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeCell_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.CELL;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeScreen_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeWifi_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.WIFI;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeBluetooth_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeSystem_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(Process.ROOT_UID);
-        when(mProvider.isTypeSystem(any())).thenReturn(true);
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_UidNormal_ReturnFalse() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isFalse();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeService_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        when(mProvider.isTypeService(any())).thenReturn(true);
-
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testCalculateBatteryPercent() {
-        assertThat(mBatteryUtils.calculateBatteryPercent(BATTERY_SYSTEM_USAGE, TOTAL_BATTERY_USAGE,
-                HIDDEN_USAGE, DISCHARGE_AMOUNT))
-                .isWithin(PRECISION).of(PERCENT_SYSTEM_USAGE);
-    }
-
-    @Test
-    public void testSmearScreenBatterySipper() {
-        final BatterySipper sipperNull = createTestSmearBatterySipper(TIME_FOREGROUND_ZERO,
-                BATTERY_APP_USAGE, 0 /* uid */, true /* isUidNull */);
-        final BatterySipper sipperBg = createTestSmearBatterySipper(TIME_FOREGROUND_ZERO,
-                BATTERY_APP_USAGE, 1 /* uid */, false /* isUidNull */);
-        final BatterySipper sipperFg = createTestSmearBatterySipper(TIME_FOREGROUND,
-                BATTERY_APP_USAGE, 2 /* uid */, false /* isUidNull */);
-        final BatterySipper sipperFg2 = createTestSmearBatterySipper(TIME_FOREGROUND,
-                BATTERY_APP_USAGE, 3 /* uid */, false /* isUidNull */);
-
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(sipperNull);
-        sippers.add(sipperBg);
-        sippers.add(sipperFg);
-        sippers.add(sipperFg2);
-
-        mBatteryUtils.smearScreenBatterySipper(sippers, mScreenBatterySipper);
-
-        assertThat(sipperNull.totalPowerMah).isWithin(PRECISION).of(BATTERY_APP_USAGE);
-        assertThat(sipperBg.totalPowerMah).isWithin(PRECISION).of(BATTERY_APP_USAGE);
-        assertThat(sipperFg.totalPowerMah).isWithin(PRECISION).of(
-                BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE / 2);
-        assertThat(sipperFg2.totalPowerMah).isWithin(PRECISION).of(
-                BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE / 2);
-    }
-
-    @Test
-    public void testCalculateRunningTimeBasedOnStatsType() {
-        assertThat(mBatteryUtils.calculateRunningTimeBasedOnStatsType(mBatteryStatsHelper,
-                BatteryStats.STATS_SINCE_CHARGED)).isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
-    }
-
-    @Test
-    public void testSortUsageList() {
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(mNormalBatterySipper);
-        sippers.add(mScreenBatterySipper);
-        sippers.add(mSystemBatterySipper);
-
-        mBatteryUtils.sortUsageList(sippers);
-
-        assertThat(sippers).containsExactly(mNormalBatterySipper, mSystemBatterySipper,
-                mScreenBatterySipper);
-    }
-
-    @Test
-    public void testCalculateLastFullChargeTime() {
-        final long currentTimeMs = System.currentTimeMillis();
-        when(mBatteryStatsHelper.getStats().getStartClockTime()).thenReturn(
-                currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS);
-
-        assertThat(mBatteryUtils.calculateLastFullChargeTime(
-                mBatteryStatsHelper, currentTimeMs)).isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
-    }
-
-    @Test
-    public void testGetSummaryResIdFromAnomalyType() {
-        assertThat(mBatteryUtils.getSummaryResIdFromAnomalyType(Anomaly.AnomalyType.WAKE_LOCK))
-                .isEqualTo(R.string.battery_abnormal_wakelock_summary);
-        assertThat(mBatteryUtils.getSummaryResIdFromAnomalyType(Anomaly.AnomalyType.WAKEUP_ALARM))
-                .isEqualTo(R.string.battery_abnormal_wakeup_alarm_summary);
-        assertThat(mBatteryUtils.getSummaryResIdFromAnomalyType(Anomaly.AnomalyType.BLUETOOTH_SCAN))
-                .isEqualTo(R.string.battery_abnormal_location_summary);
-    }
-
-    @Test
-    public void testGetForegroundActivityTotalTimeMs_returnMilliseconds() {
-        final long rawRealtimeUs = SystemClock.elapsedRealtime() * 1000;
-        doReturn(mTimer).when(mUid).getForegroundActivityTimer();
-        doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer)
-                .getTotalTimeLocked(rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED);
-
-        assertThat(mBatteryUtils.getForegroundActivityTotalTimeUs(mUid, rawRealtimeUs)).isEqualTo(
-                TIME_SINCE_LAST_FULL_CHARGE_US);
-    }
-
-    @Test
-    public void testGetTargetSdkVersion_packageExist_returnSdk() throws
-            PackageManager.NameNotFoundException {
-        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
-                PackageManager.GET_META_DATA);
-        mApplicationInfo.targetSdkVersion = SDK_VERSION;
-
-        assertThat(mBatteryUtils.getTargetSdkVersion(PACKAGE_NAME)).isEqualTo(SDK_VERSION);
-    }
-
-    @Test
-    public void testGetTargetSdkVersion_packageNotExist_returnSdkNull() throws
-            PackageManager.NameNotFoundException {
-        doThrow(new PackageManager.NameNotFoundException()).when(
-                mPackageManager).getApplicationInfo(PACKAGE_NAME, PackageManager.GET_META_DATA);
-
-        assertThat(mBatteryUtils.getTargetSdkVersion(PACKAGE_NAME)).isEqualTo(
-                BatteryUtils.SDK_NULL);
-    }
-
-    @Test
-    public void testBackgroundRestrictionOn_restrictionOn_returnTrue() {
-        doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager).checkOpNoThrow(
-                AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
-
-        assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID,
-                PACKAGE_NAME)).isTrue();
-    }
-
-    @Test
-    public void testBackgroundRestrictionOn_restrictionOff_returnFalse() {
-        doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager).checkOpNoThrow(
-                AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
-
-        assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID,
-                PACKAGE_NAME)).isFalse();
-    }
-
-    private BatterySipper createTestSmearBatterySipper(long topTime,
-            double totalPowerMah, int uidCode, boolean isUidNull) {
-        final BatterySipper sipper = mock(BatterySipper.class);
-        sipper.drainType = BatterySipper.DrainType.APP;
-        sipper.totalPowerMah = totalPowerMah;
-        doReturn(uidCode).when(sipper).getUid();
-        if (!isUidNull) {
-            final BatteryStats.Uid uid = mock(BatteryStats.Uid.class, RETURNS_DEEP_STUBS);
-            doReturn(topTime).when(mBatteryUtils).getProcessTimeMs(
-                    eq(BatteryUtils.StatusType.SCREEN_USAGE), eq(uid), anyInt());
-            doReturn(uidCode).when(uid).getUid();
-            sipper.uidObj = uid;
-        }
-
-        return sipper;
-    }
-
-    @Test
-    public void testInitBatteryStatsHelper_init() {
-        mBatteryUtils.initBatteryStatsHelper(mBatteryStatsHelper, mBundle, mUserManager);
-
-        verify(mBatteryStatsHelper).create(mBundle);
-        verify(mBatteryStatsHelper).refreshStats(BatteryStats.STATS_SINCE_CHARGED,
-                mUserManager.getUserProfiles());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
deleted file mode 100644
index dec445d911e6b14706834885033ee0e260a1ab0c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.DialogInterface;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowDialog;
-import org.robolectric.util.FragmentTestUtil;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
-        ShadowEventLogWriter.class
-})
-public class ButtonActionDialogFragmentTest {
-    private static final int FORCE_STOP_ID = ButtonActionDialogFragment.DialogType.FORCE_STOP;
-    private static final int DISABLE_ID = ButtonActionDialogFragment.DialogType.DISABLE;
-    private static final int SPECIAL_DISABLE_ID =
-            ButtonActionDialogFragment.DialogType.SPECIAL_DISABLE;
-    @Mock
-    private TestFragment mTargetFragment;
-    private ButtonActionDialogFragment mFragment;
-    private Context mShadowContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mShadowContext = RuntimeEnvironment.application;
-
-        mFragment = spy(ButtonActionDialogFragment.newInstance(FORCE_STOP_ID));
-        doReturn(mShadowContext).when(mFragment).getContext();
-        mFragment.setTargetFragment(mTargetFragment, 0);
-    }
-
-    @Test
-    public void testOnClick_handleToTargetFragment() {
-        mFragment.onClick(null, 0);
-
-        verify(mTargetFragment).handleDialogClick(anyInt());
-    }
-
-    @Test
-    public void testOnCreateDialog_forceStopDialog() {
-        ButtonActionDialogFragment fragment = ButtonActionDialogFragment.newInstance(FORCE_STOP_ID);
-
-        FragmentTestUtil.startFragment(fragment);
-
-        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
-        ShadowAlertDialog shadowDialog = shadowOf(dialog);
-
-        assertThat(shadowDialog.getMessage()).isEqualTo(
-                mShadowContext.getString(R.string.force_stop_dlg_text));
-        assertThat(shadowDialog.getTitle()).isEqualTo(
-                mShadowContext.getString(R.string.force_stop_dlg_title));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
-                mShadowContext.getString(R.string.dlg_ok));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
-                mShadowContext.getString(R.string.dlg_cancel));
-    }
-
-    @Test
-    public void testOnCreateDialog_disableDialog() {
-        ButtonActionDialogFragment fragment = ButtonActionDialogFragment.newInstance(DISABLE_ID);
-
-        FragmentTestUtil.startFragment(fragment);
-
-        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
-        ShadowAlertDialog shadowDialog = shadowOf(dialog);
-
-        assertThat(shadowDialog.getMessage()).isEqualTo(
-                mShadowContext.getString(R.string.app_disable_dlg_text));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
-                mShadowContext.getString(R.string.app_disable_dlg_positive));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
-                mShadowContext.getString(R.string.dlg_cancel));
-    }
-
-    @Test
-    public void testOnCreateDialog_specialDisableDialog() {
-        ButtonActionDialogFragment fragment = ButtonActionDialogFragment.newInstance(
-                SPECIAL_DISABLE_ID);
-
-        FragmentTestUtil.startFragment(fragment);
-
-        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
-        ShadowAlertDialog shadowDialog = shadowOf(dialog);
-
-        assertThat(shadowDialog.getMessage()).isEqualTo(
-                mShadowContext.getString(R.string.app_disable_dlg_text));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
-                mShadowContext.getString(R.string.app_disable_dlg_positive));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
-                mShadowContext.getString(R.string.dlg_cancel));
-    }
-
-    /**
-     * Test fragment that used as the target fragment, it must implement the
-     * {@link com.android.settings.fuelgauge.ButtonActionDialogFragment.AppButtonsDialogListener}
-     */
-    public static class TestFragment extends Fragment implements
-            ButtonActionDialogFragment.AppButtonsDialogListener {
-
-        @Override
-        public void handleDialogClick(int type) {
-            // do nothing
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
deleted file mode 100644
index d87020e5d11e568158b362a957a10614a7e44cb5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class HighPowerDetailTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        // Deny means app is whitelisted to opt out of power save restrictions
-        HighPowerDetail.logSpecialPermissionChange(true, "app", mContext);
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY), eq("app"));
-
-        // Allow means app is NOT whitelisted to opt out of power save restrictions
-        HighPowerDetail.logSpecialPermissionChange(false, "app", mContext);
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW), eq("app"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
deleted file mode 100644
index 1259670014cdb81a6f17ed78938f69374236ef82..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.VectorDrawable;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PowerGaugePreferenceTest {
-    private static final String SUBTITLE = "Summary";
-    private static final String CONTENT_DESCRIPTION = "Content description";
-    private Context mContext;
-    private PowerGaugePreference mPowerGaugePreference;
-    private View mRootView;
-    private View mWidgetView;
-    private PreferenceViewHolder mPreferenceViewHolder;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference,
-                null);
-        mWidgetView = LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary,
-                null);
-        ((LinearLayout) mRootView.findViewById(android.R.id.widget_frame)).addView(mWidgetView);
-        mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
-
-        mPowerGaugePreference = new PowerGaugePreference(mContext);
-    }
-
-    @Test
-    public void testOnBindViewHolder_bindSubtitle() {
-        mPowerGaugePreference.setSubtitle(SUBTITLE);
-        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
-
-        assertThat(((TextView) mPreferenceViewHolder.findViewById(
-                R.id.widget_summary)).getText()).isEqualTo(SUBTITLE);
-    }
-
-    @Test
-    public void testOnBindViewHolder_showAnomaly_bindAnomalyIcon() {
-        mPowerGaugePreference.shouldShowAnomalyIcon(true);
-        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
-
-        final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
-                R.id.widget_summary)).getCompoundDrawablesRelative();
-
-        assertThat(drawables[0]).isInstanceOf(VectorDrawable.class);
-    }
-
-    @Test
-    public void testOnBindViewHolder_notShowAnomaly_bindAnomalyIcon() {
-        mPowerGaugePreference.shouldShowAnomalyIcon(false);
-        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
-
-        final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
-                R.id.widget_summary)).getCompoundDrawablesRelative();
-
-        assertThat(drawables[0]).isNull();
-    }
-
-    @Test
-    public void testOnBindViewHolder_bindContentDescription() {
-        mPowerGaugePreference.setContentDescription(CONTENT_DESCRIPTION);
-        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
-
-        assertThat(mPreferenceViewHolder.findViewById(android.R.id.title).getContentDescription())
-                .isEqualTo(CONTENT_DESCRIPTION);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
deleted file mode 100644
index 364301327339328eea0b693071a9d5c49a8c6f21..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.os.UserManager;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-
-import android.view.View;
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatterySipper.DrainType;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.R;
-import com.android.settings.testutils.BatteryTestUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.Utils;
-import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData;
-import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PowerUsageAdvancedTest {
-    private static final int FAKE_UID_1 = 50;
-    private static final int FAKE_UID_2 = 100;
-    private static final int DISCHARGE_AMOUNT = 60;
-    private static final double TYPE_APP_USAGE = 80;
-    private static final double TYPE_BLUETOOTH_USAGE = 50;
-    private static final double TYPE_WIFI_USAGE = 0;
-    private static final double TOTAL_USAGE = TYPE_APP_USAGE * 2 + TYPE_BLUETOOTH_USAGE
-            + TYPE_WIFI_USAGE;
-    private static final double TOTAL_POWER = 500;
-    private static final double PRECISION = 0.001;
-    private static final String STUB_STRING = "stub_string";
-    @Mock
-    private BatterySipper mNormalBatterySipper;
-    @Mock
-    private BatterySipper mMaxBatterySipper;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private BatteryHistoryPreference mHistPref;
-    @Mock
-    private PreferenceGroup mUsageListGroup;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    private PowerUsageAdvanced mPowerUsageAdvanced;
-    private PowerUsageData mPowerUsageData;
-    private Context mShadowContext;
-    private Intent mDischargingBatteryIntent;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mShadowContext = spy(RuntimeEnvironment.application);
-        mPowerUsageAdvanced = spy(new PowerUsageAdvanced());
-
-        List<BatterySipper> batterySippers = new ArrayList<>();
-        batterySippers.add(new BatterySipper(DrainType.APP,
-                new FakeUid(FAKE_UID_1), TYPE_APP_USAGE));
-        batterySippers.add(new BatterySipper(DrainType.APP,
-                new FakeUid(FAKE_UID_2), TYPE_APP_USAGE));
-        batterySippers.add(new BatterySipper(DrainType.BLUETOOTH, new FakeUid(FAKE_UID_1),
-                TYPE_BLUETOOTH_USAGE));
-        batterySippers.add(new BatterySipper(DrainType.WIFI, new FakeUid(FAKE_UID_1),
-                TYPE_WIFI_USAGE));
-
-        mDischargingBatteryIntent = BatteryTestUtils.getDischargingIntent();
-        doReturn(mDischargingBatteryIntent).when(mShadowContext).registerReceiver(any(), any());
-        when(mBatteryStatsHelper.getStats().getDischargeAmount(anyInt())).thenReturn(
-                DISCHARGE_AMOUNT);
-        when(mBatteryStatsHelper.getUsageList()).thenReturn(batterySippers);
-        when(mBatteryStatsHelper.getTotalPower()).thenReturn(TOTAL_USAGE);
-        when(mPowerUsageAdvanced.getContext()).thenReturn(mShadowContext);
-        doReturn(STUB_STRING).when(mPowerUsageAdvanced).getString(anyInt(), any(), any());
-        doReturn(STUB_STRING).when(mPowerUsageAdvanced).getString(anyInt(), any());
-        doReturn(mShadowContext.getText(R.string.battery_used_for)).when(
-                mPowerUsageAdvanced).getText(R.string.battery_used_for);
-        mPowerUsageAdvanced.setPackageManager(mPackageManager);
-        mPowerUsageAdvanced.setPowerUsageFeatureProvider(mPowerUsageFeatureProvider);
-        mPowerUsageAdvanced.setUserManager(mUserManager);
-        mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext));
-        when(mShadowContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
-                mConnectivityManager);
-
-        mPowerUsageData = new PowerUsageData(UsageType.USER);
-        mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
-        mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
-        mNormalBatterySipper.drainType = DrainType.SCREEN;
-    }
-
-    @Test
-    public void testPrefs_shouldNotBeSelectable() {
-        PreferenceManager pm = new PreferenceManager(mShadowContext);
-        when(mPowerUsageAdvanced.getPreferenceManager()).thenReturn(pm);
-        PreferenceGroup prefGroup = spy(new PreferenceCategory(mShadowContext));
-        when(prefGroup.getPreferenceManager()).thenReturn(pm);
-
-        mPowerUsageAdvanced.refreshPowerUsageDataList(mBatteryStatsHelper, prefGroup);
-        assertThat(prefGroup.getPreferenceCount()).isAtLeast(1);
-        for (int i = 0, count = prefGroup.getPreferenceCount(); i < count; i++) {
-            PowerGaugePreference pref = (PowerGaugePreference) prefGroup.getPreference(i);
-            assertThat(pref.isSelectable()).isFalse();
-        }
-    }
-
-    @Test
-    public void testExtractUsageType_TypeSystem_ReturnSystem() {
-        mNormalBatterySipper.drainType = DrainType.APP;
-        when(mPowerUsageFeatureProvider.isTypeSystem(any())).thenReturn(true);
-
-        assertThat(mPowerUsageAdvanced.extractUsageType(mNormalBatterySipper))
-                .isEqualTo(UsageType.SYSTEM);
-    }
-
-    @Test
-    public void testExtractUsageType_TypeEqualsToDrainType_ReturnRelevantType() {
-        final DrainType drainTypes[] = {DrainType.WIFI, DrainType.BLUETOOTH, DrainType.IDLE,
-                DrainType.USER, DrainType.CELL, DrainType.UNACCOUNTED};
-        final int usageTypes[] = {UsageType.WIFI, UsageType.BLUETOOTH, UsageType.IDLE,
-                UsageType.USER, UsageType.CELL, UsageType.UNACCOUNTED};
-
-        assertThat(drainTypes.length).isEqualTo(usageTypes.length);
-        for (int i = 0, size = drainTypes.length; i < size; i++) {
-            mNormalBatterySipper.drainType = drainTypes[i];
-            assertThat(mPowerUsageAdvanced.extractUsageType(mNormalBatterySipper))
-                    .isEqualTo(usageTypes[i]);
-        }
-    }
-
-    @Test
-    public void testExtractUsageType_TypeService_ReturnSystem() {
-        mNormalBatterySipper.drainType = DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(FAKE_UID_1);
-        when(mPowerUsageFeatureProvider.isTypeService(any())).thenReturn(true);
-
-        assertThat(mPowerUsageAdvanced.extractUsageType(mNormalBatterySipper))
-                .isEqualTo(UsageType.SYSTEM);
-    }
-
-    @Test
-    public void testParsePowerUsageData_PercentageCalculatedCorrectly() {
-        final double percentApp = TYPE_APP_USAGE * 2 / TOTAL_USAGE * DISCHARGE_AMOUNT;
-        final double percentWifi = TYPE_WIFI_USAGE / TOTAL_USAGE * DISCHARGE_AMOUNT;
-        final double percentBluetooth = TYPE_BLUETOOTH_USAGE / TOTAL_USAGE * DISCHARGE_AMOUNT;
-
-        List<PowerUsageData> batteryData =
-                mPowerUsageAdvanced.parsePowerUsageData(mBatteryStatsHelper);
-        for (PowerUsageData data : batteryData) {
-            switch (data.usageType) {
-                case UsageType.WIFI:
-                    assertThat(data.percentage).isWithin(PRECISION).of(percentWifi);
-                    break;
-                case UsageType.APP:
-                    assertThat(data.percentage).isWithin(PRECISION).of(percentApp);
-                    break;
-                case UsageType.BLUETOOTH:
-                    assertThat(data.percentage).isWithin(PRECISION).of(percentBluetooth);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    @Test
-    public void testUpdateUsageDataSummary_onlyOneApp_showUsageTime() {
-        final String expectedSummary = "Used for 0m";
-        mPowerUsageData.usageList.add(mNormalBatterySipper);
-
-        mPowerUsageAdvanced.updateUsageDataSummary(mPowerUsageData, TOTAL_POWER, DISCHARGE_AMOUNT);
-
-        assertThat(mPowerUsageData.summary.toString()).isEqualTo(expectedSummary);
-    }
-
-    @Test
-    public void testUpdateUsageDataSummary_typeIdle_showUsageTime() {
-        mPowerUsageData.usageType = UsageType.IDLE;
-        mPowerUsageData.usageList.add(mNormalBatterySipper);
-
-        mPowerUsageAdvanced.updateUsageDataSummary(mPowerUsageData, TOTAL_POWER, DISCHARGE_AMOUNT);
-
-        assertThat(mPowerUsageData.summary.toString()).isEqualTo("0m");
-    }
-
-    @Test
-    public void testUpdateUsageDataSummary_moreThanOneApp_showMaxUsageApp() {
-        mPowerUsageData.usageList.add(mNormalBatterySipper);
-        mPowerUsageData.usageList.add(mMaxBatterySipper);
-        doReturn(mMaxBatterySipper).when(mPowerUsageAdvanced).findBatterySipperWithMaxBatteryUsage(
-                mPowerUsageData.usageList);
-        final double percentage = (TYPE_BLUETOOTH_USAGE / TOTAL_POWER) * DISCHARGE_AMOUNT;
-        mPowerUsageAdvanced.updateUsageDataSummary(mPowerUsageData, TOTAL_POWER, DISCHARGE_AMOUNT);
-
-        verify(mPowerUsageAdvanced).getString(eq(R.string.battery_used_by),
-                eq(Utils.formatPercentage(percentage, true)), any());
-    }
-
-    @Test
-    public void testFindBatterySipperWithMaxBatteryUsage_findCorrectOne() {
-        mPowerUsageData.usageList.add(mNormalBatterySipper);
-        mPowerUsageData.usageList.add(mMaxBatterySipper);
-        BatterySipper sipper = mPowerUsageAdvanced.findBatterySipperWithMaxBatteryUsage(
-                mPowerUsageData.usageList);
-
-        assertThat(sipper).isEqualTo(mMaxBatterySipper);
-    }
-
-    @Test
-    public void testInit_ContainsAllUsageType() {
-        final int[] usageTypeSet = mPowerUsageAdvanced.mUsageTypes;
-
-        assertThat(usageTypeSet).asList().containsExactly(UsageType.APP, UsageType.WIFI,
-                UsageType.CELL, UsageType.BLUETOOTH, UsageType.IDLE, UsageType.USER,
-                UsageType.SYSTEM, UsageType.UNACCOUNTED, UsageType.OVERCOUNTED);
-    }
-
-    @Test
-    public void testPowerUsageData_SortedByUsage() {
-        List<PowerUsageData> dataList = new ArrayList<>();
-
-        dataList.add(new PowerUsageData(UsageType.WIFI, TYPE_WIFI_USAGE));
-        dataList.add(new PowerUsageData(UsageType.BLUETOOTH, TYPE_BLUETOOTH_USAGE));
-        dataList.add(new PowerUsageData(UsageType.APP, TYPE_APP_USAGE));
-        Collections.sort(dataList);
-
-        for (int i = 1, size = dataList.size(); i < size; i++) {
-            assertThat(dataList.get(i - 1).totalPowerMah).isAtLeast(dataList.get(i).totalPowerMah);
-        }
-    }
-
-    @Test
-    public void testShouldHideCategory_typeUnAccounted_returnTrue() {
-        mPowerUsageData.usageType = UsageType.UNACCOUNTED;
-
-        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideCategory_typeOverCounted_returnTrue() {
-        mPowerUsageData.usageType = UsageType.OVERCOUNTED;
-
-        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideCategory_typeUserAndOnlyOne_returnTrue() {
-        mPowerUsageData.usageType = UsageType.USER;
-        doReturn(1).when(mUserManager).getUserCount();
-
-        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideCategory_typeCellWhileNotSupported_returnTrue() {
-        mPowerUsageData.usageType = UsageType.CELL;
-        doReturn(false).when(mConnectivityManager).isNetworkSupported(
-                ConnectivityManager.TYPE_MOBILE);
-
-        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideCategory_typeCellWhileSupported_returnFalse() {
-        mPowerUsageData.usageType = UsageType.CELL;
-        doReturn(true).when(mConnectivityManager).isNetworkSupported(
-                ConnectivityManager.TYPE_MOBILE);
-
-        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
-    }
-
-    @Test
-    public void testShouldHideCategory_typeUserAndMoreThanOne_returnFalse() {
-        mPowerUsageData.usageType = UsageType.USER;
-        doReturn(2).when(mUserManager).getUserCount();
-
-        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
-    }
-
-    @Test
-    public void testShouldHideCategory_typeNormal_returnFalse() {
-        mPowerUsageData.usageType = UsageType.APP;
-
-        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
-    }
-
-    @Test
-    public void testShouldHideSummary_typeCell_returnTrue() {
-        mPowerUsageData.usageType = UsageType.CELL;
-
-        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSummary_typeSystem_returnTrue() {
-        mPowerUsageData.usageType = UsageType.SYSTEM;
-
-        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSummary_typeWifi_returnTrue() {
-        mPowerUsageData.usageType = UsageType.WIFI;
-
-        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSummary_typeBluetooth_returnTrue() {
-        mPowerUsageData.usageType = UsageType.BLUETOOTH;
-
-        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSummary_typeApp_returnTrue() {
-        mPowerUsageData.usageType = UsageType.APP;
-
-        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSummary_typeNormal_returnFalse() {
-        mPowerUsageData.usageType = UsageType.IDLE;
-
-        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
-    }
-
-    @Test
-    public void testShouldShowBatterySipper_typeScreen_returnFalse() {
-        mNormalBatterySipper.drainType = DrainType.SCREEN;
-
-        assertThat(mPowerUsageAdvanced.shouldShowBatterySipper(mNormalBatterySipper)).isFalse();
-    }
-
-    @Test
-    public void testShouldShowBatterySipper_typeNormal_returnTrue() {
-        mNormalBatterySipper.drainType = DrainType.APP;
-
-        assertThat(mPowerUsageAdvanced.shouldShowBatterySipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testCalculateHiddenPower_returnCorrectPower() {
-        List<PowerUsageData> powerUsageDataList = new ArrayList<>();
-        final double unaccountedPower = 100;
-        final double normalPower = 150;
-        powerUsageDataList.add(new PowerUsageData(UsageType.UNACCOUNTED, unaccountedPower));
-        powerUsageDataList.add(new PowerUsageData(UsageType.APP, normalPower));
-        powerUsageDataList.add(new PowerUsageData(UsageType.CELL, normalPower));
-
-        assertThat(mPowerUsageAdvanced.calculateHiddenPower(powerUsageDataList)).isWithin(
-                PRECISION).of(unaccountedPower);
-    }
-
-    @Test
-    public void testRefreshUi_addsSubtextWhenAppropriate() {
-        // Mock out all the battery stuff
-        mPowerUsageAdvanced.mHistPref = mHistPref;
-        mPowerUsageAdvanced.mStatsHelper = mBatteryStatsHelper;
-        doReturn(new ArrayList<PowerUsageData>())
-                .when(mPowerUsageAdvanced).parsePowerUsageData(any());
-        doReturn("").when(mPowerUsageAdvanced).getString(anyInt());
-        mPowerUsageAdvanced.mUsageListGroup = mUsageListGroup;
-
-        // refresh the ui and check that text was not updated when enhanced prediction disabled
-        when(mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any()))
-                .thenReturn(false);
-        mPowerUsageAdvanced.refreshUi();
-        verify(mHistPref, never()).setBottomSummary(any());
-
-        // refresh the ui and check that text was updated when enhanced prediction enabled
-        when(mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any())).thenReturn(true);
-        mPowerUsageAdvanced.refreshUi();
-        verify(mHistPref, atLeastOnce()).setBottomSummary(any());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
deleted file mode 100644
index c992d0aef6380e17f4dfd70401739233ff2c4a01..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-import android.util.IconDrawableFactory;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PowerUsageAnomalyDetailsTest {
-    private static final String NAME_APP_1 = "app1";
-    private static final String NAME_APP_2 = "app2";
-    private static final String NAME_APP_3 = "app3";
-    private static final String PACKAGE_NAME_1 = "com.android.app1";
-    private static final String PACKAGE_NAME_2 = "com.android.app2";
-    private static final String PACKAGE_NAME_3 = "com.android.app3";
-    private static final int USER_ID = 1;
-
-    @Mock
-    private SettingsActivity mSettingsActivity;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-    @Mock
-    private Drawable mDrawable1;
-    @Mock
-    private Drawable mDrawable2;
-    @Mock
-    private Drawable mDrawable3;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private IconDrawableFactory mIconDrawableFactory;
-    @Mock
-    private ApplicationInfo mApplicationInfo;
-    private Context mContext;
-    private PowerUsageAnomalyDetails mFragment;
-    private PreferenceGroup mAbnormalListGroup;
-    private Bundle mBundle;
-    private List<Anomaly> mAnomalyList;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mAbnormalListGroup = spy(new PreferenceCategory(mContext));
-
-        mAnomalyList = new ArrayList<>();
-        Anomaly anomaly1 = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKE_LOCK)
-                .setPackageName(PACKAGE_NAME_1)
-                .setDisplayName(NAME_APP_1)
-                .build();
-        mAnomalyList.add(anomaly1);
-        Anomaly anomaly2 = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setPackageName(PACKAGE_NAME_2)
-                .setDisplayName(NAME_APP_2)
-                .build();
-        mAnomalyList.add(anomaly2);
-        Anomaly anomaly3 = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
-                .setPackageName(PACKAGE_NAME_3)
-                .setDisplayName(NAME_APP_3)
-                .build();
-        mAnomalyList.add(anomaly3);
-
-        mFragment = spy(new PowerUsageAnomalyDetails());
-        mFragment.mAbnormalListGroup = mAbnormalListGroup;
-        mFragment.mAnomalies = mAnomalyList;
-        mFragment.mBatteryUtils = new BatteryUtils(mContext);
-        mFragment.mPackageManager = mPackageManager;
-        mFragment.mIconDrawableFactory = mIconDrawableFactory;
-        doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
-        doReturn(mContext).when(mPreferenceManager).getContext();
-    }
-
-    @Test
-    public void testRefreshUi_displayCorrectTitleAndSummary() {
-        final List<Preference> testPreferences = new ArrayList<>();
-        final ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(
-                Preference.class);
-        Answer<Void> prefCallable = new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                testPreferences.add(preferenceCaptor.getValue());
-                return null;
-            }
-        };
-        doAnswer(prefCallable).when(mAbnormalListGroup).addPreference(preferenceCaptor.capture());
-
-        mFragment.refreshUi();
-
-        final Preference wakelockPreference = testPreferences.get(0);
-        assertThat(wakelockPreference.getTitle()).isEqualTo(NAME_APP_1);
-        assertThat(wakelockPreference.getSummary()).isEqualTo("Keeping device awake");
-        final Preference wakeupPreference = testPreferences.get(1);
-        assertThat(wakeupPreference.getTitle()).isEqualTo(NAME_APP_2);
-        assertThat(wakeupPreference.getSummary()).isEqualTo("Waking up device in background");
-        final Preference bluetoothPreference = testPreferences.get(2);
-        assertThat(bluetoothPreference.getTitle()).isEqualTo(NAME_APP_3);
-        assertThat(bluetoothPreference.getSummary()).isEqualTo("Requesting location frequently");
-    }
-
-    @Test
-    public void testRefreshUi_iconCorrect() {
-        doReturn(mDrawable1).when(mFragment).getBadgedIcon(eq(PACKAGE_NAME_1), anyInt());
-        doReturn(mDrawable2).when(mFragment).getBadgedIcon(eq(PACKAGE_NAME_2), anyInt());
-        doReturn(mDrawable3).when(mFragment).getBadgedIcon(eq(PACKAGE_NAME_3), anyInt());
-
-        final List<Drawable> testIcons = new ArrayList<>();
-        final ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(
-                Preference.class);
-        Answer<Void> prefCallable = new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                testIcons.add(preferenceCaptor.getValue().getIcon());
-                return null;
-            }
-        };
-        doAnswer(prefCallable).when(mAbnormalListGroup).addPreference(preferenceCaptor.capture());
-
-        mFragment.refreshUi();
-
-        assertThat(testIcons).containsExactly(mDrawable1, mDrawable2, mDrawable3);
-    }
-
-    @Test
-    public void testStartBatteryAbnormalPage_dataCorrect() {
-        final ArgumentCaptor<Bundle> bundleCaptor = ArgumentCaptor.forClass(Bundle.class);
-        Answer<Void> bundleCallable = new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Exception {
-                mBundle = bundleCaptor.getValue();
-                return null;
-            }
-        };
-        doAnswer(bundleCallable).when(mSettingsActivity).startPreferencePanelAsUser(any(),
-                anyString(),
-                bundleCaptor.capture(), anyInt(), any(), any());
-
-        PowerUsageAnomalyDetails.startBatteryAbnormalPage(mSettingsActivity, mFragment,
-                mAnomalyList);
-
-        assertThat(mBundle.getParcelableArrayList(
-                PowerUsageAnomalyDetails.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalyList);
-    }
-
-    @Test
-    public void testGetBadgedIcon_usePackageNameAndUserId() throws
-            PackageManager.NameNotFoundException {
-        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME_1,
-                PackageManager.GET_META_DATA);
-
-        mFragment.getBadgedIcon(PACKAGE_NAME_1, USER_ID);
-
-        // Verify that it uses the correct user id
-        verify(mIconDrawableFactory).getBadgedIcon(mApplicationInfo, USER_ID);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
deleted file mode 100644
index afda69f04b81be387bb2844d7b3621b604f7d3e0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Process;
-import com.android.internal.os.BatterySipper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.when;
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PowerUsageFeatureProviderImplTest {
-    private static final int UID_OTHER = Process.FIRST_APPLICATION_UID + 2;
-    private static final int UID_CALENDAR = Process.FIRST_APPLICATION_UID + 3;
-    private static final int UID_MEDIA = Process.FIRST_APPLICATION_UID + 4;
-    private static final int UID_SYSTEMUI = Process.FIRST_APPLICATION_UID + 5;
-    private static final String[] PACKAGES_CALENDAR = {"com.android.providers.calendar"};
-    private static final String[] PACKAGES_MEDIA = {"com.android.providers.media"};
-    private static final String[] PACKAGES_SYSTEMUI = {"com.android.systemui"};
-    @Mock
-    private Context mContext;
-    @Mock
-    private BatterySipper mBatterySipper;
-    @Mock
-    private PackageManager mPackageManager;
-    private PowerUsageFeatureProviderImpl mPowerFeatureProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mPowerFeatureProvider = new PowerUsageFeatureProviderImpl(mContext);
-        when(mPackageManager.getPackagesForUid(UID_CALENDAR)).thenReturn(PACKAGES_CALENDAR);
-        when(mPackageManager.getPackagesForUid(UID_MEDIA)).thenReturn(PACKAGES_MEDIA);
-        when(mPackageManager.getPackagesForUid(UID_SYSTEMUI)).thenReturn(PACKAGES_SYSTEMUI);
-        mPowerFeatureProvider.mPackageManager = mPackageManager;
-        mBatterySipper.uidObj = new FakeUid(UID_OTHER);
-    }
-
-    @Test
-    public void testIsTypeSystem_uidRoot_returnTrue() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mBatterySipper.getUid()).thenReturn(Process.ROOT_UID);
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testIsTypeSystem_uidSystem_returnTrue() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testIsTypeSystem_uidMedia_returnTrue() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mBatterySipper.getUid()).thenReturn(Process.MEDIA_UID);
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testIsTypeSystem_appCalendar_returnTrue() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mBatterySipper.getUid()).thenReturn(UID_CALENDAR);
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testIsTypeSystem_appMedia_returnTrue() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mBatterySipper.getUid()).thenReturn(UID_MEDIA);
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testIsTypeSystem_appSystemUi_returnTrue() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mBatterySipper.getUid()).thenReturn(UID_SYSTEMUI);
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testIsTypeSystem_uidOther_returnFalse() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mBatterySipper.getUid()).thenReturn(UID_OTHER);
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
-    }
-
-    @Test
-    public void testIsTypeSystem_uidObjNull_returnFalse() {
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mBatterySipper.uidObj = null;
-
-        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
-    }
-
-    @Test
-    public void testIsAdvancedUiEnabled_returnTrue() {
-        assertThat(mPowerFeatureProvider.isAdvancedUiEnabled()).isTrue();
-    }
-
-    @Test
-    public void testIsPowerAccountingToggleEnabled_returnTrue() {
-        assertThat(mPowerFeatureProvider.isPowerAccountingToggleEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
deleted file mode 100644
index 48a48b1abcef74143da3c4d0ee794d292357329f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
-import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;
-import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.LoaderManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.util.SparseArray;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.internal.os.BatteryStatsImpl;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.Utils;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Unit tests for {@link PowerUsageSummary}.
- */
-// TODO: Improve this test class so that it starts up the real activity and fragment.
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-        })
-public class PowerUsageSummaryTest {
-    private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
-    private static final String STUB_STRING = "stub_string";
-    private static final int UID = 123;
-    private static final int UID_2 = 234;
-    private static final int POWER_MAH = 100;
-    private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
-    private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
-            TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
-    private static final int DISCHARGE_AMOUNT = 100;
-    private static final long USAGE_TIME_MS = 65 * 60 * 1000;
-    private static final double TOTAL_POWER = 200;
-    private static final double BATTERY_SCREEN_USAGE = 300;
-    private static final double BATTERY_SYSTEM_USAGE = 600;
-    private static final double BATTERY_OVERCOUNTED_USAGE = 500;
-    private static final double PRECISION = 0.001;
-    private static final double POWER_USAGE_PERCENTAGE = 50;
-    private static final Intent ADDITIONAL_BATTERY_INFO_INTENT =
-            new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
-    public static final String NEW_ML_EST_SUFFIX = "(New ML est)";
-    public static final String OLD_EST_SUFFIX = "(Old est)";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Menu mMenu;
-    @Mock
-    private MenuItem mAdditionalBatteryInfoMenu;
-    @Mock
-    private MenuItem mToggleAppsMenu;
-    @Mock
-    private MenuItem mHighPowerMenu;
-    @Mock
-    private MenuInflater mMenuInflater;
-    @Mock
-    private BatterySipper mNormalBatterySipper;
-    @Mock
-    private BatterySipper mScreenBatterySipper;
-    @Mock
-    private BatterySipper mCellBatterySipper;
-    @Mock
-    private LayoutPreference mBatteryLayoutPref;
-    @Mock
-    private TextView mBatteryPercentText;
-    @Mock
-    private TextView mSummary1;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryHelper;
-    @Mock
-    private PowerManager mPowerManager;
-    @Mock
-    private SettingsActivity mSettingsActivity;
-    @Mock
-    private LoaderManager mLoaderManager;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PreferenceGroup mAppListGroup;
-    @Mock
-    private AnomalyDetectionPolicy mAnomalyDetectionPolicy;
-    @Mock
-    private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
-
-    private List<BatterySipper> mUsageList;
-    private Context mRealContext;
-    private TestFragment mFragment;
-    private FakeFeatureFactory mFeatureFactory;
-    private BatteryMeterView mBatteryMeterView;
-    private PowerGaugePreference mPreference;
-    private PowerGaugePreference mScreenUsagePref;
-    private PowerGaugePreference mLastFullChargePref;
-    private SparseArray<List<Anomaly>> mAnomalySparseArray;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mRealContext = RuntimeEnvironment.application;
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        when(mContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);
-
-        mPreference = new PowerGaugePreference(mRealContext);
-        mScreenUsagePref = new PowerGaugePreference(mRealContext);
-        mLastFullChargePref = new PowerGaugePreference(mRealContext);
-        mFragment = spy(new TestFragment(mContext));
-        mFragment.initFeatureProvider();
-        mBatteryMeterView = new BatteryMeterView(mRealContext);
-        mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
-        doNothing().when(mFragment).restartBatteryStatsLoader();
-        doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();
-
-        when(mFragment.getActivity()).thenReturn(mSettingsActivity);
-        when(mAdditionalBatteryInfoMenu.getItemId())
-                .thenReturn(MENU_ADDITIONAL_BATTERY_INFO);
-        when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS);
-        when(mHighPowerMenu.getItemId()).thenReturn(MENU_HIGH_POWER_APPS);
-        when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
-                .thenReturn(ADDITIONAL_BATTERY_INFO_INTENT);
-        when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
-        when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
-                TIME_SINCE_LAST_FULL_CHARGE_US);
-
-        when(mNormalBatterySipper.getPackages()).thenReturn(PACKAGE_NAMES);
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        mNormalBatterySipper.totalPowerMah = POWER_MAH;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        mCellBatterySipper.drainType = BatterySipper.DrainType.CELL;
-        mCellBatterySipper.totalPowerMah = POWER_MAH;
-
-        when(mBatteryLayoutPref.findViewById(R.id.summary1)).thenReturn(mSummary1);
-        when(mBatteryLayoutPref.findViewById(R.id.battery_percent)).thenReturn(mBatteryPercentText);
-        when(mBatteryLayoutPref.findViewById(R.id.battery_header_icon))
-                .thenReturn(mBatteryMeterView);
-        mFragment.setBatteryLayoutPreference(mBatteryLayoutPref);
-
-        mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
-        mScreenBatterySipper.usageTimeMs = USAGE_TIME_MS;
-
-        mUsageList = new ArrayList<>();
-        mUsageList.add(mNormalBatterySipper);
-        mUsageList.add(mScreenBatterySipper);
-        mUsageList.add(mCellBatterySipper);
-
-        mFragment.mStatsHelper = mBatteryHelper;
-        when(mBatteryHelper.getUsageList()).thenReturn(mUsageList);
-        mFragment.mScreenUsagePref = mScreenUsagePref;
-        mFragment.mLastFullChargePref = mLastFullChargePref;
-        mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));
-        mFragment.mAppListGroup = mAppListGroup;
-    }
-
-    @Test
-    public void testOptionsMenu_additionalBatteryInfoEnabled() {
-        when(mFeatureFactory.powerUsageFeatureProvider.isAdditionalBatteryInfoEnabled())
-                .thenReturn(true);
-
-        mFragment.onCreateOptionsMenu(mMenu, mMenuInflater);
-
-        verify(mMenu).add(Menu.NONE, MENU_ADDITIONAL_BATTERY_INFO,
-                Menu.NONE, R.string.additional_battery_info);
-
-        mFragment.onOptionsItemSelected(mAdditionalBatteryInfoMenu);
-
-        assertThat(mFragment.mStartActivityCalled).isTrue();
-        assertThat(mFragment.mStartActivityIntent).isEqualTo(ADDITIONAL_BATTERY_INFO_INTENT);
-    }
-
-    @Test
-    public void testOptionsMenu_additionalBatteryInfoDisabled() {
-        when(mFeatureFactory.powerUsageFeatureProvider.isAdditionalBatteryInfoEnabled())
-                .thenReturn(false);
-
-        mFragment.onCreateOptionsMenu(mMenu, mMenuInflater);
-
-        verify(mMenu, never()).add(Menu.NONE, MENU_ADDITIONAL_BATTERY_INFO,
-                Menu.NONE, R.string.additional_battery_info);
-    }
-
-    @Test
-    public void testOptionsMenu_menuHighPower_metricEventInvoked() {
-        mFragment.onOptionsItemSelected(mHighPowerMenu);
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
-                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
-    }
-
-    @Test
-    public void testOptionsMenu_menuAdditionalBattery_metricEventInvoked() {
-        mFragment.onOptionsItemSelected(mAdditionalBatteryInfoMenu);
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
-                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
-    }
-
-    @Test
-    public void testOptionsMenu_menuAppToggle_metricEventInvoked() {
-        mFragment.onOptionsItemSelected(mToggleAppsMenu);
-        mFragment.mShowAllApps = false;
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
-                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, true);
-    }
-
-    @Test
-    public void testOptionsMenu_toggleAppsEnabled() {
-        when(mFeatureFactory.powerUsageFeatureProvider.isPowerAccountingToggleEnabled())
-                .thenReturn(true);
-        mFragment.mShowAllApps = false;
-
-        mFragment.onCreateOptionsMenu(mMenu, mMenuInflater);
-
-        verify(mMenu).add(Menu.NONE, MENU_TOGGLE_APPS, Menu.NONE, R.string.show_all_apps);
-    }
-
-    @Test
-    public void testOptionsMenu_clickToggleAppsMenu_dataChanged() {
-        testToggleAllApps(true);
-        testToggleAllApps(false);
-    }
-
-    @Test
-    public void testExtractKeyFromSipper_typeAPPUidObjectNull_returnPackageNames() {
-        mNormalBatterySipper.uidObj = null;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        final String key = mFragment.extractKeyFromSipper(mNormalBatterySipper);
-        assertThat(key).isEqualTo(TextUtils.concat(mNormalBatterySipper.getPackages()).toString());
-    }
-
-    @Test
-    public void testExtractKeyFromSipper_typeOther_returnDrainType() {
-        mNormalBatterySipper.uidObj = null;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
-
-        final String key = mFragment.extractKeyFromSipper(mNormalBatterySipper);
-        assertThat(key).isEqualTo(mNormalBatterySipper.drainType.toString());
-    }
-
-    @Test
-    public void testExtractKeyFromSipper_typeAPPUidObjectNotNull_returnUid() {
-        mNormalBatterySipper.uidObj = new BatteryStatsImpl.Uid(new BatteryStatsImpl(), UID);
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        final String key = mFragment.extractKeyFromSipper(mNormalBatterySipper);
-        assertThat(key).isEqualTo(Integer.toString(mNormalBatterySipper.getUid()));
-    }
-
-    @Test
-    public void testSetUsageSummary_timeLessThanOneMinute_DoNotSetSummary() {
-        mNormalBatterySipper.usageTimeMs = 59 * DateUtils.SECOND_IN_MILLIS;
-
-        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
-        assertThat(mPreference.getSummary()).isNull();
-    }
-
-    @Test
-    public void testSetUsageSummary_timeMoreThanOneMinute_normalApp_setScreenSummary() {
-        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
-        doReturn(mRealContext.getText(R.string.battery_used_for)).when(mFragment).getText(
-                R.string.battery_used_for);
-        doReturn(mRealContext).when(mFragment).getContext();
-
-        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
-
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2m");
-    }
-
-    @Test
-    public void testSetUsageSummary_timeMoreThanOneMinute_hiddenApp_setUsedSummary() {
-        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
-        doReturn(true).when(mFragment.mBatteryUtils).shouldHideSipper(mNormalBatterySipper);
-        doReturn(mRealContext).when(mFragment).getContext();
-
-        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
-
-        assertThat(mPreference.getSummary().toString()).isEqualTo("2m");
-    }
-
-    @Test
-    public void testSetUsageSummary_timeMoreThanOneMinute_notApp_setUsedSummary() {
-        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.PHONE;
-        doReturn(mRealContext).when(mFragment).getContext();
-
-        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
-
-        assertThat(mPreference.getSummary().toString()).isEqualTo("2m");
-    }
-
-    private void testToggleAllApps(final boolean isShowApps) {
-        mFragment.mShowAllApps = isShowApps;
-
-        mFragment.onOptionsItemSelected(mToggleAppsMenu);
-        assertThat(mFragment.mShowAllApps).isEqualTo(!isShowApps);
-    }
-
-    @Test
-    public void testFindBatterySipperByType_findTypeScreen() {
-        BatterySipper sipper = mFragment.findBatterySipperByType(mUsageList,
-                BatterySipper.DrainType.SCREEN);
-
-        assertThat(sipper).isSameAs(mScreenBatterySipper);
-    }
-
-    @Test
-    public void testFindBatterySipperByType_findTypeApp() {
-        BatterySipper sipper = mFragment.findBatterySipperByType(mUsageList,
-                BatterySipper.DrainType.APP);
-
-        assertThat(sipper).isSameAs(mNormalBatterySipper);
-    }
-
-    @Test
-    public void testUpdateScreenPreference_showCorrectSummary() {
-        doReturn(mScreenBatterySipper).when(mFragment).findBatterySipperByType(any(), any());
-        doReturn(mRealContext).when(mFragment).getContext();
-        final CharSequence expectedSummary = Utils.formatElapsedTime(mRealContext, USAGE_TIME_MS,
-                false);
-
-        mFragment.updateScreenPreference();
-
-        assertThat(mScreenUsagePref.getSubtitle()).isEqualTo(expectedSummary);
-    }
-
-    @Test
-    public void testUpdateLastFullChargePreference_showCorrectSummary() {
-        final CharSequence formattedString = mRealContext.getText(
-                R.string.power_last_full_charge_summary);
-        final CharSequence timeSequence = Utils.formatElapsedTime(mRealContext,
-                TIME_SINCE_LAST_FULL_CHARGE_MS, false);
-        final CharSequence expectedSummary = TextUtils.expandTemplate(
-                formattedString, timeSequence);
-        doReturn(formattedString).when(mFragment).getText(R.string.power_last_full_charge_summary);
-        doReturn(mRealContext).when(mFragment).getContext();
-
-        mFragment.updateLastFullChargePreference(TIME_SINCE_LAST_FULL_CHARGE_MS);
-
-        assertThat(mLastFullChargePref.getSubtitle()).isEqualTo(expectedSummary);
-    }
-
-    @Test
-    public void testUpdatePreference_usageListEmpty_shouldNotCrash() {
-        when(mBatteryHelper.getUsageList()).thenReturn(new ArrayList<BatterySipper>());
-        doReturn(STUB_STRING).when(mFragment).getString(anyInt(), any());
-        doReturn(mRealContext).when(mFragment).getContext();
-
-        // Should not crash when update
-        mFragment.updateScreenPreference();
-    }
-
-    @Test
-    public void testCalculatePercentage() {
-        final double percent = mFragment.calculatePercentage(POWER_MAH, DISCHARGE_AMOUNT);
-        assertThat(percent).isWithin(PRECISION).of(POWER_USAGE_PERCENTAGE);
-    }
-
-    @Test
-    public void testNonIndexableKeys_MatchPreferenceKeys() {
-        final Context context = RuntimeEnvironment.application;
-        final List<String> niks = PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.power_usage_summary);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-
-    @Test
-    public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
-        final Context context = RuntimeEnvironment.application;
-        final PowerUsageSummary fragment = new PowerUsageSummary();
-        final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                fragment.getPreferenceScreenResId());
-        final List<String> preferenceKeys = new ArrayList<>();
-
-        for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
-            preferenceKeys.add(controller.getPreferenceKey());
-        }
-
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
-    }
-
-    @Test
-    public void testUpdateAnomalySparseArray() {
-        mFragment.mAnomalySparseArray = new SparseArray<>();
-        final List<Anomaly> anomalies = new ArrayList<>();
-        final Anomaly anomaly1 = new Anomaly.Builder().setUid(UID).build();
-        final Anomaly anomaly2 = new Anomaly.Builder().setUid(UID).build();
-        final Anomaly anomaly3 = new Anomaly.Builder().setUid(UID_2).build();
-        anomalies.add(anomaly1);
-        anomalies.add(anomaly2);
-        anomalies.add(anomaly3);
-
-        mFragment.updateAnomalySparseArray(anomalies);
-
-        assertThat(mFragment.mAnomalySparseArray.get(UID)).containsExactly(anomaly1, anomaly2);
-        assertThat(mFragment.mAnomalySparseArray.get(UID_2)).containsExactly(anomaly3);
-    }
-
-    @Test
-    public void testInitAnomalyDetectionIfPossible_detectionEnabled_init() {
-        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
-        doReturn(mAnomalyDetectionPolicy).when(mFragment).getAnomalyDetectionPolicy();
-        when(mAnomalyDetectionPolicy.isAnomalyDetectionEnabled()).thenReturn(true);
-
-        mFragment.restartAnomalyDetectionIfPossible();
-
-        verify(mLoaderManager).restartLoader(eq(PowerUsageSummary.ANOMALY_LOADER), eq(Bundle.EMPTY),
-                any());
-    }
-
-    @Test
-    public void testShowBothEstimates_summariesAreBothModified() {
-        doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
-        doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary1);
-        mFragment.onLongClick(new View(mRealContext));
-        TextView summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
-        TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2);
-        Robolectric.flushBackgroundThreadScheduler();
-        assertThat(summary2.getText().toString().contains(NEW_ML_EST_SUFFIX));
-        assertThat(summary1.getText().toString().contains(OLD_EST_SUFFIX));
-    }
-
-    @Test
-    public void testSaveInstanceState_showAllAppsRestored() {
-        Bundle bundle = new Bundle();
-        mFragment.mShowAllApps = true;
-        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
-
-        mFragment.onSaveInstanceState(bundle);
-        mFragment.restoreSavedInstance(bundle);
-
-        assertThat(mFragment.mShowAllApps).isTrue();
-    }
-
-    @Test
-    public void testRefreshAnomalyIcon_containsAnomaly_showAnomalyIcon() {
-        PowerGaugePreference preference = new PowerGaugePreference(mRealContext);
-        final String key = mFragment.extractKeyFromUid(UID);
-        preference.setKey(key);
-        doReturn(preference).when(mAppListGroup).findPreference(key);
-        mFragment.mAnomalySparseArray = new SparseArray<>();
-        mFragment.mAnomalySparseArray.append(UID, null);
-
-        mFragment.refreshAnomalyIcon();
-
-        assertThat(preference.showAnomalyIcon()).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_typeOvercounted_returnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
-
-        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_typeUnaccounted_returnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
-
-        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_typeNormal_returnFalse() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isFalse();
-    }
-
-    @Test
-    public void testDebugMode() {
-        doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
-
-        mFragment.restartBatteryInfoLoader();
-        ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
-                View.OnLongClickListener.class);
-        verify(mSummary1).setOnLongClickListener(listener.capture());
-
-        // Calling the listener should disable it.
-        listener.getValue().onLongClick(mSummary1);
-        verify(mSummary1).setOnLongClickListener(null);
-
-        // Restarting the loader should reset the listener.
-        mFragment.restartBatteryInfoLoader();
-        verify(mSummary1, times(2)).setOnLongClickListener(any(View.OnLongClickListener.class));
-    }
-
-    @Test
-    public void testRestartBatteryStatsLoader_notClearHeader_quickUpdateNotInvoked() {
-        mFragment.mBatteryHeaderPreferenceController = mBatteryHeaderPreferenceController;
-
-        mFragment.restartBatteryStatsLoader(false /* clearHeader */);
-
-        verify(mBatteryHeaderPreferenceController, never()).quickUpdateHeaderPreference();
-    }
-
-    public static class TestFragment extends PowerUsageSummary {
-
-        private Context mContext;
-        private boolean mStartActivityCalled;
-        private Intent mStartActivityIntent;
-
-        public TestFragment(Context context) {
-            mContext = context;
-        }
-
-        @Override
-        public Context getContext() {
-            return mContext;
-        }
-
-        @Override
-        public void startActivity(Intent intent) {
-            mStartActivityCalled = true;
-            mStartActivityIntent = intent;
-        }
-
-        @Override
-        protected void refreshUi() {
-            // Leave it empty for toggle apps menu test
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
deleted file mode 100644
index 8d0762993740def6c211f05f96ccb05486740495..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.text.format.DateUtils;
-import android.util.KeyValueListParser;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AnomalyDetectionPolicyTest {
-    private static final String ANOMALY_DETECTION_CONSTANTS_VALUE =
-            "anomaly_detection_enabled=true"
-            + ",wakelock_enabled=false"
-            + ",wakelock_threshold=3000"
-            + ",wakeup_alarm_enabled=true"
-            + ",wakeup_alarm_threshold=100"
-            + ",wakeup_blacklisted_tags=tag1:tag2:with%2Ccomma:with%3Acolon"
-            + ",bluetooth_scan_enabled=true"
-            + ",bluetooth_scan_threshold=2000";
-    private Context mContext;
-    private KeyValueListParserWrapper mKeyValueListParserWrapper;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mKeyValueListParserWrapper = spy(
-                new KeyValueListParserWrapperImpl(new KeyValueListParser(',')));
-    }
-
-    @Test
-    public void testInit_usesConfigValues() {
-        AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
-
-        assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();
-        assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isFalse();
-        assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(3000);
-        assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isTrue();
-        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(100);
-        assertThat(anomalyDetectionPolicy.wakeupBlacklistedTags)
-                .containsExactly("tag1", "tag2", "with,comma", "with:colon");
-        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
-        assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(2000);
-    }
-
-    @Test
-    public void testInit_defaultValues() {
-        Settings.Global.putString(mContext.getContentResolver(),
-                Settings.Global.ANOMALY_DETECTION_CONSTANTS, "");
-        // Mock it to avoid noSuchMethodError
-        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(true));
-        doReturn(false).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(false));
-
-        AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
-                mKeyValueListParserWrapper);
-
-        assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isFalse();
-        assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isFalse();
-        assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(DateUtils.HOUR_IN_MILLIS);
-        assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isFalse();
-        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(10);
-        assertThat(anomalyDetectionPolicy.wakeupBlacklistedTags).isNull();
-        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isFalse();
-        assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(
-                30 * DateUtils.MINUTE_IN_MILLIS);
-    }
-
-    @Test
-    public void testIsAnomalyDetectorEnabled_usesConfigValues() {
-        AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
-
-        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
-                Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
-        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
-                Anomaly.AnomalyType.WAKEUP_ALARM)).isTrue();
-        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
-                Anomaly.AnomalyType.BLUETOOTH_SCAN)).isTrue();
-    }
-
-    @Test
-    public void testIsAnomalyDetectorEnabled_usesDefaultValues() {
-        Settings.Global.putString(mContext.getContentResolver(),
-                Settings.Global.ANOMALY_DETECTION_CONSTANTS, "");
-        // Mock it to avoid noSuchMethodError
-        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(true));
-        doReturn(false).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(false));
-
-        AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
-                mKeyValueListParserWrapper);
-
-        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
-                Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
-        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
-                Anomaly.AnomalyType.WAKEUP_ALARM)).isFalse();
-        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
-                Anomaly.AnomalyType.BLUETOOTH_SCAN)).isFalse();
-    }
-
-    private AnomalyDetectionPolicy createAnomalyPolicyWithConfig() {
-        Settings.Global.putString(mContext.getContentResolver(),
-                Settings.Global.ANOMALY_DETECTION_CONSTANTS, ANOMALY_DETECTION_CONSTANTS_VALUE);
-        // Mock it to avoid noSuchMethodError
-        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
-                AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, false);
-        doReturn(false).when(mKeyValueListParserWrapper).getBoolean(
-                AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, false);
-        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
-                AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false);
-        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
-                AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
-
-        return new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);
-    }
-
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
deleted file mode 100644
index 51a82c888328295ace47c420e7e9a8b78711b11c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Build;
-
-import com.android.settings.R;
-import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowDialog;
-import org.robolectric.util.FragmentTestUtil;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AnomalyDialogFragmentTest {
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final String DISPLAY_NAME = "app";
-    private static final int UID = 111;
-
-    @Mock
-    private AnomalyUtils mAnomalyUtils;
-    @Mock
-    private AnomalyAction mAnomalyAction;
-    private Anomaly mWakeLockAnomaly;
-    private Anomaly mWakeupAlarmAnomaly;
-    private Anomaly mWakeupAlarmAnomaly2;
-    private Anomaly mBluetoothAnomaly;
-    private AnomalyDialogFragment mAnomalyDialogFragment;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mWakeLockAnomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKE_LOCK)
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .build();
-        mWakeupAlarmAnomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .build();
-        mWakeupAlarmAnomaly2 = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .setTargetSdkVersion(Build.VERSION_CODES.O)
-                .build();
-        mBluetoothAnomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .build();
-        FakeFeatureFactory.setupForTest(mContext);
-    }
-
-    @Test
-    public void testOnCreateDialog_hasCorrectData() {
-        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeLockAnomaly,
-                0 /* metricskey */);
-        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
-
-        assertThat(mAnomalyDialogFragment.mAnomaly).isEqualTo(mWakeLockAnomaly);
-    }
-
-    @Test
-    public void testOnCreateDialog_wakelockAnomaly_fireForceStopDialog() {
-        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeLockAnomaly,
-                0 /* metricskey */);
-
-        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
-
-        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
-        ShadowAlertDialog shadowDialog = shadowOf(dialog);
-
-        assertThat(shadowDialog.getMessage()).isEqualTo(
-                mContext.getString(R.string.dialog_stop_message, mWakeLockAnomaly.displayName));
-        assertThat(shadowDialog.getTitle()).isEqualTo(
-                mContext.getString(R.string.dialog_stop_title));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
-                mContext.getString(R.string.dialog_stop_ok));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
-                mContext.getString(R.string.dlg_cancel));
-    }
-
-    @Test
-    public void testOnCreateDialog_wakeupAlarmAnomalyPriorO_fireStopAndBackgroundCheckDialog() {
-        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly,
-                0 /* metricskey */);
-
-        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
-
-        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
-        ShadowAlertDialog shadowDialog = shadowOf(dialog);
-
-        assertThat(shadowDialog.getMessage()).isEqualTo(
-                mContext.getString(R.string.dialog_background_check_message,
-                        mWakeLockAnomaly.displayName));
-        assertThat(shadowDialog.getTitle()).isEqualTo(
-                mContext.getString(R.string.dialog_background_check_title));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
-                mContext.getString(R.string.dialog_background_check_ok));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
-                mContext.getString(R.string.dlg_cancel));
-    }
-
-    @Test
-    public void testOnCreateDialog_wakeupAlarmAnomalyTargetingO_fireForceStopDialog() {
-        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly2,
-                0 /* metricskey */);
-
-        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
-
-        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
-        ShadowAlertDialog shadowDialog = shadowOf(dialog);
-
-        assertThat(shadowDialog.getMessage()).isEqualTo(
-                mContext.getString(R.string.dialog_stop_message_wakeup_alarm,
-                        mWakeLockAnomaly.displayName));
-        assertThat(shadowDialog.getTitle()).isEqualTo(
-                mContext.getString(R.string.dialog_stop_title));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
-                mContext.getString(R.string.dialog_stop_ok));
-        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
-                mContext.getString(R.string.dlg_cancel));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
deleted file mode 100644
index 48749d50860cbf04b1df953e7e35b1f5576ba845..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserManager;
-
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
-import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AnomalyLoaderTest {
-    private static final String PACKAGE_NAME = "com.android.settings";
-    private static final CharSequence DISPLAY_NAME = "Settings";
-    private static final int UID = 0;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private WakeLockAnomalyDetector mWakeLockAnomalyDetector;
-    @Mock
-    private WakeupAlarmAnomalyDetector mWakeupAlarmAnomalyDetector;
-    @Mock
-    private BluetoothScanAnomalyDetector mBluetoothScanAnomalyDetector;
-    @Mock
-    private AnomalyDetectionPolicy mAnomalyDetectionPolicy;
-    @Mock
-    private UserManager mUserManager;
-    private Anomaly mWakeLockAnomaly;
-    private Anomaly mWakeupAlarmAnomaly;
-    private Anomaly mBluetoothScanAnomaly;
-    private List<Anomaly> mWakeLockAnomalies;
-    private List<Anomaly> mWakeupAlarmAnomalies;
-    private List<Anomaly> mBluetoothScanAnomalies;
-    private AnomalyLoader mAnomalyLoader;
-
-    @Before
-    public void setUp() throws PackageManager.NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-
-        FakeFeatureFactory.setupForTest(mContext);
-        doReturn(true).when(mAnomalyDetectionPolicy).isAnomalyDetectorEnabled(anyInt());
-        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
-        when(mContext.getPackageManager().getPackageUid(anyString(), anyInt())).thenReturn(UID);
-
-        mWakeLockAnomalies = new ArrayList<>();
-        mWakeLockAnomaly = createAnomaly(Anomaly.AnomalyType.WAKE_LOCK);
-        mWakeLockAnomalies.add(mWakeLockAnomaly);
-        doReturn(mWakeLockAnomalies).when(mWakeLockAnomalyDetector).detectAnomalies(any(), any());
-
-        mWakeupAlarmAnomalies = new ArrayList<>();
-        mWakeupAlarmAnomaly = createAnomaly(Anomaly.AnomalyType.WAKEUP_ALARM);
-        mWakeupAlarmAnomalies.add(mWakeupAlarmAnomaly);
-        doReturn(mWakeupAlarmAnomalies).when(mWakeupAlarmAnomalyDetector).detectAnomalies(any(),
-                any());
-
-        mBluetoothScanAnomalies = new ArrayList<>();
-        mBluetoothScanAnomaly = createAnomaly(Anomaly.AnomalyType.BLUETOOTH_SCAN);
-        mBluetoothScanAnomalies.add(mBluetoothScanAnomaly);
-        doReturn(mBluetoothScanAnomalies).when(mBluetoothScanAnomalyDetector).detectAnomalies(any(),
-                any());
-
-        mAnomalyLoader = new AnomalyLoader(mContext, mBatteryStatsHelper, null,
-                mAnomalyDetectionPolicy);
-        mAnomalyLoader.mAnomalyUtils = spy(new AnomalyUtils(mContext));
-    }
-
-    @Test
-    public void testLoadInBackground_containsValidAnomalies() {
-        doReturn(mWakeLockAnomalyDetector).when(mAnomalyLoader.mAnomalyUtils).getAnomalyDetector(
-                Anomaly.AnomalyType.WAKE_LOCK);
-        doReturn(mWakeupAlarmAnomalyDetector).when(mAnomalyLoader.mAnomalyUtils).getAnomalyDetector(
-                Anomaly.AnomalyType.WAKEUP_ALARM);
-        doReturn(mBluetoothScanAnomalyDetector).when(
-                mAnomalyLoader.mAnomalyUtils).getAnomalyDetector(
-                Anomaly.AnomalyType.BLUETOOTH_SCAN);
-
-        List<Anomaly> anomalies = mAnomalyLoader.loadInBackground();
-
-        assertThat(anomalies).containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly,
-                mBluetoothScanAnomaly);
-    }
-
-    private Anomaly createAnomaly(@Anomaly.AnomalyType int type) {
-        return new Anomaly.Builder()
-                .setType(type)
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .build();
-    }
-
-    @Test
-    public void testGenerateFakeData() {
-        List<Anomaly> anomalies = mAnomalyLoader.generateFakeData();
-
-        assertThat(anomalies).containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly,
-                mBluetoothScanAnomaly);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
deleted file mode 100644
index c0157aee50fb0a078ec79cd09d6223809858c345..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AnomalyPreferenceTest {
-    @Anomaly.AnomalyType
-    private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final String DISPLAY_NAME = "app";
-    private static final int UID = 111;
-
-    private Context mContext;
-    private Anomaly mAnomaly;
-    private AnomalyPreference mAnomalyPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-
-        mAnomaly = new Anomaly.Builder()
-                .setType(ANOMALY_TYPE)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .setUid(UID)
-                .build();
-    }
-
-    @Test
-    public void testAnomalyPreference_containsCorrectData() {
-        mAnomalyPreference = new AnomalyPreference(mContext, mAnomaly);
-
-        assertThat(mAnomalyPreference.getTitle()).isEqualTo(DISPLAY_NAME);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
deleted file mode 100644
index 8297e810b60b13ec48531a9395ac0f55d7e3f898..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AnomalySummaryPreferenceControllerTest {
-    @Anomaly.AnomalyType
-    private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final String DISPLAY_NAME = "appName";
-    private static final int UID = 111;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceFragment mFragment;
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-    @Mock
-    private SettingsActivity mSettingsActivity;
-    private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
-    private Preference mPreference;
-    private Context mContext;
-    private List<Anomaly> mAnomalyList;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mPreference = new Preference(mContext);
-        mPreference.setKey(AnomalySummaryPreferenceController.ANOMALY_KEY);
-        when(mFragment.getPreferenceScreen().findPreference(any())).thenReturn(mPreference);
-        when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
-        when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
-        when(mFragment.getContext()).thenReturn(mContext);
-        when(mSettingsActivity.getApplicationContext()).thenReturn(mContext);
-
-        mAnomalyList = new ArrayList<>();
-
-        mAnomalySummaryPreferenceController = new AnomalySummaryPreferenceController(
-                mSettingsActivity, mFragment, 0 /* metricskey */);
-    }
-
-    @Test
-    public void testUpdateHighUsageSummaryPreference_hasCorrectData() {
-        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
-
-        assertThat(mAnomalySummaryPreferenceController.mAnomalies).isEqualTo(mAnomalyList);
-    }
-
-    @Test
-    public void testUpdateAnomalySummaryPreference_oneAnomaly_showCorrectSummary() {
-        mAnomalyList.add(createTestAnomaly());
-
-        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
-
-        assertThat(mPreference.getTitle()).isEqualTo("appName draining battery");
-        assertThat(mPreference.getSummary()).isEqualTo("Keeping device awake");
-    }
-
-    @Test
-    public void testUpdateAnomalySummaryPreference_emptyAnomaly_preferenceInvisible() {
-        mPreference.setVisible(true);
-        mAnomalyList.clear();
-
-        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
-
-        assertThat(mPreference.isVisible()).isFalse();
-    }
-
-    @Test
-    public void testUpdateAnomalySummaryPreference_multipleAnomalies_showCorrectSummary() {
-        mAnomalyList.add(createTestAnomaly());
-        mAnomalyList.add(createTestAnomaly());
-
-        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
-
-        assertThat(mPreference.getTitle()).isEqualTo("Apps draining battery");
-        assertThat(mPreference.getSummary()).isEqualTo("2 apps misbehaving");
-    }
-
-    @Test
-    public void testOnPreferenceTreeClick_oneAnomaly_showDialog() {
-
-        mAnomalyList.add(createTestAnomaly());
-        mAnomalySummaryPreferenceController.mAnomalies = mAnomalyList;
-
-        mAnomalySummaryPreferenceController.onPreferenceTreeClick(mPreference);
-
-        verify(mFragmentManager).beginTransaction();
-        verify(mFragmentTransaction).add(any(), anyString());
-        verify(mFragmentTransaction).commit();
-    }
-
-    private Anomaly createTestAnomaly() {
-        return new Anomaly.Builder()
-                .setType(ANOMALY_TYPE)
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .build();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
deleted file mode 100644
index 13a5b31d745b893be3bea3382d4c734b121257ae..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.os.Build;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AnomalyTest {
-    private static int TYPE = Anomaly.AnomalyType.WAKE_LOCK;
-    private static int UID = 111;
-    private static int SDK_VERSION = Build.VERSION_CODES.L;
-    private static long WAKE_LOCK_TIME_MS = 1500;
-    private static String PACKAGE_NAME = "com.android.settings";
-    private static String DISPLAY_NAME = "settings";
-    private static long BLUETOOTH_TIME_MS = 2555555;
-    private static int WAKEUP_ALARM_COUNT = 100;
-
-    private Anomaly mAnomaly;
-
-    @Before
-    public void setUp() {
-        mAnomaly = new Anomaly.Builder()
-                .setType(TYPE)
-                .setUid(UID)
-                .setWakeLockTimeMs(WAKE_LOCK_TIME_MS)
-                .setPackageName(PACKAGE_NAME)
-                .setDisplayName(DISPLAY_NAME)
-                .setTargetSdkVersion(SDK_VERSION)
-                .setBackgroundRestrictionEnabled(true)
-                .setBluetoothScanningTimeMs(BLUETOOTH_TIME_MS)
-                .setWakeupAlarmCount(WAKEUP_ALARM_COUNT)
-                .build();
-    }
-
-    @Test
-    public void testBuilder_buildCorrectly() {
-        assertThat(mAnomaly.type).isEqualTo(TYPE);
-        assertThat(mAnomaly.uid).isEqualTo(UID);
-        assertThat(mAnomaly.wakelockTimeMs).isEqualTo(WAKE_LOCK_TIME_MS);
-        assertThat(mAnomaly.packageName).isEqualTo(PACKAGE_NAME);
-        assertThat(mAnomaly.displayName).isEqualTo(DISPLAY_NAME);
-        assertThat(mAnomaly.targetSdkVersion).isEqualTo(SDK_VERSION);
-        assertThat(mAnomaly.backgroundRestrictionEnabled).isTrue();
-        assertThat(mAnomaly.wakeupAlarmCount).isEqualTo(WAKEUP_ALARM_COUNT);
-        assertThat(mAnomaly.bluetoothScanningTimeMs).isEqualTo(BLUETOOTH_TIME_MS);
-    }
-
-    @Test
-    public void testToString() {
-        assertThat(mAnomaly.toString()).isEqualTo(
-                "type=wakelock uid=111 package=com.android.settings displayName=settings"
-                        + " wakelockTimeMs=1500 wakeupAlarmCount=100 bluetoothTimeMs=2555555");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
deleted file mode 100644
index 38391c9350b4878049d7c00841a63048ae02cf09..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-
-import android.os.Build;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.fuelgauge.anomaly.action.StopAndBackgroundCheckAction;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.action.ForceStopAction;
-import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
-import com.android.settings.testutils.shadow.ShadowKeyValueListParserWrapperImpl;
-import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
-        ShadowKeyValueListParserWrapperImpl.class})
-public class AnomalyUtilsTest {
-    private static final String PACKAGE_NAME_WAKEUP = "com.android.app1";
-    private static final String PACKAGE_NAME_WAKELOCK = "com.android.app2";
-    private static final int CONTEXT_ID = 55;
-
-    @Mock
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-    private AnomalyUtils mAnomalyUtils;
-    private Anomaly mWakeupAnomaly;
-    private Anomaly mWakeLockAnomaly;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mAnomalyUtils = new AnomalyUtils(RuntimeEnvironment.application);
-
-        mWakeLockAnomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKE_LOCK)
-                .setPackageName(PACKAGE_NAME_WAKELOCK)
-                .build();
-        mWakeupAnomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setPackageName(PACKAGE_NAME_WAKEUP)
-                .build();
-    }
-
-    @Test
-    public void testGetAnomalyAction_typeWakeLock_returnForceStop() {
-        Anomaly anomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKE_LOCK)
-                .build();
-        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
-                ForceStopAction.class);
-    }
-
-    @Test
-    public void testGetAnomalyDetector_typeWakeLock_returnWakeLockDetector() {
-        assertThat(mAnomalyUtils.getAnomalyDetector(Anomaly.AnomalyType.WAKE_LOCK)).isInstanceOf(
-                WakeLockAnomalyDetector.class);
-    }
-
-    @Test
-    public void testGetAnomalyAction_typeWakeUpAlarmTargetO_returnForceStop() {
-        Anomaly anomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setTargetSdkVersion(Build.VERSION_CODES.O)
-                .build();
-        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
-                ForceStopAction.class);
-    }
-
-    @Test
-    public void testGetAnomalyAction_typeWakeUpAlarmTargetPriorOAndBgOff_returnStopAndBackground() {
-        Anomaly anomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setTargetSdkVersion(Build.VERSION_CODES.L)
-                .setBackgroundRestrictionEnabled(false)
-                .build();
-        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
-                StopAndBackgroundCheckAction.class);
-    }
-
-    @Test
-    public void testGetAnomalyAction_typeWakeUpAlarmTargetPriorOAndBgOn_returnForceStop() {
-        Anomaly anomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setTargetSdkVersion(Build.VERSION_CODES.L)
-                .setBackgroundRestrictionEnabled(true)
-                .build();
-        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
-                ForceStopAction.class);
-    }
-
-    @Test
-    public void testGetAnomalyDetector_typeWakeUpAlarm_returnWakeUpAlarmDetector() {
-        assertThat(mAnomalyUtils.getAnomalyDetector(Anomaly.AnomalyType.WAKEUP_ALARM)).isInstanceOf(
-                WakeupAlarmAnomalyDetector.class);
-    }
-
-    @Test
-    public void testLogAnomaly() {
-        mAnomalyUtils.logAnomaly(mMetricsFeatureProvider, mWakeLockAnomaly, CONTEXT_ID);
-
-        verify(mMetricsFeatureProvider).action(RuntimeEnvironment.application,
-                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKELOCK,
-                PACKAGE_NAME_WAKELOCK,
-                Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_CONTEXT,
-                        CONTEXT_ID),
-                Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_ANOMALY_ACTION_TYPE,
-                        Anomaly.AnomalyActionType.FORCE_STOP));
-    }
-
-    @Test
-    public void testLogAnomalies() {
-        final List<Anomaly> anomalies = new ArrayList<>();
-        anomalies.add(mWakeLockAnomaly);
-        anomalies.add(mWakeupAnomaly);
-
-        mAnomalyUtils.logAnomalies(mMetricsFeatureProvider, anomalies, CONTEXT_ID);
-
-        verify(mMetricsFeatureProvider).action(RuntimeEnvironment.application,
-                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKELOCK,
-                PACKAGE_NAME_WAKELOCK,
-                Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_CONTEXT,
-                        CONTEXT_ID),
-                Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_ANOMALY_ACTION_TYPE,
-                        Anomaly.AnomalyActionType.FORCE_STOP));
-        verify(mMetricsFeatureProvider).action(RuntimeEnvironment.application,
-                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKEUP_ALARM,
-                PACKAGE_NAME_WAKEUP,
-                Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_CONTEXT,
-                        CONTEXT_ID),
-                Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_ANOMALY_ACTION_TYPE,
-                        Anomaly.AnomalyActionType.STOP_AND_BACKGROUND_CHECK));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
deleted file mode 100644
index 8db1a8c36c6d4da88986bb127eeeedbd1796e0ac..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.action;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AnomalyActionTest {
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final int UID = 111;
-    private static final int ACTION_KEY = 2;
-    private static final int METRIC_KEY = 3;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private AppOpsManager mAppOpsManagerr;
-    private Anomaly mAnomaly;
-    private TestAnomalyAction mTestAnomalyAction;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        doReturn(mAppOpsManagerr).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
-
-        mAnomaly = new Anomaly.Builder()
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .build();
-        mTestAnomalyAction = new TestAnomalyAction(mContext);
-    }
-
-    @Test
-    public void testHandlePositiveAction_logAction() {
-        mTestAnomalyAction.handlePositiveAction(mAnomaly, METRIC_KEY);
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(mContext, ACTION_KEY, PACKAGE_NAME,
-                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, METRIC_KEY));
-    }
-
-    /**
-     * Test class for {@link AnomalyAction}
-     */
-    public class TestAnomalyAction extends AnomalyAction {
-        public TestAnomalyAction(Context context) {
-            super(context);
-            mActionMetricKey = ACTION_KEY;
-        }
-
-        @Override
-        public boolean isActionActive(Anomaly anomaly) {
-            return false;
-        }
-
-        @Override
-        public int getActionType() {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
deleted file mode 100644
index 7e5fc4ac81773bd35004688fb8dd30c4da79735b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.action;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.os.Build;
-
-import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BackgroundCheckActionTest {
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final int UID = 111;
-    private static final int SDK_VERSION = Build.VERSION_CODES.L;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private AppOpsManager mAppOpsManager;
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    private Anomaly mAnomaly;
-    private BackgroundCheckAction mBackgroundCheckAction;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        FakeFeatureFactory.setupForTest(mContext);
-        doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
-
-        mAnomaly = new Anomaly.Builder()
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .setTargetSdkVersion(SDK_VERSION)
-                .build();
-        mBackgroundCheckAction = new BackgroundCheckAction(mContext);
-        mBackgroundCheckAction.mBatteryUtils = mBatteryUtils;
-    }
-
-    @Test
-    public void testHandlePositiveAction_forceStopPackage() {
-        mBackgroundCheckAction.handlePositiveAction(mAnomaly, 0 /* metricskey */);
-
-        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME,
-                AppOpsManager.MODE_IGNORED);
-    }
-
-    @Test
-    public void testIsActionActive_modeAllowed_returnTrue() {
-        doReturn(false).when(mBatteryUtils).isBackgroundRestrictionEnabled(SDK_VERSION, UID,
-                PACKAGE_NAME);
-
-        assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isTrue();
-    }
-
-    @Test
-    public void testIsActionActive_modeIgnored_returnFalse() {
-        doReturn(true).when(mBatteryUtils).isBackgroundRestrictionEnabled(SDK_VERSION, UID,
-                PACKAGE_NAME);
-
-        assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
-    }
-
-    @Test
-    public void testConstructor_batteryUtilsNotNull() {
-        mBackgroundCheckAction = new BackgroundCheckAction(mContext);
-
-        assertThat(mBackgroundCheckAction.mBatteryUtils).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
deleted file mode 100644
index 89b1a161824e7de39427186782575c5dc867a910..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.action;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ForceStopActionTest {
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private ActivityManager mActivityManager;
-    @Mock
-    private ApplicationInfo mApplicationInfo;
-    @Mock
-    private PackageManager mPackageManager;
-    private Anomaly mAnomaly;
-    private ForceStopAction mForceStopAction;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        FakeFeatureFactory.setupForTest(mContext);
-        doReturn(mActivityManager).when(mContext).getSystemService(Context.ACTIVITY_SERVICE);
-        doReturn(mPackageManager).when(mContext).getPackageManager();
-        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
-                PackageManager.GET_META_DATA);
-
-        mAnomaly = new Anomaly.Builder()
-                .setPackageName(PACKAGE_NAME)
-                .build();
-        mForceStopAction = new ForceStopAction(mContext);
-    }
-
-    @Test
-    public void testHandlePositiveAction_forceStopPackage() {
-        mForceStopAction.handlePositiveAction(mAnomaly, 0 /* metricskey */);
-
-        verify(mActivityManager).forceStopPackage(PACKAGE_NAME);
-    }
-
-    @Test
-    public void testIsActionActive_appStopped_returnFalse() {
-        mApplicationInfo.flags = ApplicationInfo.FLAG_STOPPED;
-
-        assertThat(mForceStopAction.isActionActive(mAnomaly)).isFalse();
-    }
-
-    @Test
-    public void testIsActionActive_appRunning_returnTrue() {
-        mApplicationInfo.flags = 0;
-
-        assertThat(mForceStopAction.isActionActive(mAnomaly)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
deleted file mode 100644
index 234dd123401a549054c16e37ac9887fde55c248e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.action;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowPermissionChecker;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
-        ShadowPermissionChecker.class)
-public class LocationCheckActionTest {
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final int UID = 12345;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private Anomaly mAnomaly;
-    private LocationCheckAction mLocationCheckAction;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mLocationCheckAction = new LocationCheckAction(mContext, null);
-        mAnomaly = new Anomaly.Builder()
-                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
-                .setPackageName(PACKAGE_NAME)
-                .setUid(UID)
-                .build();
-        ShadowPermissionChecker.clear();
-    }
-
-    @Test
-    public void testIsActionActive_coarseLocationGranted_returnTrue() {
-        ShadowPermissionChecker.addPermission(Manifest.permission.ACCESS_COARSE_LOCATION, -1, UID,
-                PACKAGE_NAME, PackageManager.PERMISSION_GRANTED);
-
-        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isTrue();
-    }
-
-    @Test
-    public void testIsActionActive_fineLocationGranted_returnTrue() {
-        ShadowPermissionChecker.addPermission(Manifest.permission.ACCESS_FINE_LOCATION, -1, UID,
-                PACKAGE_NAME, PackageManager.PERMISSION_GRANTED);
-
-        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isTrue();
-    }
-
-    @Test
-    public void testIsActionActive_noLocationGranted_returnFalse() {
-        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isFalse();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
deleted file mode 100644
index c06bddd92c4723327a1e872d379e5157a626abca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.action;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StopAndBackgroundActionTest {
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final int UID = 111;
-    private static final int METRICS_KEY = 3;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private BackgroundCheckAction mBackgroundCheckAction;
-    @Mock
-    private ForceStopAction mForceStopAction;
-    private StopAndBackgroundCheckAction mStopAndBackgroundCheckAction;
-    private Anomaly mAnomaly;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mAnomaly = new Anomaly.Builder()
-                .setUid(UID)
-                .setPackageName(PACKAGE_NAME)
-                .build();
-
-        FakeFeatureFactory.setupForTest(mContext);
-        mStopAndBackgroundCheckAction = new StopAndBackgroundCheckAction(mContext, mForceStopAction,
-                mBackgroundCheckAction);
-    }
-
-    @Test
-    public void testHandlePositiveAction_stopAndBackgroundCheck() {
-        mStopAndBackgroundCheckAction.handlePositiveAction(mAnomaly, METRICS_KEY);
-
-        verify(mBackgroundCheckAction).handlePositiveAction(mAnomaly, METRICS_KEY);
-        verify(mForceStopAction).handlePositiveAction(mAnomaly, METRICS_KEY);
-    }
-
-    @Test
-    public void testIsActionActive_restrictionEnabled_returnFalse() {
-        doReturn(true).when(mForceStopAction).isActionActive(mAnomaly);
-
-        assertThat(mStopAndBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
-    }
-
-    @Test
-    public void testIsActionActive_appNotRunning_returnFalse() {
-        doReturn(true).when(mBackgroundCheckAction).isActionActive(mAnomaly);
-
-        assertThat(mStopAndBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
-    }
-
-    @Test
-    public void testIsActionActive_appStoppedAndRestrictionOn_returnFalse() {
-        assertThat(mStopAndBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
deleted file mode 100644
index f8d02ffc802781d595adc04dc181226a994e9bcf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.checker;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.BatteryStats;
-import android.text.format.DateUtils;
-
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
-import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
-import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BluetoothScanAnomalyDetectorTest {
-    private static final String TARGET_PACKAGE_NAME = "com.android.app";
-    private static final int ANOMALY_UID = 111;
-    private static final int NORMAL_UID = 222;
-    private static final int TARGET_UID = 333;
-    private static final long ANOMALY_BLUETOOTH_SCANNING_TIME = DateUtils.HOUR_IN_MILLIS;
-    private static final long NORMAL_BLUETOOTH_SCANNING_TIME = DateUtils.MINUTE_IN_MILLIS;
-    @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private BatterySipper mAnomalySipper;
-    @Mock
-    private BatterySipper mNormalSipper;
-    @Mock
-    private BatterySipper mTargetSipper;
-    @Mock
-    private BatteryStats.Uid mAnomalyUid;
-    @Mock
-    private BatteryStats.Uid mNormalUid;
-    @Mock
-    private BatteryStats.Uid mTargetUid;
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    @Mock
-    private AnomalyDetectionPolicy mPolicy;
-    @Mock
-    private AnomalyAction mAnomalyAction;
-    @Mock
-    private AnomalyUtils mAnomalyUtils;
-
-    private BluetoothScanAnomalyDetector mBluetoothScanAnomalyDetector;
-    private Context mContext;
-    private List<BatterySipper> mUsageList;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        ReflectionHelpers.setField(mPolicy, "bluetoothScanThreshold",
-                30 * DateUtils.MINUTE_IN_MILLIS);
-        doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
-
-        mAnomalySipper.uidObj = mAnomalyUid;
-        doReturn(ANOMALY_UID).when(mAnomalyUid).getUid();
-        mNormalSipper.uidObj = mNormalUid;
-        doReturn(NORMAL_UID).when(mNormalUid).getUid();
-        mTargetSipper.uidObj = mTargetUid;
-        doReturn(TARGET_UID).when(mTargetUid).getUid();
-
-        mUsageList = new ArrayList<>();
-        mUsageList.add(mAnomalySipper);
-        mUsageList.add(mNormalSipper);
-        mUsageList.add(mTargetSipper);
-        doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
-
-        mBluetoothScanAnomalyDetector = spy(new BluetoothScanAnomalyDetector(mContext, mPolicy,
-                mAnomalyUtils));
-        mBluetoothScanAnomalyDetector.mBatteryUtils = mBatteryUtils;
-        doReturn(false).when(mBatteryUtils).shouldHideSipper(any());
-        doReturn(true).when(mAnomalyAction).isActionActive(any());
-
-        doReturn(ANOMALY_BLUETOOTH_SCANNING_TIME).when(
-                mBluetoothScanAnomalyDetector).getBluetoothUnoptimizedBgTimeMs(eq(mAnomalyUid),
-                anyLong());
-        doReturn(ANOMALY_BLUETOOTH_SCANNING_TIME).when(
-                mBluetoothScanAnomalyDetector).getBluetoothUnoptimizedBgTimeMs(eq(mTargetUid),
-                anyLong());
-        doReturn(NORMAL_BLUETOOTH_SCANNING_TIME).when(
-                mBluetoothScanAnomalyDetector).getBluetoothUnoptimizedBgTimeMs(eq(mNormalUid),
-                anyLong());
-    }
-
-    @Test
-    public void testDetectAnomalies_containsAnomaly_detectIt() {
-        doReturn(-1).when(mBatteryUtils).getPackageUid(nullable(String.class));
-        final Anomaly anomaly = createBluetoothAnomaly(ANOMALY_UID);
-        final Anomaly targetAnomaly = createBluetoothAnomaly(TARGET_UID);
-
-        List<Anomaly> mAnomalies = mBluetoothScanAnomalyDetector.detectAnomalies(
-                mBatteryStatsHelper);
-
-        assertThat(mAnomalies).containsExactly(anomaly, targetAnomaly);
-    }
-
-    @Test
-    public void testDetectAnomalies_detectTargetAnomaly_detectIt() {
-        doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
-        final Anomaly targetAnomaly = createBluetoothAnomaly(TARGET_UID);
-
-        List<Anomaly> mAnomalies = mBluetoothScanAnomalyDetector.detectAnomalies(
-                mBatteryStatsHelper, TARGET_PACKAGE_NAME);
-
-        assertThat(mAnomalies).containsExactly(targetAnomaly);
-
-    }
-
-    private Anomaly createBluetoothAnomaly(int uid) {
-        return new Anomaly.Builder()
-                .setUid(uid)
-                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
-                .setBluetoothScanningTimeMs(ANOMALY_BLUETOOTH_SCANNING_TIME)
-                .build();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
deleted file mode 100644
index d7682eac68005ffe286253cd898224fbb82d3cd5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.checker;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.BatteryStats;
-import android.text.format.DateUtils;
-
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
-import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WakeLockAnomalyDetectorTest {
-    private static final String TARGET_PACKAGE_NAME = "com.android.app";
-    private static final long ANOMALY_WAKELOCK_TIME_MS = 2 * DateUtils.HOUR_IN_MILLIS;
-    private static final long NORMAL_WAKELOCK_TIME_MS = DateUtils.SECOND_IN_MILLIS;
-    private static final long WAKELOCK_THRESHOLD_MS = DateUtils.HOUR_IN_MILLIS;
-    private static final int ANOMALY_UID = 111;
-    private static final int NORMAL_UID = 222;
-    private static final int TARGET_UID = 333;
-    private static final int INACTIVE_UID = 444;
-    @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private BatterySipper mAnomalySipper;
-    @Mock
-    private BatterySipper mTargetSipper;
-    @Mock
-    private BatterySipper mNormalSipper;
-    @Mock
-    private BatterySipper mInactiveSipper;
-    @Mock
-    private BatteryStats.Uid mAnomalyUid;
-    @Mock
-    private BatteryStats.Uid mNormalUid;
-    @Mock
-    private BatteryStats.Uid mTargetUid;
-    @Mock
-    private BatteryStats.Uid mInactiveUid;
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private ApplicationInfo mApplicationInfo;
-    @Mock
-    private AnomalyDetectionPolicy mPolicy;
-    @Mock
-    private AnomalyAction mAnomalyAction;
-    @Mock
-    private AnomalyUtils mAnomalyUtils;
-
-    private WakeLockAnomalyDetector mWakelockAnomalyDetector;
-    private Context mContext;
-    private List<BatterySipper> mUsageList;
-    private Anomaly mAnomaly;
-    private Anomaly mTargetAnomaly;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        ReflectionHelpers.setField(mPolicy, "wakeLockThreshold", WAKELOCK_THRESHOLD_MS);
-
-        doReturn(false).when(mBatteryUtils).shouldHideSipper(nullable(BatterySipper.class));
-        doReturn(mPackageManager).when(mContext).getPackageManager();
-        doReturn(mApplicationInfo).when(mPackageManager)
-                .getApplicationInfo(nullable(String.class), anyInt());
-        doReturn(true).when(mAnomalyAction).isActionActive(any());
-        doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
-
-        mWakelockAnomalyDetector = spy(
-                new WakeLockAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
-        mWakelockAnomalyDetector.mBatteryUtils = mBatteryUtils;
-
-        mAnomalySipper.uidObj = mAnomalyUid;
-        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
-                .getBackgroundTotalDurationMs(eq(mAnomalyUid), anyLong());
-        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getCurrentDurationMs(
-                eq(mAnomalyUid), anyLong());
-        doReturn(ANOMALY_UID).when(mAnomalyUid).getUid();
-
-        mNormalSipper.uidObj = mNormalUid;
-        doReturn(NORMAL_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
-                .getBackgroundTotalDurationMs(eq(mNormalUid), anyLong());
-        doReturn(0L).when(mWakelockAnomalyDetector).getCurrentDurationMs(eq(mNormalUid),
-                anyLong());
-        doReturn(NORMAL_UID).when(mNormalUid).getUid();
-
-        mTargetSipper.uidObj = mTargetUid;
-        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
-                .getBackgroundTotalDurationMs(eq(mTargetUid), anyLong());
-        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getCurrentDurationMs(
-                eq(mTargetUid), anyLong());
-        doReturn(TARGET_UID).when(mTargetUid).getUid();
-
-        mInactiveSipper.uidObj = mInactiveUid;
-        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
-                .getBackgroundTotalDurationMs(eq(mInactiveUid), anyLong());
-        doReturn(0L).when(mWakelockAnomalyDetector).getCurrentDurationMs(eq(mInactiveUid),
-                anyLong());
-        doReturn(INACTIVE_UID).when(mInactiveUid).getUid();
-
-        mUsageList = new ArrayList<>();
-        mUsageList.add(mAnomalySipper);
-        mUsageList.add(mNormalSipper);
-        mUsageList.add(mTargetSipper);
-        mUsageList.add(mInactiveSipper);
-        doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
-
-        mAnomaly = createWakeLockAnomaly(ANOMALY_UID);
-        mTargetAnomaly = createWakeLockAnomaly(TARGET_UID);
-    }
-
-    @Test
-    public void testDetectAnomalies_containsAnomaly_detectIt() {
-        doReturn(BatteryUtils.UID_NULL).when(mBatteryUtils).getPackageUid(nullable(String.class));
-
-        List<Anomaly> mAnomalies = mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
-
-        assertThat(mAnomalies).containsExactly(mAnomaly, mTargetAnomaly);
-    }
-
-    @Test
-    public void testDetectAnomalies_containsTargetPackage_detectIt() {
-        doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
-
-        List<Anomaly> mAnomalies = mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
-                TARGET_PACKAGE_NAME);
-
-        assertThat(mAnomalies).containsExactly(mTargetAnomaly);
-    }
-
-    @Test
-    public void testContainsThresholdFromPolicy() {
-        assertThat(mWakelockAnomalyDetector.mWakeLockThresholdMs).isEqualTo(WAKELOCK_THRESHOLD_MS);
-    }
-
-    private Anomaly createWakeLockAnomaly(int uid) {
-        return new Anomaly.Builder()
-                .setUid(uid)
-                .setType(Anomaly.AnomalyType.WAKE_LOCK)
-                .setWakeLockTimeMs(ANOMALY_WAKELOCK_TIME_MS)
-                .build();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
deleted file mode 100644
index 13a5ab8531f6149a1de688cde2840e9573ba6ce9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.anomaly.checker;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.BatteryStats;
-import android.os.Build;
-import android.text.format.DateUtils;
-import android.util.ArrayMap;
-import android.util.ArraySet;
-
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
-import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WakeupAlarmAnomalyDetectorTest {
-    private static final String TARGET_PACKAGE_NAME = "com.android.target";
-    private static final String ANOMALY_PACKAGE_NAME = "com.android.anomaly";
-    private static final boolean TARGET_BACKGROUND_RESTRICTION_ON = false;
-    private static final boolean ANOMALY_BACKGROUND_RESTRICTION_ON = true;
-    private static final int TARGET_SDK = Build.VERSION_CODES.L;
-    private static final int ANOMALY_SDK = Build.VERSION_CODES.O;
-    private static final int ANOMALY_UID = 111;
-    private static final int NORMAL_UID = 222;
-    private static final int TARGET_UID = 333;
-    private static final long RUNNING_TIME_MS =
-            1 * DateUtils.HOUR_IN_MILLIS + 10 * DateUtils.MINUTE_IN_MILLIS;
-    private static final int ANOMALY_WAKEUP_COUNT = 500;
-    private static final int NORMAL_WAKEUP_COUNT = 61;
-    private static final int BLACKLISTED_WAKEUP_COUNT = 37;
-    private static final int ANOMALY_WAKEUP_FREQUENCY = 428; // count per hour
-    @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private BatterySipper mAnomalySipper;
-    @Mock
-    private BatterySipper mNormalSipper;
-    @Mock
-    private BatterySipper mTargetSipper;
-    @Mock
-    private BatteryStats.Uid mAnomalyUid;
-    @Mock
-    private BatteryStats.Uid mNormalUid;
-    @Mock
-    private BatteryStats.Uid mTargetUid;
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    @Mock
-    private BatteryStats.Uid.Pkg mPkg;
-    @Mock
-    private BatteryStats.Counter mCounter;
-    @Mock
-    private BatteryStats.Counter mCounter2;
-    @Mock
-    private AnomalyDetectionPolicy mPolicy;
-    @Mock
-    private AnomalyAction mAnomalyAction;
-    @Mock
-    private AnomalyUtils mAnomalyUtils;
-
-    private WakeupAlarmAnomalyDetector mWakeupAlarmAnomalyDetector;
-    private Context mContext;
-    private List<BatterySipper> mUsageList;
-    private Anomaly mAnomaly;
-    private Anomaly mTargetAnomaly;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        ReflectionHelpers.setField(mPolicy, "wakeupAlarmThreshold", 60);
-        final Set<String> blacklistedTags = new ArraySet<>();
-        blacklistedTags.add("blacklistedTag");
-        ReflectionHelpers.setField(mPolicy, "wakeupBlacklistedTags", blacklistedTags);
-
-        doReturn(false).when(mBatteryUtils).shouldHideSipper(any());
-        doReturn(RUNNING_TIME_MS).when(mBatteryUtils).calculateRunningTimeBasedOnStatsType(any(),
-                anyInt());
-        doReturn(true).when(mAnomalyAction).isActionActive(any());
-        doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
-
-        mAnomalySipper.uidObj = mAnomalyUid;
-        doReturn(ANOMALY_UID).when(mAnomalyUid).getUid();
-        mNormalSipper.uidObj = mNormalUid;
-        doReturn(NORMAL_UID).when(mNormalUid).getUid();
-        mTargetSipper.uidObj = mTargetUid;
-        doReturn(TARGET_UID).when(mTargetUid).getUid();
-
-        mUsageList = new ArrayList<>();
-        mUsageList.add(mAnomalySipper);
-        mUsageList.add(mNormalSipper);
-        mUsageList.add(mTargetSipper);
-        doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
-
-        doReturn(TARGET_PACKAGE_NAME).when(mBatteryUtils).getPackageName(TARGET_UID);
-        doReturn(ANOMALY_PACKAGE_NAME).when(mBatteryUtils).getPackageName(ANOMALY_UID);
-        doReturn(TARGET_SDK).when(mBatteryUtils).getTargetSdkVersion(TARGET_PACKAGE_NAME);
-        doReturn(ANOMALY_SDK).when(mBatteryUtils).getTargetSdkVersion(ANOMALY_PACKAGE_NAME);
-        doReturn(TARGET_BACKGROUND_RESTRICTION_ON).when(mBatteryUtils)
-                .isBackgroundRestrictionEnabled(TARGET_SDK, TARGET_UID, TARGET_PACKAGE_NAME);
-        doReturn(ANOMALY_BACKGROUND_RESTRICTION_ON).when(mBatteryUtils)
-                .isBackgroundRestrictionEnabled(ANOMALY_SDK, ANOMALY_UID, ANOMALY_PACKAGE_NAME);
-
-        mAnomaly = new Anomaly.Builder()
-                .setUid(ANOMALY_UID)
-                .setPackageName(ANOMALY_PACKAGE_NAME)
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setTargetSdkVersion(ANOMALY_SDK)
-                .setBackgroundRestrictionEnabled(ANOMALY_BACKGROUND_RESTRICTION_ON)
-                .setWakeupAlarmCount(ANOMALY_WAKEUP_FREQUENCY)
-                .build();
-        mTargetAnomaly = new Anomaly.Builder()
-                .setUid(TARGET_UID)
-                .setPackageName(TARGET_PACKAGE_NAME)
-                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
-                .setTargetSdkVersion(TARGET_SDK)
-                .setBackgroundRestrictionEnabled(TARGET_BACKGROUND_RESTRICTION_ON)
-                .setWakeupAlarmCount(ANOMALY_WAKEUP_FREQUENCY)
-                .build();
-
-        mWakeupAlarmAnomalyDetector = spy(
-                new WakeupAlarmAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
-        mWakeupAlarmAnomalyDetector.mBatteryUtils = mBatteryUtils;
-    }
-
-    @Test
-    public void testDetectAnomalies_containsAnomaly_detectIt() {
-        doReturn(-1).when(mBatteryUtils).getPackageUid(nullable(String.class));
-        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
-                mAnomalyUid);
-        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
-                mTargetUid);
-        doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
-                mNormalUid);
-
-        List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
-
-        assertThat(mAnomalies).containsExactly(mAnomaly, mTargetAnomaly);
-    }
-
-    @Test
-    public void testDetectAnomalies_detectTargetAnomaly_detectIt() {
-        doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
-        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
-                mAnomalyUid);
-        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
-                mTargetUid);
-        doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
-                mNormalUid);
-
-        List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
-                TARGET_PACKAGE_NAME);
-
-        assertThat(mAnomalies).containsExactly(mTargetAnomaly);
-    }
-
-    @Test
-    public void testGetWakeupAlarmCountFromUid_countCorrect() {
-        final ArrayMap<String, BatteryStats.Uid.Pkg> packageStats = new ArrayMap<>();
-        final ArrayMap<String, BatteryStats.Counter> alarms = new ArrayMap<>();
-        doReturn(alarms).when(mPkg).getWakeupAlarmStats();
-        doReturn(NORMAL_WAKEUP_COUNT).when(mCounter).getCountLocked(anyInt());
-        doReturn(packageStats).when(mAnomalyUid).getPackageStats();
-        packageStats.put("", mPkg);
-        alarms.put("1", mCounter);
-        alarms.put("2", mCounter);
-
-        assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
-                2 * NORMAL_WAKEUP_COUNT);
-    }
-
-    @Test
-    public void testGetWakeupAlarmCountFromUid_filterOutBlacklistedTags() {
-        final ArrayMap<String, BatteryStats.Uid.Pkg> packageStats = new ArrayMap<>();
-        final ArrayMap<String, BatteryStats.Counter> alarms = new ArrayMap<>();
-        doReturn(alarms).when(mPkg).getWakeupAlarmStats();
-        doReturn(NORMAL_WAKEUP_COUNT).when(mCounter).getCountLocked(anyInt());
-        doReturn(BLACKLISTED_WAKEUP_COUNT).when(mCounter2).getCountLocked(anyInt());
-        doReturn(packageStats).when(mAnomalyUid).getPackageStats();
-        packageStats.put("", mPkg);
-        alarms.put("allowedTag", mCounter);
-        alarms.put("blacklistedTag", mCounter2);
-
-        assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
-                NORMAL_WAKEUP_COUNT);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
deleted file mode 100644
index 7633ce902ff911fcc6007e40b1beb73e896b07ca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.provider.Settings.Secure;
-
-import com.android.settings.TestConfig;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = ShadowSecureSettings.class
-)
-public class AssistGestureSettingsPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFactory;
-    private AssistGestureSettingsPreferenceController mController;
-
-    private static final String KEY_ASSIST = "gesture_assist";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AssistGestureSettingsPreferenceController(mContext, null, KEY_ASSIST,
-                false);
-    }
-
-    @Test
-    public void isAvailable_whenSupported_shouldReturnTrue() {
-        mController.mAssistOnly = false;
-        when(mFactory.assistGestureFeatureProvider.isSensorAvailable(mContext)).thenReturn(true);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_whenUnsupported_shouldReturnFalse() {
-        when(mFactory.assistGestureFeatureProvider.isSupported(mContext)).thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = RuntimeEnvironment.application;
-        AssistGestureSettingsPreferenceController controller =
-                new AssistGestureSettingsPreferenceController(context, null /* lifecycle */,
-                        KEY_ASSIST, false /* assistOnly */);
-        ResultPayload payload = controller.getResultPayload();
-        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Secure.ASSIST_GESTURE_ENABLED, 0);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver, Secure.ASSIST_GESTURE_ENABLED, -1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.ASSIST_GESTURE_ENABLED, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
deleted file mode 100644
index 1f5c9be17396e3f087828d0e15b0e5b89e519b05..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AssistGestureSettingsTest {
-    @Mock
-    private Context mContext;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private AssistGestureSettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mSettings = new AssistGestureSettings();
-    }
-
-    @Test
-    public void testGetPreferenceScreenResId() {
-        assertThat(mSettings.getPreferenceScreenResId())
-                .isEqualTo(R.xml.assist_gesture_settings);
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
-    }
-
-    @Test
-    public void testSearchIndexProvider_noSensor_shouldDisablePageSearch() {
-        when(mFakeFeatureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
-                .thenReturn(false);
-
-        assertThat(AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                RuntimeEnvironment.application))
-                .contains("gesture_assist_settings_page");
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
deleted file mode 100644
index 9c9a546dde8bc4e238e152de121bf8b0ba5b50aa..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DoubleTapPowerPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    private DoubleTapPowerPreferenceController mController;
-    private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
-    }
-
-    @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled))
-                .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsTrue_shouldReturnFalse() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled))
-                .thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsNotSet_shouldReturnTrue() {
-        // Set the setting to be enabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
-        mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
-
-        assertThat(mController.isSwitchPrefEnabled()).isTrue();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsSet_shouldReturnFalse() {
-        // Set the setting to be disabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 1);
-        mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
-
-        assertThat(mController.isSwitchPrefEnabled()).isFalse();
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = RuntimeEnvironment.application;
-        DoubleTapPowerPreferenceController controller =
-                new DoubleTapPowerPreferenceController(context, null /* lifecycle */,
-                        KEY_DOUBLE_TAP_POWER);
-        ResultPayload payload = controller.getResultPayload();
-        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
-                0);
-
-        InlinePayload payload = ((InlineSwitchPayload) mController.getResultPayload());
-        payload.setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver,
-                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, -1);
-        updatedValue = 1 - updatedValue; // DoubleTapPower is a non-standard switch
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver,
-                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-        newValue = 1 - newValue; // DoubleTapPower is a non-standard switch
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
deleted file mode 100644
index b9635a745e7c8ed6cc4374153a282faa00b7b75c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DoubleTapPowerSettingsTest {
-
-    private DoubleTapPowerSettings mSettings;
-
-    @Before
-    public void setUp() {
-        mSettings = new DoubleTapPowerSettings();
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
deleted file mode 100644
index 37f52de34e546f90ee1b20277dfc25cb99f5b53d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.content.ContentResolver;
-import android.content.Context;
-
-import android.provider.Settings;
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DoubleTapScreenPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
-    private DoubleTapScreenPreferenceController mController;
-
-    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new DoubleTapScreenPreferenceController(
-                mContext, null, mAmbientDisplayConfiguration, 0, KEY_DOUBLE_TAP_SCREEN);
-    }
-
-    @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsFalse_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
-        // Set the setting to be enabled.
-        when(mAmbientDisplayConfiguration.pulseOnDoubleTapEnabled(anyInt())).thenReturn(true);
-
-        assertThat(mController.isSwitchPrefEnabled()).isTrue();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
-
-        assertThat(mController.isSwitchPrefEnabled()).isFalse();
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = RuntimeEnvironment.application;
-        DoubleTapScreenPreferenceController controller =
-                new DoubleTapScreenPreferenceController(context, null /* lifecycle */,
-                        mAmbientDisplayConfiguration, 0 /* userid */, KEY_DOUBLE_TAP_SCREEN);
-        ResultPayload payload = controller.getResultPayload();
-        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, 0);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver,
-                Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, -1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver,
-                Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
deleted file mode 100644
index 3d56d7141cec9431a102b39d1c29f5d5059c3834..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DoubleTapScreenSettingsTest {
-
-    private DoubleTapScreenSettings mSettings;
-
-    @Before
-    public void setUp() {
-        mSettings = new DoubleTapScreenSettings();
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                DoubleTapScreenSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
deleted file mode 100644
index 236896a2a5a77645cd30a5e1320d83b992e90ad4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DoubleTwistGestureSettingsTest {
-
-    private DoubleTwistGestureSettings mSettings;
-
-    @Before
-    public void setUp() {
-        mSettings = new DoubleTwistGestureSettings();
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                DoubleTwistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
deleted file mode 100644
index aa8121c1c6d31085fa8f97a92586924109390692..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DoubleTwistPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SensorManager mSensorManager;
-    private DoubleTwistPreferenceController mController;
-    private static final String KEY_DOUBLE_TWIST = "gesture_double_twist";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
-        mController = new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST);
-    }
-
-    @Test
-    public void isAvailable_hasSensor_shouldReturnTrue() {
-        // Mock sensors
-        final List<Sensor> sensorList = new ArrayList<>();
-        sensorList.add(mock(Sensor.class));
-        when(mContext.getResources().getString(anyInt())).thenReturn("test");
-        when(mContext.getSystemService(Context.SENSOR_SERVICE)).thenReturn(mSensorManager);
-        when(mSensorManager.getSensorList(anyInt())).thenReturn(sensorList);
-        when(sensorList.get(0).getName()).thenReturn("test");
-        when(sensorList.get(0).getVendor()).thenReturn("test");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noSensor_shouldReturnFalse() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_differentSensor_shouldReturnFalse() {
-        // Mock sensors
-        final List<Sensor> sensorList = new ArrayList<>();
-        sensorList.add(mock(Sensor.class));
-        when(mContext.getResources().getString(anyInt())).thenReturn("test");
-        when(mContext.getSystemService(Context.SENSOR_SERVICE)).thenReturn(mSensorManager);
-        when(mSensorManager.getSensorList(anyInt())).thenReturn(sensorList);
-        when(sensorList.get(0).getName()).thenReturn("not_test");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Config(shadows = {
-            ShadowDoubleTwistPreferenceController.class,
-            ShadowSecureSettings.class})
-    public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
-        final int managedId = 2;
-        ShadowSecureSettings.putIntForUser(
-            null, Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
-        DoubleTwistPreferenceController controller =
-            spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
-        ShadowDoubleTwistPreferenceController.setManagedProfileId(managedId);
-
-        // enable the gesture
-        controller.onPreferenceChange(null, true);
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId)).isEqualTo(1);
-
-        // disable the gesture
-        controller.onPreferenceChange(null, false);
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, managedId)).isEqualTo(0);
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
-        // Set the setting to be enabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
-        mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);
-
-        assertThat(mController.isSwitchPrefEnabled()).isTrue();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
-        // Set the setting to be disabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0);
-        mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);
-
-        assertThat(mController.isSwitchPrefEnabled()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
deleted file mode 100644
index 61b6909fdcc96a04ed9e221123f200de5b280647..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.widget.VideoPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class GesturePreferenceControllerTest {
-
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Lifecycle mLifecycle;
-    private TestPrefController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new TestPrefController(mContext, mLifecycle);
-    }
-
-    @Test
-    public void display_configIsTrue_shouldDisplay() {
-        mController.mIsPrefAvailable = true;
-        when(mScreen.findPreference(anyString())).thenReturn(mock(VideoPreference.class));
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void display_configIsFalse_shouldNotDisplay() {
-        mController.mIsPrefAvailable = false;
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void onResume_shouldStartVideoPreferenceWithVideoPauseState() {
-        final VideoPreference videoPreference = mock(VideoPreference.class);
-        when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
-        mController.mIsPrefAvailable = true;
-
-        mController.displayPreference(mScreen);
-        final Bundle savedState = new Bundle();
-
-        mController.onCreate(null);
-        mController.onResume();
-        verify(videoPreference).onViewVisible(false);
-
-        reset(videoPreference);
-        savedState.putBoolean(mController.KEY_VIDEO_PAUSED, true);
-        mController.onCreate(savedState);
-        mController.onResume();
-        verify(videoPreference).onViewVisible(true);
-
-        reset(videoPreference);
-        savedState.putBoolean(mController.KEY_VIDEO_PAUSED, false);
-        mController.onCreate(savedState);
-        mController.onResume();
-        verify(videoPreference).onViewVisible(false);
-    }
-
-    @Test
-    public void onPause_shouldStopVideoPreference() {
-        final VideoPreference videoPreference = mock(VideoPreference.class);
-        when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
-        mController.mIsPrefAvailable = true;
-
-        mController.displayPreference(mScreen);
-        mController.onPause();
-
-        verify(videoPreference).onViewInvisible();
-    }
-
-    @Test
-    public void onPause_shouldUpdateVideoPauseState() {
-        final VideoPreference videoPreference = mock(VideoPreference.class);
-        when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
-        mController.mIsPrefAvailable = true;
-        mController.displayPreference(mScreen);
-
-        when(videoPreference.isVideoPaused()).thenReturn(true);
-        mController.onPause();
-        assertThat(mController.mVideoPaused).isTrue();
-
-        when(videoPreference.isVideoPaused()).thenReturn(false);
-        mController.onPause();
-        assertThat(mController.mVideoPaused).isFalse();
-    }
-
-    @Test
-    public void onSaveInstanceState_shouldSaveVideoPauseState() {
-        final Bundle outState = mock(Bundle.class);
-
-        mController.mVideoPaused = true;
-        mController.onSaveInstanceState(outState);
-        verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, true);
-
-        mController.mVideoPaused = false;
-        mController.onSaveInstanceState(outState);
-        verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, false);
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedWhenSettingIsOn() {
-        // Mock a TwoStatePreference
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        // Set the setting to be enabled.
-        mController.mIsPrefEnabled = true;
-        // Run through updateState
-        mController.updateState(preference);
-
-        // Verify pref is checked (as setting is enabled).
-        verify(preference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
-        // Mock a TwoStatePreference
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        // Set the setting to be disabled.
-        mController.mIsPrefEnabled = false;
-
-        // Run through updateState
-        mController.updateState(preference);
-
-        // Verify pref is unchecked (as setting is disabled).
-        verify(preference).setChecked(false);
-    }
-
-    @Test
-    public void updateState_notTwoStatePreference_setSummary() {
-        // Mock a regular preference
-        final Preference preference = mock(Preference.class);
-        // Set the setting to be disabled.
-        mController.mIsPrefEnabled = false;
-
-        // Run through updateState
-        mController.updateState(preference);
-
-        // Verify summary is set to off (as setting is disabled).
-        verify(preference).setSummary(com.android.settings.R.string.gesture_setting_off);
-    }
-
-    private class TestPrefController extends GesturePreferenceController {
-
-        boolean mIsPrefAvailable;
-        boolean mIsPrefEnabled;
-
-        public TestPrefController(Context context,
-                Lifecycle lifecycle) {
-            super(context, lifecycle);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return mIsPrefAvailable;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return "testKey";
-        }
-
-        @Override
-        protected String getVideoPrefKey() {
-            return "videoKey";
-        }
-
-        @Override
-        protected boolean isSwitchPrefEnabled() {
-            return mIsPrefEnabled;
-        }
-
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object newValue) {
-            return false;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
deleted file mode 100644
index b12b3736d2cf2646c03b8c238aaf920b07c64b50..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class GesturesSettingsPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private Preference mPreference;
-
-    private GesturesSettingPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        mController = new GesturesSettingPreferenceController(mActivity);
-    }
-
-    @Test
-    public void isAvailable_hasGesture_shouldReturnTrue() {
-        final List<AbstractPreferenceController> mControllers = new ArrayList<>();
-        mControllers.add(new AbstractPreferenceController(RuntimeEnvironment.application) {
-            @Override
-            public boolean isAvailable() {
-                return true;
-            }
-
-            @Override
-            public String getPreferenceKey() {
-                return "test_key";
-            }
-        });
-        ReflectionHelpers.setField(mController, "mGestureControllers", mControllers);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noGesture_shouldReturnFalse() {
-        ReflectionHelpers.setField(mController, "mGestureControllers",
-                new ArrayList<AbstractPreferenceController>());
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Config(shadows = {ShadowSecureSettings.class})
-    public void updateState_assistSupported_shouldSetToAssistGestureStatus() {
-        final FakeFeatureFactory featureFactory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
-        when(featureFactory.assistGestureFeatureProvider.isSupported(any(Context.class)))
-                .thenReturn(true);
-        when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
-                .thenReturn(true);
-
-        final ContentResolver cr = mActivity.getContentResolver();
-        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
-        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
-        mController.updateState(mPreference);
-        verify(mActivity).getString(R.string.language_input_gesture_summary_off);
-
-        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
-        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
-        mController.updateState(mPreference);
-        verify(mActivity).getString(R.string.language_input_gesture_summary_on_with_assist);
-
-        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
-        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1);
-        mController.updateState(mPreference);
-        verify(mActivity).getString(R.string.language_input_gesture_summary_on_non_assist);
-    }
-
-    @Test
-    @Config(shadows = {ShadowSecureSettings.class})
-    public void updateState_sensorNotAvailable_shouldSetToEmptyStatus() {
-        final FakeFeatureFactory featureFactory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
-        when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
-                .thenReturn(false);
-
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary("");
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
deleted file mode 100644
index 833f016ab4a2d533e93bbcf1bf57ada38c0c2488..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.content.ContentResolver;
-import android.content.Context;
-
-import android.provider.Settings;
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PIckupGesturePreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
-
-    private PickupGesturePreferenceController mController;
-
-    private static final String KEY_PICK_UP = "gesture_pick_up";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new PickupGesturePreferenceController(
-                mContext, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
-    }
-
-    @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsFalse_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
-        // Set the setting to be enabled.
-        when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(true);
-
-        assertThat(mController.isSwitchPrefEnabled()).isTrue();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
-        // Set the setting to be disabled.
-        when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(false);
-
-        assertThat(mController.isSwitchPrefEnabled()).isFalse();
-    }
-
-    @Test
-    public void testCanHandleClicks_configIsSet_shouldReturnTrue() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(true);
-
-        assertThat(mController.canHandleClicks()).isTrue();
-    }
-
-    @Test
-    public void testCanHandleClicks_configIsNotSet_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(false);
-
-        assertThat(mController.canHandleClicks()).isFalse();
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = RuntimeEnvironment.application;
-        PickupGesturePreferenceController controller =
-                new PickupGesturePreferenceController(
-                        context, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
-        ResultPayload payload = controller.getResultPayload();
-        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_PULSE_ON_PICK_UP, 0);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver,
-                Settings.Secure.DOZE_PULSE_ON_PICK_UP, -1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_PULSE_ON_PICK_UP, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
deleted file mode 100644
index 2c4a1c4e26c9cd0a18f7a02d153e9cd84edac93a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PickupGestureSettingsTest {
-
-    private PickupGestureSettings mSettings;
-
-    @Before
-    public void setUp() {
-        mSettings = new PickupGestureSettings();
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                PickupGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
deleted file mode 100644
index d4fc014afb92690823a4e8496fb99dfbb38f3f0a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.hardware.fingerprint.FingerprintManager;
-import android.provider.Settings;
-
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SwipeToNotificationPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private FingerprintManager mFingerprintManager;
-
-    private SwipeToNotificationPreferenceController mController;
-    private static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new SwipeToNotificationPreferenceController(mContext, null, KEY_SWIPE_DOWN);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        // Explicit casting to object due to MockitoCast bug
-        when((Object) mContext.getSystemService(FingerprintManager.class))
-                .thenReturn(mFingerprintManager);
-    }
-
-    @Test
-    public void isAvailable_hardwareNotAvailable_shouldReturnFalse() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
-                .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
-                .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsFalse_shouldReturnFalse() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
-                .thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        // Set the setting to be enabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 1);
-        mController = new SwipeToNotificationPreferenceController(context, null, KEY_SWIPE_DOWN);
-
-        assertThat(mController.isSwitchPrefEnabled()).isTrue();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        // Set the setting to be disabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 0);
-        mController = new SwipeToNotificationPreferenceController(context, null, KEY_SWIPE_DOWN);
-
-        assertThat(mController.isSwitchPrefEnabled()).isFalse();
-    }
-
-    private void stubFingerprintSupported(boolean enabled) {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(enabled);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
deleted file mode 100644
index 0b329d3f2b7a7d84f5bb996c09c7205462a8d423..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SwipeToNotificationSettingsTest {
-
-    @Mock
-    private Context mContext;
-    private SwipeToNotificationSettings mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFragment = new SwipeToNotificationSettings();
-    }
-
-    @Test
-    public void testGetPreferenceScreenResId() {
-        assertThat(mFragment.getPreferenceScreenResId())
-                .isEqualTo(R.xml.swipe_to_notification_settings);
-    }
-
-    @Test
-    public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<AbstractPreferenceController> controllers =
-                mFragment.getPreferenceControllers(mContext);
-
-        assertThat(controllers.isEmpty()).isFalse();
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
deleted file mode 100644
index c9804d667f11598a39157e989c4f49a9586b215f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.android.settings.graph;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.Space;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BottomLabelLayoutTest {
-    private BottomLabelLayout mBottomLabelLayout;
-    private Context mContext;
-    private Space mSpace;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mBottomLabelLayout = new BottomLabelLayout(mContext, null);
-        mBottomLabelLayout.setOrientation(LinearLayout.HORIZONTAL);
-
-        mSpace = new Space(mContext);
-        mSpace.setId(R.id.spacer);
-        mBottomLabelLayout.addView(mSpace);
-    }
-
-    @Test
-    public void testSetStacked_stackedTrue_layoutVertical() {
-        mBottomLabelLayout.setStacked(true);
-
-        assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.VERTICAL);
-        assertThat(mSpace.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetStacked_stackedFalse_layoutHorizontal() {
-        mBottomLabelLayout.setStacked(false);
-
-        assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.HORIZONTAL);
-        assertThat(mSpace.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
deleted file mode 100644
index fbd6fd487e5c19e24fbb4c93588f177f2d2d2ad2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.android.settings.graph;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.SparseIntArray;
-
-import com.android.settings.TestConfig;
-import com.android.settingslib.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UsageGraphTest {
-    private UsageGraph mGraph;
-
-    @Before
-    public void setUp() {
-        // Set up a graph view of width 1000, height 200, and corner radius 5.
-        Context context = spy(RuntimeEnvironment.application);
-        Resources resources = spy(context.getResources());
-        doReturn(resources).when(context).getResources();
-        doReturn(5).when(resources).getDimensionPixelSize(R.dimen.usage_graph_line_corner_radius);
-        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_line_width);
-        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_dot_size);
-        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_dot_interval);
-        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_divider_size);
-        mGraph = spy(new UsageGraph(context, null));
-        doReturn(1000).when(mGraph).getWidth();
-        doReturn(200).when(mGraph).getHeight();
-
-        // Set the conceptual size of the graph to 500ms x 100%.
-        mGraph.setMax(500, 100);
-    }
-
-    @Test
-    public void testCalculateLocalPaths_singlePath() {
-        SparseIntArray paths = new SparseIntArray();
-        paths.append(0, 100);
-        paths.append(500, 50);
-        paths.append(501, -1);
-
-        SparseIntArray localPaths = new SparseIntArray();
-        mGraph.calculateLocalPaths(paths, localPaths);
-
-        assertThat(localPaths.size()).isEqualTo(3);
-        assertThat(localPaths.keyAt(0)).isEqualTo(0);
-        assertThat(localPaths.valueAt(0)).isEqualTo(0);
-        assertThat(localPaths.keyAt(1)).isEqualTo(1000);
-        assertThat(localPaths.valueAt(1)).isEqualTo(100);
-        assertThat(localPaths.keyAt(2)).isEqualTo(1001);
-        assertThat(localPaths.valueAt(2)).isEqualTo(-1);
-    }
-
-    @Test
-    public void testCalculateLocalPaths_multiplePaths() {
-        SparseIntArray paths = new SparseIntArray();
-        paths.append(0, 100);
-        paths.append(200, 75);
-        paths.append(201, -1);
-
-        paths.append(300, 50);
-        paths.append(500, 25);
-        paths.append(501, -1);
-
-        SparseIntArray localPaths = new SparseIntArray();
-        mGraph.calculateLocalPaths(paths, localPaths);
-
-        assertThat(localPaths.size()).isEqualTo(6);
-
-        assertThat(localPaths.keyAt(0)).isEqualTo(0);
-        assertThat(localPaths.valueAt(0)).isEqualTo(0);
-        assertThat(localPaths.keyAt(1)).isEqualTo(400);
-        assertThat(localPaths.valueAt(1)).isEqualTo(50);
-        assertThat(localPaths.keyAt(2)).isEqualTo(401);
-        assertThat(localPaths.valueAt(2)).isEqualTo(-1);
-
-        assertThat(localPaths.keyAt(3)).isEqualTo(600);
-        assertThat(localPaths.valueAt(3)).isEqualTo(100);
-        assertThat(localPaths.keyAt(4)).isEqualTo(1000);
-        assertThat(localPaths.valueAt(4)).isEqualTo(150);
-        assertThat(localPaths.keyAt(5)).isEqualTo(1001);
-        assertThat(localPaths.valueAt(5)).isEqualTo(-1);
-    }
-
-    @Test
-    public void testCalculateLocalPaths_similarPointMiddle() {
-        SparseIntArray paths = new SparseIntArray();
-        paths.append(0, 100);
-        paths.append(1, 99); // This point should be omitted.
-        paths.append(500, 50);
-        paths.append(501, -1);
-
-        SparseIntArray localPaths = new SparseIntArray();
-        mGraph.calculateLocalPaths(paths, localPaths);
-
-        assertThat(localPaths.size()).isEqualTo(3);
-        assertThat(localPaths.keyAt(0)).isEqualTo(0);
-        assertThat(localPaths.valueAt(0)).isEqualTo(0);
-        assertThat(localPaths.keyAt(1)).isEqualTo(1000);
-        assertThat(localPaths.valueAt(1)).isEqualTo(100);
-        assertThat(localPaths.keyAt(2)).isEqualTo(1001);
-        assertThat(localPaths.valueAt(2)).isEqualTo(-1);
-    }
-
-    @Test
-    public void testCalculateLocalPaths_similarPointEnd() {
-        SparseIntArray paths = new SparseIntArray();
-        paths.append(0, 100);
-        paths.append(499, 51);
-        paths.append(500, 50); // This point should be kept: it's the last one.
-        paths.append(501, -1);
-
-        SparseIntArray localPaths = new SparseIntArray();
-        mGraph.calculateLocalPaths(paths, localPaths);
-
-        assertThat(localPaths.size()).isEqualTo(4);
-        assertThat(localPaths.keyAt(0)).isEqualTo(0);
-        assertThat(localPaths.valueAt(0)).isEqualTo(0);
-        assertThat(localPaths.keyAt(1)).isEqualTo(998);
-        assertThat(localPaths.valueAt(1)).isEqualTo(98);
-        assertThat(localPaths.keyAt(2)).isEqualTo(1000);
-        assertThat(localPaths.valueAt(2)).isEqualTo(100);
-        assertThat(localPaths.keyAt(3)).isEqualTo(1001);
-        assertThat(localPaths.valueAt(3)).isEqualTo(-1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
deleted file mode 100644
index 2716fc38554a42c31d83d7a1a8aae1d2c74315cc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.hardware.input.InputManager;
-import android.view.InputDevice;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class GameControllerPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private InputManager mInputManager;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private InputDevice mInputDevice;
-
-    private GameControllerPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mInputManager);
-        mController = new GameControllerPreferenceController(mContext);
-    }
-
-    @Test
-    public void testLifecycle_shouldRegisterInputManager() {
-        mController.onResume();
-
-        // register is called, but unregister should not be called.
-        verify(mInputManager).registerInputDeviceListener(mController, null);
-        verify(mInputManager, never()).unregisterInputDeviceListener(mController);
-
-        mController.onPause();
-        // register is not called any more times, but unregister should be called once.
-        verify(mInputManager).registerInputDeviceListener(mController, null);
-        verify(mInputManager).unregisterInputDeviceListener(mController);
-    }
-
-    @Test
-    public void testIsAvailable_hasDeviceWithVibrator_shouldReturnTrue() {
-        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{1});
-        when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
-        when(mInputDevice.isVirtual()).thenReturn(false);
-        when(mInputDevice.getVibrator().hasVibrator()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testIsAvailable_hasNoVibratingDevice_shouldReturnFalse() {
-        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{1});
-        when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
-        when(mInputDevice.isVirtual()).thenReturn(false);
-        when(mInputDevice.getVibrator().hasVibrator()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_hasNoPhysicalDevice_shouldReturnFalse() {
-        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{1});
-        when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
-        when(mInputDevice.isVirtual()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_hasNoDevice_shouldReturnFalse() {
-        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void updateNonIndexableKeys_shouldIncludeCategoryAndPrefKeys() {
-        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
-
-
-        final List<String> nonIndexables = new ArrayList<>();
-        mController.updateNonIndexableKeys(nonIndexables);
-
-        assertThat(mController.isAvailable()).isFalse();
-        assertThat(nonIndexables).containsExactlyElementsIn(Arrays.asList(
-                GameControllerPreferenceController.PREF_KEY,
-                mController.getPreferenceKey()));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
deleted file mode 100644
index 8f9b2c5bdb06734e98003c50c0549f720b8407d6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.hardware.input.InputManager;
-import android.support.v7.preference.Preference;
-import android.view.InputDevice;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowInputDevice;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PhysicalKeyboardPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private InputManager mIm;
-    @Mock
-    private Preference mPreference;
-
-    private PhysicalKeyboardPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mIm);
-        mController = new PhysicalKeyboardPreferenceController(mContext, null /* lifecycle */);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowInputDevice.reset();
-    }
-
-    @Test
-    public void shouldAlwaysBeAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    @Config(shadows = {
-            ShadowInputDevice.class,
-    })
-    public void updateState_noKeyboard_setDisconnectedSummary() {
-        ShadowInputDevice.sDeviceIds = new int[]{};
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(R.string.disconnected);
-    }
-
-    @Test
-    @Config(shadows = ShadowInputDevice.class)
-    public void updateState_hasKeyboard_setSummaryToKeyboardName() {
-        final InputDevice device = mock(InputDevice.class);
-        when(device.isVirtual()).thenReturn(false);
-        when(device.isFullKeyboard()).thenReturn(true);
-        when(device.getName()).thenReturn("test_keyboard");
-        ShadowInputDevice.sDeviceIds = new int[]{0};
-        ShadowInputDevice.addDevice(0, device);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(device.getName());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
deleted file mode 100644
index 4457cc0339d581597ae4babf6cf651e50e6391a7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.view.textservice.SpellCheckerInfo;
-import android.view.textservice.TextServicesManager;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SpellCheckerPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private TextServicesManager mTextServicesManager;
-    private Context mAppContext;
-    private Preference mPreference;
-    private SpellCheckerPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mAppContext = RuntimeEnvironment.application;
-        when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
-                .thenReturn(mTextServicesManager);
-        mPreference = new Preference(mAppContext);
-        mController = new SpellCheckerPreferenceController(mContext);
-    }
-
-    @Test
-    public void updateState_NoSpellerChecker_shouldSetSummaryToDefault() {
-        when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(true);
-        when(mTextServicesManager.getCurrentSpellChecker()).thenReturn(null);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mAppContext.getString(R.string.spell_checker_not_selected));
-    }
-
-    @Test
-    public void updateState_spellerCheckerDisabled_shouldSetSummaryToDisabledText() {
-        when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(false);
-
-        mController.updateState(mPreference);
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mAppContext.getString(R.string.switch_off_text));
-    }
-
-    @Test
-    public void updateState_hasSpellerChecker_shouldSetSummaryToAppName() {
-        final String spellCheckerAppLabel = "test";
-        final SpellCheckerInfo sci = mock(SpellCheckerInfo.class);
-        when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(true);
-        when(mTextServicesManager.getCurrentSpellChecker()).thenReturn(sci);
-        when(sci.loadLabel(mContext.getPackageManager())).thenReturn(spellCheckerAppLabel);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary()).isEqualTo(spellCheckerAppLabel);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
deleted file mode 100644
index a76aebc6271711d7e3ad2c50d2cd9a7750e712bf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.provider.UserDictionary;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowContentResolver;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserDictionaryCursorLoaderTest {
-
-    private ContentProvider mContentProvider;
-    private UserDictionaryCursorLoader mLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContentProvider = new FakeProvider();
-        mLoader = new UserDictionaryCursorLoader(RuntimeEnvironment.application, "" /* locale */);
-        ShadowContentResolver.registerProvider(UserDictionary.AUTHORITY, mContentProvider);
-    }
-
-    @Test
-    public void testLoad_shouldRemoveDuplicate() {
-        final Cursor cursor = mLoader.loadInBackground();
-
-        assertThat(cursor.getCount()).isEqualTo(4);
-    }
-
-    public static class FakeProvider extends ContentProvider {
-
-
-        @Override
-        public boolean onCreate() {
-            return false;
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-                String sortOrder) {
-            final MatrixCursor cursor = new MatrixCursor(
-                    UserDictionaryCursorLoader.QUERY_PROJECTION);
-            cursor.addRow(new Object[]{1, "word1", "shortcut1"});
-            cursor.addRow(new Object[]{2, "word2", "shortcut2"});
-            cursor.addRow(new Object[]{3, "word3", "shortcut3"});
-            cursor.addRow(new Object[]{4, "word3", "shortcut3"});   // dupe of 3
-            cursor.addRow(new Object[]{5, "word5", null});          // no shortcut
-            return cursor;
-        }
-
-        @Override
-        public String getType(Uri uri) {
-            return null;
-        }
-
-        @Override
-        public Uri insert(Uri uri, ContentValues values) {
-            return null;
-        }
-
-        @Override
-        public int delete(Uri uri, String selection, String[] selectionArgs) {
-            return 0;
-        }
-
-        @Override
-        public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-            return 0;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
deleted file mode 100644
index c6793cb859b13533453019f377fceb71aa51384d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.provider.UserDictionary;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowContentResolver;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserDictionaryListTest {
-
-    private FakeProvider mContentProvider;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContentProvider = new FakeProvider();
-        ShadowContentResolver.registerProvider(UserDictionary.AUTHORITY, mContentProvider);
-    }
-
-    @Test
-    public void getUserDictionaryLocalesSet_noLocale_shouldReturnEmptySet() {
-        mContentProvider.hasDictionary = false;
-
-        assertThat(UserDictionaryList.getUserDictionaryLocalesSet(RuntimeEnvironment.application))
-                .isEmpty();
-    }
-
-    public static class FakeProvider extends ContentProvider {
-
-        public boolean hasDictionary = true;
-
-        @Override
-        public boolean onCreate() {
-            return false;
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-                String sortOrder) {
-            if (hasDictionary) {
-                final MatrixCursor cursor = new MatrixCursor(
-                        new String[]{UserDictionary.Words.LOCALE});
-                cursor.addRow(new Object[]{"en"});
-                cursor.addRow(new Object[]{"es"});
-                return cursor;
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public String getType(Uri uri) {
-            return null;
-        }
-
-        @Override
-        public Uri insert(Uri uri, ContentValues values) {
-            return null;
-        }
-
-        @Override
-        public int delete(Uri uri, String selection, String[] selectionArgs) {
-            return 0;
-        }
-
-        @Override
-        public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
deleted file mode 100644
index fe2b0df38659ca84cf54b28d52e010fb3647f69c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.support.v4.text.BidiFormatter;
-import android.support.v7.preference.Preference;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VirtualKeyboardPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private InputMethodManager mImm;
-    @Mock
-    private DevicePolicyManager mDpm;
-    @Mock
-    private PackageManager mPm;
-    @Mock
-    private Preference mPreference;
-
-    private VirtualKeyboardPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(mDpm);
-        when(mContext.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(mImm);
-        when(mContext.getPackageManager()).thenReturn(mPm);
-        mController = new VirtualKeyboardPreferenceController(mContext);
-    }
-
-    @Test
-    public void shouldAlwaysBeAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_noEnabledIMEs_setEmptySummary() {
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(R.string.summary_empty);
-    }
-
-    @Test
-    public void updateState_singleIme_setImeLabelToSummary() {
-        when(mDpm.getPermittedInputMethodsForCurrentUser()).thenReturn(null);
-        final ComponentName componentName = new ComponentName("pkg", "cls");
-        final List<InputMethodInfo> imis = new ArrayList<>();
-        imis.add(mock(InputMethodInfo.class));
-        when(imis.get(0).getPackageName()).thenReturn(componentName.getPackageName());
-        when(mImm.getEnabledInputMethodList()).thenReturn(imis);
-        when(imis.get(0).loadLabel(mPm)).thenReturn("label");
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary("label");
-    }
-
-    @Test
-    public void updateState_multiImeWithMixedLocale_setImeLabelToSummary() {
-        final BidiFormatter formatter = BidiFormatter.getInstance();
-        final ComponentName componentName = new ComponentName("pkg", "cls");
-        final List<InputMethodInfo> imis = new ArrayList<>();
-        final String label1 = "label";
-        final String label2 = "Keyboard מִקְלֶדֶת";
-        imis.add(mock(InputMethodInfo.class));
-        imis.add(mock(InputMethodInfo.class));
-
-        when(mDpm.getPermittedInputMethodsForCurrentUser()).thenReturn(null);
-        when(mImm.getEnabledInputMethodList()).thenReturn(imis);
-        when(imis.get(0).getPackageName()).thenReturn(componentName.getPackageName());
-        when(imis.get(0).loadLabel(mPm)).thenReturn(label1);
-        when(imis.get(1).getPackageName()).thenReturn(componentName.getPackageName());
-        when(imis.get(1).loadLabel(mPm)).thenReturn(label2);
-        when(mContext.getString(eq(R.string.join_many_items_middle), anyString(), anyString()))
-                .thenAnswer(invocation -> {
-                    final Object[] args = invocation.getArguments();
-                    final String str1 = (String) args[1];
-                    final String str2 = (String) args[2];
-                    return RuntimeEnvironment.application.getString(R.string.join_many_items_middle,
-                            str1, str2);
-                });
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(
-                formatter.unicodeWrap(label1) + ", " + formatter.unicodeWrap(label2));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
deleted file mode 100644
index 809fb3ae521b1c69fa209aaa7a6afbc916d94113..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.language;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.hardware.input.InputManager;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.view.autofill.AutofillManager;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.view.textservice.TextServicesManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LanguageAndInputSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private InputManager mIm;
-    @Mock
-    private InputMethodManager mImm;
-    @Mock
-    private DevicePolicyManager mDpm;
-    @Mock
-    private InputMethodManager mInputMethodManager;
-    @Mock
-    private AutofillManager mAutofillManager;
-    private TestFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
-        when(mActivity.getSystemService(Context.INPUT_SERVICE))
-                .thenReturn(mock(InputManager.class));
-        when(mActivity.getSystemService(Context.INPUT_SERVICE)).thenReturn(mIm);
-        when(mActivity.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
-                .thenReturn(mock(TextServicesManager.class));
-        when(mActivity.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(mDpm);
-        when(mActivity.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(mImm);
-        when((Object) mActivity.getSystemService(AutofillManager.class))
-                .thenReturn(mAutofillManager);
-        mFragment = new TestFragment(mActivity);
-    }
-
-    @Test
-    public void testGetPreferenceScreenResId() {
-        assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(R.xml.language_and_input);
-    }
-
-    @Test
-    public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
-        final List<AbstractPreferenceController> controllers =
-                mFragment.getPreferenceControllers(mActivity);
-        int lifecycleObserverCount = 0;
-        for (AbstractPreferenceController controller : controllers) {
-            if (controller instanceof LifecycleObserver) {
-                lifecycleObserverCount++;
-            }
-        }
-        verify(mFragment.getLifecycle(), times(lifecycleObserverCount))
-                .addObserver(any(LifecycleObserver.class));
-    }
-
-    @Test
-    public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<AbstractPreferenceController> controllers =
-                mFragment.getPreferenceControllers(mActivity);
-
-        assertThat(controllers.isEmpty()).isFalse();
-    }
-
-    @Test
-    @Config(shadows = {
-            ShadowSecureSettings.class,
-    })
-    public void testSummary_shouldSetToCurrentImeName() {
-        final Activity activity = mock(Activity.class);
-        final SummaryLoader loader = mock(SummaryLoader.class);
-        final ComponentName componentName = new ComponentName("pkg", "cls");
-        final ContentResolver cr = activity.getContentResolver();
-        Settings.Secure.putString(cr, Settings.Secure.DEFAULT_INPUT_METHOD,
-                componentName.flattenToString());
-        when(activity.getSystemService(Context.INPUT_METHOD_SERVICE))
-                .thenReturn(mInputMethodManager);
-        when(activity.getPackageManager()).thenReturn(mPackageManager);
-        final List<InputMethodInfo> imis = new ArrayList<>();
-        imis.add(mock(InputMethodInfo.class));
-        when(imis.get(0).getPackageName()).thenReturn(componentName.getPackageName());
-        when(mInputMethodManager.getInputMethodList()).thenReturn(imis);
-
-        SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
-                .createSummaryProvider(activity, loader);
-
-        provider.setListening(true);
-
-        verify(imis.get(0)).loadLabel(mPackageManager);
-        verify(loader).setSummary(provider, null);
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = spy(RuntimeEnvironment.application);
-        final Resources res = spy(RuntimeEnvironment.application.getResources());
-        //(InputManager) context.getSystemService(Context.INPUT_SERVICE);
-        InputManager manager = mock(InputManager.class);
-        when(manager.getInputDeviceIds()).thenReturn(new int[]{});
-        doReturn(manager).when(context).getSystemService(Context.INPUT_SERVICE);
-        doReturn(res).when(context).getResources();
-        doReturn(false).when(res)
-            .getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys);
-        final List<String> niks = LanguageAndInputSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final int xmlId = (new LanguageAndInputSettings()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-
-    @Test
-    public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
-        final Context context = RuntimeEnvironment.application;
-        final LanguageAndInputSettings fragment = new LanguageAndInputSettings();
-        final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                fragment.getPreferenceScreenResId());
-        final List<String> preferenceKeys = new ArrayList<>();
-
-        for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
-            preferenceKeys.add(controller.getPreferenceKey());
-        }
-
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
-    }
-
-    /**
-     * Test fragment to expose lifecycle and context so we can verify behavior for observables.
-     */
-    public static class TestFragment extends LanguageAndInputSettings {
-
-        private Lifecycle mLifecycle;
-        private Context mContext;
-
-        public TestFragment(Context context) {
-            mContext = context;
-            mLifecycle = mock(Lifecycle.class);
-        }
-
-        @Override
-        public Context getContext() {
-            return mContext;
-        }
-
-        @Override
-        protected Lifecycle getLifecycle() {
-            if (mLifecycle == null) {
-                return super.getLifecycle();
-            }
-            return mLifecycle;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
deleted file mode 100644
index 4050dd13da7e82299fc2c67e5af192e444bd295f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.language;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PhoneLanguagePreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private Preference mPreference;
-    private FakeFeatureFactory mFeatureFactory;
-    private PhoneLanguagePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new PhoneLanguagePreferenceController(mContext);
-    }
-
-    @Test
-    public void testIsAvailable_hasMultipleLocales_shouldReturnTrue() {
-        when(mContext.getAssets().getLocales()).thenReturn(new String[]{"en", "de"});
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testIsAvailable_hasSingleLocales_shouldReturnFalse() {
-        when(mContext.getAssets().getLocales()).thenReturn(new String[]{"en"});
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_shouldUpdateSummary() {
-        final String testSummary = "test";
-        when(mFeatureFactory.localeFeatureProvider.getLocaleNames()).thenReturn(testSummary);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(testSummary);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
deleted file mode 100644
index e4b3cf278365d622e9c42c5b063271122cb57e73..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.language;
-
-import android.content.Context;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TtsEngines;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TtsPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private TtsEngines mTtsEngines;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private TtsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mController = new TtsPreferenceController(mContext, mTtsEngines);
-    }
-
-    @Test
-    public void testIsAvailable_ttsEngineEmpty_shouldReturnFalse() {
-
-        // Not available when there is no engine.
-        when(mTtsEngines.getEngines()).thenReturn(new ArrayList<>());
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_ttsEngineInstalled_shouldReturnTrue() {
-        final List<TextToSpeech.EngineInfo> infolist = new ArrayList<>();
-        infolist.add(mock(TextToSpeech.EngineInfo.class));
-        when(mTtsEngines.getEngines()).thenReturn(infolist);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_notAvailable_shouldRemoveCategory() {
-        final Preference preference = mock(Preference.class);
-        final Preference category = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(2);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(mScreen.getPreference(1)).thenReturn(category);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-        when(category.getKey()).thenReturn("voice_category");
-
-        mController.displayPreference(mScreen);
-
-        // Remove preference.
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
deleted file mode 100644
index 26a160d0b77d0cfe81961b57b1ab1db16dee9306..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.language;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.TestConfig;
-import com.android.settings.inputmethod.UserDictionaryList;
-import com.android.settings.inputmethod.UserDictionarySettings;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.TreeSet;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserDictionaryPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private Preference mPreference;
-    private TestController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mController = new TestController(mContext);
-        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
-    }
-
-    @Test
-    public void testIsAvailable_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_noLocale_setUserDictionarySettingsAsFragment() {
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getFragment())
-                .isEqualTo(UserDictionarySettings.class.getCanonicalName());
-    }
-
-    @Test
-    public void updateState_singleLocale_setUserDictionarySettingsAsFragment_setLocaleInExtra() {
-        mController.mLocales.add("en");
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getFragment())
-                .isEqualTo(UserDictionarySettings.class.getCanonicalName());
-        assertThat(mPreference.getExtras().getString("locale"))
-                .isEqualTo("en");
-    }
-
-    @Test
-    public void updateState_multiLocale_setUserDictionaryListAsFragment() {
-        mController.mLocales.add("en");
-        mController.mLocales.add("de");
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getFragment())
-                .isEqualTo(UserDictionaryList.class.getCanonicalName());
-    }
-
-    /**
-     * Fake Controller that overrides getDictionaryLocales to make testing the rest of stuff easier.
-     */
-    private class TestController extends UserDictionaryPreferenceController {
-
-        private TreeSet<String> mLocales = new TreeSet<>();
-
-        @Override
-        protected TreeSet<String> getDictionaryLocales() {
-            return mLocales;
-        }
-
-        public TestController(Context context) {
-            super(context);
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
deleted file mode 100644
index 602bbd128902ddff4ccb8f86b49b220136e8deda..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.android.settings.location;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppLocationPermissionPreferenceControllerTest {
-    @Mock
-    private Preference mPreference;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private AppLocationPermissionPreferenceController mController;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mController = new AppLocationPermissionPreferenceController(mContext);
-    }
-
-    @Test
-    public void displayPreference_shouldRemovePreference() {
-        Settings.System.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,
-                0);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void displayPreference_shouldNotRemovePreference() {
-        Settings.System.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,
-                1);
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
deleted file mode 100644
index c7e0e0a4433699e5fe117dce9a76217ae20f4142..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.location;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.location.LocationManager;
-import android.provider.Settings;
-import android.provider.Settings.Secure;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.display.AutoBrightnessPreferenceController;
-import com.android.settings.search.InlineListPayload;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LocationPreferenceControllerTest {
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private Lifecycle mLifecycle;
-    private LocationPreferenceController mController;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        mController = new LocationPreferenceController(mContext, mLifecycle);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-    }
-
-    @Test
-    public void isAvailable_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_shouldSetSummary() {
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(nullable(String.class));
-    }
-
-    @Test
-    public void updateSummary_shouldSetSummary() {
-        mController.displayPreference(mScreen);
-        mController.updateSummary();
-
-        verify(mPreference).setSummary(nullable(String.class));
-    }
-
-    @Test
-    public void getLocationSummary_locationOff_shouldSetSummaryOff() {
-        Secure.putInt(mContext.getContentResolver(),
-                Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
-
-        assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-                mContext.getString(R.string.location_off_summary));
-    }
-
-    @Test
-    public void getLocationSummary_sensorsOnly_shouldSetSummarySensorsOnly() {
-        Secure.putInt(mContext.getContentResolver(),
-                Secure.LOCATION_MODE, Secure.LOCATION_MODE_SENSORS_ONLY);
-
-        assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-                mContext.getString(R.string.location_on_summary,
-                        mContext.getString(R.string.location_mode_sensors_only_title)));
-    }
-
-    @Test
-    public void getLocationSummary_highAccuracy_shouldSetSummarHighAccuracy() {
-        Secure.putInt(mContext.getContentResolver(),
-                Secure.LOCATION_MODE, Secure.LOCATION_MODE_HIGH_ACCURACY);
-
-        assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-                mContext.getString(R.string.location_on_summary,
-                        mContext.getString(R.string.location_mode_high_accuracy_title)));
-    }
-
-    @Test
-    public void getLocationSummary_batterySaving_shouldSetSummaryBatterySaving() {
-        Secure.putInt(mContext.getContentResolver(),
-                Secure.LOCATION_MODE, Secure.LOCATION_MODE_BATTERY_SAVING);
-
-        assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-                mContext.getString(R.string.location_on_summary,
-                        mContext.getString(R.string.location_mode_battery_saving_title)));
-    }
-
-    @Test
-    public void getLocationString_shouldCorrectString() {
-        assertThat(mController.getLocationString(Secure.LOCATION_MODE_OFF)).isEqualTo(
-                R.string.location_mode_location_off_title);
-        assertThat(mController.getLocationString(Secure.LOCATION_MODE_SENSORS_ONLY)).isEqualTo(
-                R.string.location_mode_sensors_only_title);
-        assertThat(mController.getLocationString(Secure.LOCATION_MODE_BATTERY_SAVING)).isEqualTo(
-                R.string.location_mode_battery_saving_title);
-        assertThat(mController.getLocationString(Secure.LOCATION_MODE_HIGH_ACCURACY)).isEqualTo(
-                R.string.location_mode_high_accuracy_title);
-    }
-
-    @Test
-    public void onResume_shouldRegisterObserver() {
-        mLifecycle.onResume();
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-    }
-
-    @Test
-    public void onPause_shouldUnregisterObserver() {
-        mLifecycle.onPause();
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-    }
-
-    @Test
-    public void locationProvidersChangedReceiver_updatesPreferenceSummary() {
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        mController.mLocationProvidersChangedReceiver.onReceive(
-                mContext,
-                new Intent().setAction(LocationManager.PROVIDERS_CHANGED_ACTION));
-
-        verify(mPreference).setSummary(any());
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = RuntimeEnvironment.application;
-        mController = new LocationPreferenceController(context, null /* lifecycle */);
-        ResultPayload payload = mController.getResultPayload();
-        assertThat(payload).isInstanceOf(InlineListPayload.class);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testSetValue_updatesCorrectly() {
-        int newValue = Secure.LOCATION_MODE_BATTERY_SAVING;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver, Secure.LOCATION_MODE,
-                Secure.LOCATION_MODE_OFF);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testGetValue_correctValueReturned() {
-        int expectedValue = Secure.LOCATION_MODE_BATTERY_SAVING;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Secure.LOCATION_MODE, expectedValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(expectedValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
deleted file mode 100644
index 2c11e0c21dde94e9dd7df0bfe7f1cba4acc584f9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.network;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsWrapper;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = ShadowRestrictedLockUtilsWrapper.class
-)
-public class MobileNetworkPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private Lifecycle mLifecycle;
-    private MobileNetworkPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
-                .thenReturn(mTelephonyManager);
-    }
-
-    @Test
-    public void secondaryUser_prefIsNotAvailable() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-        when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class)))
-                .thenReturn(false);
-        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
-                .thenReturn(true);
-
-        mController = new MobileNetworkPreferenceController(mContext);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void wifiOnly_prefIsNotAvailable() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class)))
-                .thenReturn(false);
-        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
-                .thenReturn(false);
-
-        mController = new MobileNetworkPreferenceController(mContext);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void goThroughLifecycle_isAvailable_shouldListenToServiceChange() {
-        mController = spy(new MobileNetworkPreferenceController(mContext));
-        mLifecycle.addObserver(mController);
-        doReturn(true).when(mController).isAvailable();
-
-        mLifecycle.onResume();
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_SERVICE_STATE);
-
-        mLifecycle.onPause();
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_NONE);
-    }
-
-    @Test
-    public void serviceStateChange_shouldUpdatePrefSummary() {
-        final String testCarrierName = "test";
-        final Preference mPreference = mock(Preference.class);
-        mController = spy(new MobileNetworkPreferenceController(mContext));
-        mLifecycle.addObserver(mController);
-
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(true).when(mController).isAvailable();
-
-        // Display pref and go through lifecycle to set up listener.
-        mController.displayPreference(mScreen);
-        mLifecycle.onResume();
-        verify(mController).onResume();
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_SERVICE_STATE);
-
-        // Trigger listener update
-        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(testCarrierName);
-        mController.mPhoneStateListener.onServiceStateChanged(null);
-
-        // Carrier name should be set.
-        verify(mPreference).setSummary(testCarrierName);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
deleted file mode 100644
index a84179da941f4c254eb60265a5a30edbb4525408..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class MobilePlanPreferenceControllerTest {
-
-    @Test
-    public void testNoProvisionStringFormattedCorrectly() {
-        final String operator = "test_operator";
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        assertThat(context.getString(R.string.mobile_no_provisioning_url, operator, operator))
-                .contains(operator);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
deleted file mode 100644
index fb3e75d51e8a8d12b9d4aea617fc68a4a636c16d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.provider.SearchIndexableResource;
-import android.view.Menu;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.CategoryKey;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NetworkDashboardFragmentTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private UserInfo mUserInfo;
-
-    private NetworkDashboardFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFragment = new NetworkDashboardFragment();
-    }
-
-    @Test
-    public void testCategory_isNetwork() {
-        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NETWORK);
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
-    }
-
-    @Test
-    public void testPrepareActionBar_networkResetShouldBeCreated() {
-        final NetworkResetActionMenuController resetController =
-                mock(NetworkResetActionMenuController.class);
-        ReflectionHelpers.setField(mFragment, "mNetworkResetController", resetController);
-
-        mFragment.onCreateOptionsMenu(null, null);
-
-        verify(resetController).buildMenuItem(nullable(Menu.class));
-    }
-
-    @Test
-    public void testSummaryProvider_hasMobileAndHotspot_shouldReturnMobileSummary() {
-        final MobileNetworkPreferenceController mobileNetworkPreferenceController =
-                mock(MobileNetworkPreferenceController.class);
-        final TetherPreferenceController tetherPreferenceController =
-                mock(TetherPreferenceController.class);
-
-        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
-        final SummaryLoader.SummaryProvider provider =
-                new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
-                        mobileNetworkPreferenceController, tetherPreferenceController);
-
-        provider.setListening(false);
-
-        verifyZeroInteractions(summaryLoader);
-
-        when(mobileNetworkPreferenceController.isAvailable()).thenReturn(true);
-        when(tetherPreferenceController.isAvailable()).thenReturn(true);
-
-        provider.setListening(true);
-
-        verify(mContext).getString(R.string.wifi_settings_title);
-        verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
-        verify(mContext).getString(R.string.network_dashboard_summary_hotspot);
-        verify(mContext).getString(R.string.network_dashboard_summary_mobile);
-        verify(mContext, times(3)).getString(R.string.join_many_items_middle, null, null);
-    }
-
-    @Test
-    public void testSummaryProvider_noMobileOrHotspot_shouldReturnSimpleSummary() {
-        final MobileNetworkPreferenceController mobileNetworkPreferenceController =
-                mock(MobileNetworkPreferenceController.class);
-        final TetherPreferenceController tetherPreferenceController =
-                mock(TetherPreferenceController.class);
-
-        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
-        final SummaryLoader.SummaryProvider provider =
-                new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
-                        mobileNetworkPreferenceController, tetherPreferenceController);
-
-        provider.setListening(false);
-
-        verifyZeroInteractions(summaryLoader);
-
-        when(mobileNetworkPreferenceController.isAvailable()).thenReturn(false);
-        when(tetherPreferenceController.isAvailable()).thenReturn(false);
-
-        provider.setListening(true);
-
-        verify(mContext).getString(R.string.wifi_settings_title);
-        verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
-        verify(mContext).getString(R.string.join_many_items_middle, null, null);
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
deleted file mode 100644
index 0b2be3a2ad4037c805df56a7f041837dbb30f1a0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NetworkResetActionMenuControllerTest {
-
-    private Context mContext;
-    private NetworkResetActionMenuController mController;
-    @Mock
-    private Menu mMenu;
-    @Mock
-    private MenuItem mMenuItem;
-    @Mock
-    private NetworkResetRestrictionChecker mRestrictionChecker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new NetworkResetActionMenuController(mContext);
-        ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);
-        when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
-    }
-
-    @Test
-    public void buildMenuItem_available_shouldAddToMenu() {
-        when(mRestrictionChecker.hasRestriction()).thenReturn(false);
-        mController.buildMenuItem(mMenu);
-
-        verify(mMenu).add(anyInt(), anyInt(), anyInt(), anyInt());
-        verify(mMenuItem).setOnMenuItemClickListener(any(MenuItem.OnMenuItemClickListener.class));
-    }
-
-    @Test
-    public void buildMenuItem_notAvailable_shouldNotAddToMenu() {
-        when(mRestrictionChecker.hasRestriction()).thenReturn(true);
-
-        mController.buildMenuItem(mMenu);
-
-        verify(mMenu, never()).add(anyInt(), anyInt(), anyInt(), anyInt());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
deleted file mode 100644
index 4d8c6267bb51fa288c4e8313482667b4f037feff..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NetworkResetPreferenceControllerTest {
-
-    @Mock
-    private NetworkResetRestrictionChecker mRestrictionChecker;
-    private Context mContext;
-    private NetworkResetPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new NetworkResetPreferenceController(mContext);
-        ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);
-    }
-
-    @Test
-    public void testIsAvailable_shouldReturnTrueWhenNoUserRestriction() {
-        when(mRestrictionChecker.isRestrictionEnforcedByAdmin()).thenReturn(true);
-
-        when(mRestrictionChecker.hasUserRestriction()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-
-        when(mRestrictionChecker.hasUserRestriction()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mRestrictionChecker, never()).isRestrictionEnforcedByAdmin();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
deleted file mode 100644
index 792bdd3ca9e30b03a15997455f6757c501e5008f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NetworkResetRestrictionCheckerTest {
-
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Context mContext;
-    private NetworkResetRestrictionChecker mRestrictionChecker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mRestrictionChecker = spy(new NetworkResetRestrictionChecker(mContext));
-    }
-
-    @Test
-    public void testHasRestriction_notAdmin_shouldReturnTrue() {
-        final Context context = mock(Context.class);
-        when(context.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mUserManager.isAdminUser()).thenReturn(false);
-
-        assertThat(mRestrictionChecker.hasRestriction()).isTrue();
-    }
-
-    @Test
-    public void testHasRestriction_hasUserRestriction_shouldReturnTrue() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        doReturn(true).when(mRestrictionChecker).hasUserBaseRestriction();
-        doReturn(false).when(mRestrictionChecker).isRestrictionEnforcedByAdmin();
-
-        assertThat(mRestrictionChecker.hasRestriction()).isTrue();
-    }
-
-    @Test
-    public void testHasRestriction_hasAdminRestriction_shouldReturnTrue() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        doReturn(false).when(mRestrictionChecker).hasUserBaseRestriction();
-        doReturn(true).when(mRestrictionChecker).isRestrictionEnforcedByAdmin();
-
-        assertThat(mRestrictionChecker.hasRestriction()).isTrue();
-    }
-
-    @Test
-    public void testHasRestriction_noRestriction_shouldReturnFalse() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        doReturn(false).when(mRestrictionChecker).hasUserBaseRestriction();
-        doReturn(false).when(mRestrictionChecker).isRestrictionEnforcedByAdmin();
-
-        assertThat(mRestrictionChecker.hasRestriction()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
deleted file mode 100644
index 0b1586e2c9bb4c814c423a8f964ebe1bc67eac75..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.net.NetworkScorerAppData;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.Collections;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NetworkScorerPickerPreferenceControllerTest {
-
-    private static final String TEST_SCORER_PACKAGE = "Test Package";
-    private static final String TEST_SCORER_CLASS = "Test Class";
-    private static final String TEST_SCORER_LABEL = "Test Label";
-
-    private Context mContext;
-    @Mock
-    private NetworkScoreManagerWrapper mNetworkScorer;
-    private NetworkScorerPickerPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new NetworkScorerPickerPreferenceController(mContext, mNetworkScorer);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_preferenceSetSummaryAsActiveScorerLabel() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.singletonList(scorerAppData));
-        when(mNetworkScorer.getActiveScorer()).thenReturn(scorerAppData);
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setSummary(TEST_SCORER_LABEL);
-    }
-
-    @Test
-    public void updateState_scorersAvailable_noActiveScorer_preferenceSetSummaryToNone() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.singletonList(scorerAppData));
-        when(mNetworkScorer.getActiveScorer()).thenReturn(null);
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setSummary(mContext.getString(
-                R.string.network_scorer_picker_none_preference));
-    }
-
-    @Test
-    public void updateState_scorersAvailable_preferenceEnabled() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.singletonList(scorerAppData));
-
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setEnabled(true);
-    }
-
-    @Test
-    public void updateState_noScorersAvailable_preferenceDisabled() {
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.emptyList());
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setEnabled(false);
-        verify(preference).setSummary(null);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
deleted file mode 100644
index 9885bdf684f4b40c3bff3576ff52cdcd51120d60..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.net.NetworkScorerAppData;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.widget.RadioButtonPreference;
-import com.google.android.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NetworkScorerPickerTest {
-
-    private static final String TEST_SCORER_PACKAGE_1 = "Test Package 1";
-    private static final String TEST_SCORER_CLASS_1 = "Test Class 1";
-    private static final String TEST_SCORER_LABEL_1 = "Test Label 1";
-    private static final String TEST_SCORER_PACKAGE_2 = "Test Package 2";
-
-    private Context mContext;
-    @Mock
-    private NetworkScoreManagerWrapper mNetworkScoreManager;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private TestFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mFragment = new TestFragment(mContext, mPreferenceScreen, mNetworkScoreManager);
-        mFragment.onAttach(mContext);
-    }
-
-    @Test
-    public void testOnRadioButtonClicked_success() {
-        RadioButtonPreference pref = new RadioButtonPreference(mContext);
-        pref.setKey(TEST_SCORER_PACKAGE_1);
-        when(mPreferenceScreen.getPreference(anyInt())).thenReturn(pref);
-        when(mPreferenceScreen.getPreferenceCount()).thenReturn(1);
-        when(mNetworkScoreManager.setActiveScorer(TEST_SCORER_PACKAGE_1)).thenReturn(true);
-        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_2);
-
-        mFragment.onRadioButtonClicked(pref);
-
-        verify(mNetworkScoreManager).setActiveScorer(TEST_SCORER_PACKAGE_1);
-        assertThat(pref.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testOnRadioButtonClicked_currentScorer_doNothing() {
-        RadioButtonPreference pref = new RadioButtonPreference(mContext);
-        pref.setKey(TEST_SCORER_PACKAGE_1);
-        pref.setChecked(true);
-        when(mPreferenceScreen.getPreference(anyInt())).thenReturn(pref);
-        when(mPreferenceScreen.getPreferenceCount()).thenReturn(1);
-        when(mNetworkScoreManager.setActiveScorer(TEST_SCORER_PACKAGE_1)).thenReturn(true);
-        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_1);
-
-        mFragment.onRadioButtonClicked(pref);
-
-        verify(mNetworkScoreManager, never()).setActiveScorer(any());
-        assertThat(pref.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateCandidates_noValidScorers_nonePreference() {
-        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(new ArrayList<>());
-        ArgumentCaptor<RadioButtonPreference> arg =
-                ArgumentCaptor.forClass(RadioButtonPreference.class);
-
-        mFragment.updateCandidates();
-
-        verify(mPreferenceScreen).addPreference(arg.capture());
-        assertThat(arg.getValue().getTitle()).isEqualTo(
-                mContext.getString(R.string.network_scorer_picker_none_preference));
-        assertThat(arg.getValue().isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateCandidates_validScorers_noActiveScorer() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE_1, TEST_SCORER_CLASS_1);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL_1, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(
-                Lists.newArrayList(scorerAppData));
-        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(null);
-
-        ArgumentCaptor<RadioButtonPreference> arg =
-                ArgumentCaptor.forClass(RadioButtonPreference.class);
-
-        mFragment.updateCandidates();
-
-        verify(mPreferenceScreen, times(2)).addPreference(arg.capture());
-
-        final RadioButtonPreference nonePref = arg.getAllValues().get(0);
-        assertThat(nonePref.getKey()).isNull();
-        assertThat(nonePref.isChecked()).isTrue();
-
-        final RadioButtonPreference testScorerPref = arg.getAllValues().get(1);
-        assertThat(testScorerPref.getTitle()).isEqualTo(TEST_SCORER_LABEL_1);
-        assertThat(testScorerPref.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdateCandidates_validScorer() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE_1, TEST_SCORER_CLASS_1);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL_1, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(
-                Lists.newArrayList(scorerAppData));
-        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_1);
-        ArgumentCaptor<RadioButtonPreference> arg =
-                ArgumentCaptor.forClass(RadioButtonPreference.class);
-
-        mFragment.updateCandidates();
-
-        // The first preference added is the "none" preference and the second is the
-        // pref for the test scorer.
-        verify(mPreferenceScreen, times(2)).addPreference(arg.capture());
-        // Returns the last captured value which is expected to be the test scorer pref.
-        RadioButtonPreference pref = arg.getValue();
-        assertThat(pref.getTitle()).isEqualTo(TEST_SCORER_LABEL_1);
-        assertThat(pref.isChecked()).isTrue();
-    }
-
-    public static class TestFragment extends NetworkScorerPicker {
-
-        private final Context mContext;
-        private final PreferenceScreen mScreen;
-        private final PreferenceManager mPrefManager;
-        private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
-
-        public TestFragment(Context context, PreferenceScreen preferenceScreen,
-                NetworkScoreManagerWrapper networkScoreManagerWrapper) {
-            mContext = context;
-            mScreen = preferenceScreen;
-            mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
-            mPrefManager = mock(PreferenceManager.class);
-            when(mPrefManager.getContext()).thenReturn(context);
-        }
-
-        @Override
-        public Context getContext() {
-            return mContext;
-        }
-
-        @Override
-        public PreferenceManager getPreferenceManager() {
-            return mPrefManager;
-        }
-
-        @Override
-        public PreferenceScreen getPreferenceScreen() {
-            return mScreen;
-        }
-
-        @Override
-        NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
-            return mNetworkScoreManagerWrapper;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
deleted file mode 100644
index b8a6d28a25307d73bbc96f3aceb790397db6a1eb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothPan;
-import android.bluetooth.BluetoothProfile;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.ContentObserver;
-import android.net.ConnectivityManager;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TetherPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private BluetoothAdapter mBluetoothAdapter;
-    @Mock
-    private Preference mPreference;
-
-    private TetherPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = spy(TetherPreferenceController.class);
-        ReflectionHelpers.setField(mController, "mContext", mContext);
-        ReflectionHelpers.setField(mController, "mConnectivityManager", mConnectivityManager);
-        ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
-        ReflectionHelpers.setField(mController, "mPreference", mPreference);
-    }
-
-    @Test
-    public void lifeCycle_onCreate_shouldInitBluetoothPan() {
-        mController.onCreate(null);
-
-        verify(mBluetoothAdapter).getProfileProxy(mContext, mController.mBtProfileServiceListener,
-                BluetoothProfile.PAN);
-    }
-
-    @Test
-    public void goThroughLifecycle_shouldDestoryBluetoothProfile() {
-        final BluetoothPan pan = mock(BluetoothPan.class);
-        final AtomicReference<BluetoothPan> panRef =
-                ReflectionHelpers.getField(mController, "mBluetoothPan");
-        panRef.set(pan);
-
-        mController.onDestroy();
-
-        verify(mBluetoothAdapter).closeProfileProxy(BluetoothProfile.PAN, pan);
-    }
-
-    @Test
-    public void updateSummary_noPreference_noInteractionWithConnectivityManager() {
-        ReflectionHelpers.setField(mController, "mPreference", null);
-        mController.updateSummary();
-        verifyNoMoreInteractions(mConnectivityManager);
-    }
-
-    @Test
-    public void updateSummary_wifiTethered_shouldShowHotspotMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"});
-
-        mController.updateSummary();
-        verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_off);
-    }
-
-    @Test
-    public void updateSummary_btThetherOn_shouldShowTetherMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
-
-        mController.updateSummary();
-        verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_off_tether_on);
-    }
-
-    @Test
-    public void updateSummary_tetherOff_shouldShowTetherOffMessage() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
-
-        mController.updateSummary();
-        verify(mPreference).setSummary(R.string.switch_off_text);
-    }
-
-    @Test
-    public void updateSummary_wifiBtTetherOn_shouldShowHotspotAndTetherMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"});
-
-        mController.updateSummary();
-        verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_on);
-    }
-
-    @Test
-    public void airplaneModeOn_shouldUpdateSummaryToOff() {
-        ReflectionHelpers.setField(mController, "mContext", RuntimeEnvironment.application);
-
-        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_ON, 0);
-
-        mController.onResume();
-
-        verifyZeroInteractions(mPreference);
-
-        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_ON, 1);
-
-        final ContentObserver observer = ReflectionHelpers.getField(mController,
-                "mAirplaneModeObserver");
-        observer.onChange(true, Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON));
-
-        verify(mPreference).setSummary(R.string.switch_off_text);
-    }
-
-    @Test
-    public void onResume_shouldRegisterTetherReceiver() {
-        when(mContext.getContentResolver()).thenReturn(mock(ContentResolver.class));
-
-        mController.onResume();
-
-        verify(mContext).registerReceiver(
-                any(TetherPreferenceController.TetherBroadcastReceiver.class),
-                any(IntentFilter.class));
-    }
-
-    @Test
-    public void onPause_shouldUnregisterTetherReceiver() {
-        when(mContext.getContentResolver()).thenReturn(mock(ContentResolver.class));
-        mController.onResume();
-
-        mController.onPause();
-
-        verify(mContext).unregisterReceiver(
-                any(TetherPreferenceController.TetherBroadcastReceiver.class));
-    }
-
-    @Test
-    public void tetherStatesChanged_shouldUpdateSummary() {
-        final Context context = RuntimeEnvironment.application;
-        ReflectionHelpers.setField(mController, "mContext", context);
-        mController.onResume();
-
-        context.sendBroadcast(new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
-
-        verify(mController).updateSummary();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
deleted file mode 100644
index b7c48485c15f24646f07a2b0f136e1a6a38c14e7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.IConnectivityManager;
-import android.net.NetworkRequest;
-import android.os.IBinder;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowServiceManager;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VpnPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private IBinder mBinder;
-    @Mock
-    private IConnectivityManager mConnectivityManagerService;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mPreference;
-    private VpnPreferenceController mController;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mBinder.queryLocalInterface("android.net.IConnectivityManager"))
-                .thenReturn(mConnectivityManagerService);
-        ShadowServiceManager.addService(Context.CONNECTIVITY_SERVICE, mBinder);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-
-        mController = spy(new VpnPreferenceController(mContext));
-        mLifecycle = new Lifecycle();
-        mLifecycle.addObserver(mController);
-    }
-
-    @Test
-    public void displayPreference_available_shouldSetDependency() {
-
-        doReturn(true).when(mController).isAvailable();
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
-    }
-
-    @Test
-    public void goThroughLifecycle_shouldRegisterUnregisterListener() {
-        doReturn(true).when(mController).isAvailable();
-
-        mLifecycle.onResume();
-        verify(mConnectivityManager).registerNetworkCallback(
-                any(NetworkRequest.class), any(ConnectivityManager.NetworkCallback.class));
-
-        mLifecycle.onPause();
-        verify(mConnectivityManager).unregisterNetworkCallback(
-                any(ConnectivityManager.NetworkCallback.class));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
deleted file mode 100644
index 172508d626bb0da1f1fb1550c4fc9af51d2af122..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.telephony.CarrierConfigManager;
-import android.telephony.TelephonyManager;
-
-import com.android.ims.ImsManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiCallingPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private CarrierConfigManager mCarrierConfigManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private Preference mPreference;
-    private WifiCallingPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE))
-                .thenReturn(mCarrierConfigManager);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
-                .thenReturn(mTelephonyManager);
-        mController = new WifiCallingPreferenceController(mContext);
-    }
-
-    @Test
-    public void isAvailable_platformEnabledAndProvisioned_shouldReturnTrue() {
-        ImsManager.wfcEnabledByPlatform = true;
-        ImsManager.wfcProvisioned = true;
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_shouldUpdatePreferenceSummary() {
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(anyInt());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
deleted file mode 100644
index a82daf3c09459a656a2e534dd42cf0185cabb70c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.nfc;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PaymentSettingsTest {
-    @Mock
-    Context mContext;
-
-    @Mock
-    private PackageManager mManager;
-
-    private PaymentSettings mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFragment = new PaymentSettings();
-        when(mContext.getPackageManager()).thenReturn(mManager);
-    }
-
-    @Test
-    public void testNonIndexableKey_NoNFC_KeyAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
-
-        List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-        assertThat(niks).contains(mFragment.PAYMENT_KEY);
-    }
-
-    @Test
-    public void testNonIndexableKey_NFC_NoKeyAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
-
-        List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-        assertThat(niks).isEmpty();
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
deleted file mode 100644
index d33d7345494c65721dfe45e9bab137a3cb4d8d31..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.accounts.AccountRestrictionHelper;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AdjustVolumeRestrictedPreferenceControllerTest {
-
-    @Mock
-    private AccountRestrictionHelper mAccountHelper;
-
-    private Context mContext;
-    private AdjustVolumeRestrictedPreferenceControllerTestable mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = spy(shadowContext.getApplicationContext());
-        mController =
-            new AdjustVolumeRestrictedPreferenceControllerTestable(mContext, mAccountHelper);
-    }
-
-    @Test
-    public void updateState_hasBaseRestriction_shouldDisable() {
-        RestrictedPreference preference = mock(RestrictedPreference.class);
-        when(mAccountHelper.hasBaseUserRestriction(
-            eq(UserManager.DISALLOW_ADJUST_VOLUME), anyInt())).thenReturn(true);
-
-        mController.updateState(preference);
-
-        assertThat(preference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_NoBaseRestriction_shouldCheckRestriction() {
-        RestrictedPreference preference = spy(new RestrictedPreference(mContext));
-
-        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(null);
-        when(mAccountHelper.hasBaseUserRestriction(
-            eq(UserManager.DISALLOW_ADJUST_VOLUME), anyInt())).thenReturn(false);
-        doCallRealMethod().when(mAccountHelper).enforceRestrictionOnPreference(
-            eq(preference), eq(UserManager.DISALLOW_ADJUST_VOLUME), anyInt());
-
-        mController.updateState(preference);
-
-        verify(preference).checkRestrictionAndSetDisabled(
-            eq(UserManager.DISALLOW_ADJUST_VOLUME), anyInt());
-    }
-
-    private class AdjustVolumeRestrictedPreferenceControllerTestable extends
-        AdjustVolumeRestrictedPreferenceController {
-        AdjustVolumeRestrictedPreferenceControllerTestable(Context context,
-            AccountRestrictionHelper helper) {
-            super(context, helper);
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return null;
-        }
-
-        @Override
-        public boolean handlePreferenceTreeClick(Preference preference) {
-            return false;
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return true;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
deleted file mode 100644
index f4bd5229b8ceeee52ee6540394c4c4ef076e7e5b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.media.RingtoneManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AlarmRingtonePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    private AlarmRingtonePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new AlarmRingtonePreferenceController(mContext);
-    }
-
-    @Test
-    public void getRingtoneType_shouldReturnAlarm() {
-        assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_ALARM);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
deleted file mode 100644
index 7b0b0333041f337220582165f15805d510343776..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.media.AudioManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AlarmVolumePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private AudioHelper mHelper;
-
-    private AlarmVolumePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new AlarmVolumePreferenceController(mContext, null, null, mHelper);
-    }
-
-    @Test
-    public void isAvailable_singleVolume_shouldReturnFalse() {
-        when(mHelper.isSingleVolume()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_notSingleVolume_shouldReturnTrue() {
-        when(mHelper.isSingleVolume()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getAudioStream_shouldReturnAlarm() {
-        assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_ALARM);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
deleted file mode 100644
index c1a7d055463f002e6a0c622cb13f79245b80935a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
-
-import com.android.settings.TestConfig;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BadgingNotificationPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private BadgingNotificationPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new BadgingNotificationPreferenceController(mContext);
-    }
-
-    @Test
-    public void display_configIsTrue_shouldDisplay() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_notificationBadging))
-                .thenReturn(true);
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void display_configIsFalse_shouldNotDisplay() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_notificationBadging))
-                .thenReturn(false);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedWhenSettingIsOn() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.Secure.putInt(context.getContentResolver(), NOTIFICATION_BADGING, 1);
-
-        mController = new BadgingNotificationPreferenceController(context);
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.Secure.putInt(context.getContentResolver(), NOTIFICATION_BADGING, 0);
-
-        mController = new BadgingNotificationPreferenceController(context);
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-    }
-
-    @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testSetValue_updatesCorrectly() {
-        int newValue = 0;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.NOTIFICATION_BADGING, 1);
-
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.NOTIFICATION_BADGING,
-                1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    @Config(shadows = ShadowSecureSettings.class)
-    public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.NOTIFICATION_BADGING, currentValue);
-
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
deleted file mode 100644
index 58ba46bf1775eb16d7233dc8f3f5a404f3250b5d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BootSoundPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SwitchPreference mPreference;
-
-    private BootSoundPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        SettingsShadowSystemProperties.clear();
-        when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_boot_sounds))
-            .thenReturn(true);
-        mController = new BootSoundPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void isAvailable_hasBootSounds_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(
-            com.android.settings.R.bool.has_boot_sounds)).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noBootSounds_shouldReturnFale() {
-        when(mContext.getResources().getBoolean(
-            com.android.settings.R.bool.has_boot_sounds)).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_bootSoundEnabled_shouldCheckedPreference() {
-        SettingsShadowSystemProperties.set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "1");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_bootSoundDisabled_shouldUncheckedPreference() {
-        SettingsShadowSystemProperties.set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "0");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableBootSound() {
-        when(mPreference.isChecked()).thenReturn(true);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(SystemProperties.getBoolean(
-            BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, true)).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableBootSound() {
-        when(mPreference.isChecked()).thenReturn(false);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(SystemProperties.getBoolean(
-            BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, true)).isFalse();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
deleted file mode 100644
index ed9cc983eecd265eed455764158d5e4613f37b06..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CastPreferenceControllerTest {
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-
-    private Context mContext;
-    private CastPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
-        mContext = shadowContext.getApplicationContext();
-        mController = new CastPreferenceController(mContext);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateNonIndexableKeys_shouldNotUpdate() {
-        final List<String> keys = new ArrayList<>();
-
-        mController.updateNonIndexableKeys(keys);
-
-        assertThat(keys).isEmpty();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
deleted file mode 100644
index 2b2d024ee80801c5efa4b79f2a2748183fe1e6e5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ChargingSoundPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock
-    private Context mContext;
-
-    private ChargingSoundPreferenceController mController;
-    private SwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
-        mController = new ChargingSoundPreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_isAlwaysTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_chargingSoundEnabled_shouldCheckedPreference() {
-        Global.putInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_chargingSoundDisabled_shouldUncheckedPreference() {
-        Global.putInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceChecked_shouldEnabledChargingSound() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true);
-
-        assertThat(Global.getInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 1))
-            .isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceUnchecked_shouldDisabledChargingSound() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false);
-
-        assertThat(Global.getInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 1))
-            .isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
deleted file mode 100644
index 8cf8f8385385cafb0145359206228aa764ae20a6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN;
-import static com.android.settings.notification.ConfigureNotificationSettings
-        .KEY_LOCKSCREEN_WORK_PROFILE;
-import static com.android.settings.notification.ConfigureNotificationSettings
-        .KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
-import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN;
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ConfigureNotificationSettingsTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    @Config(shadows = {
-            ShadowUtils.class,
-            ShadowLockPatternUtils.class
-    })
-    public void getNonIndexableKeys_shouldContainLockScreenPrefs() {
-        final List<String> keys = ConfigureNotificationSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-
-        assertThat(keys).containsAllOf(
-                KEY_SWIPE_DOWN, KEY_LOCKSCREEN, KEY_LOCKSCREEN_WORK_PROFILE,
-                KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
deleted file mode 100644
index 4ec67e6ad8c47263737ee7c6cd2be31923546881..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DialPadTonePreferenceControllerTest {
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock
-    private Context mContext;
-
-    private DialPadTonePreferenceController mController;
-    private SwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
-        mController = new DialPadTonePreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_voiceCapable_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_notVoiceCapable_shouldReturnFalse() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_dialToneEnabled_shouldCheckedPreference() {
-        System.putInt(mContentResolver, System.DTMF_TONE_WHEN_DIALING, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_dialToneDisabled_shouldUncheckedPreference() {
-        System.putInt(mContentResolver, System.DTMF_TONE_WHEN_DIALING, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceChecked_shouldEnabledDialTone() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true);
-
-        assertThat(System.getInt(mContentResolver, System.DTMF_TONE_WHEN_DIALING, 1)).isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceUnchecked_shouldDisabledDialTone() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false);
-
-        assertThat(System.getInt(mContentResolver, System.DTMF_TONE_WHEN_DIALING, 1)).isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
deleted file mode 100644
index 58e5636c1d12d931a0f9ce165317e6d52fd7541a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.support.v7.preference.DropDownPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DockAudioMediaPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private DockAudioMediaPreferenceController mController;
-    private DropDownPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final Context appContext = ShadowApplication.getInstance().getApplicationContext();
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        when(mActivity.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
-            .thenReturn(true);
-        when(mActivity.getResources().getString(anyInt())).thenReturn("test string");
-        mPreference = new DropDownPreference(appContext);
-        mController = new DockAudioMediaPreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_hasDockSettings_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
-            .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noDockSettings_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
-            .thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_dockAudioDisabled_shouldSelectFirstItem() {
-        Global.putInt(mContentResolver, Global.DOCK_AUDIO_MEDIA_ENABLED, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.getValue()).isEqualTo("0");
-    }
-
-    @Test
-    public void displayPreference_dockAudioEnabled_shouldSelectSecondItem() {
-        Global.putInt(mContentResolver, Global.DOCK_AUDIO_MEDIA_ENABLED, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.getValue()).isEqualTo("1");
-    }
-
-    @Test
-    public void onPreferenceChanged_firstItemSelected_shouldDisableDockAudio() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, "0");
-
-        assertThat(Global.getInt(mContentResolver, Global.DOCK_AUDIO_MEDIA_ENABLED, 0))
-            .isEqualTo(0);
-    }
-
-    @Test
-    public void onPreferenceChanged_secondItemSelected_shouldEnableDockAudio() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, "1");
-
-        assertThat(Global.getInt(mContentResolver, Global.DOCK_AUDIO_MEDIA_ENABLED, 0))
-            .isEqualTo(1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
deleted file mode 100644
index d6a277f1b4a770dfe2556cb6685550c44ae2d4b5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DockingSoundPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private DockingSoundPreferenceController mController;
-    private SwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
-        when(mActivity.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
-            .thenReturn(true);
-        mController = new DockingSoundPreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_hasDockSettings_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
-            .thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noDockSettings_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
-            .thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_dockingSoundEnabled_shouldCheckedPreference() {
-        Global.putInt(mContentResolver, Global.DOCK_SOUNDS_ENABLED, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_dockingSoundDisabled_shouldUncheckedPreference() {
-        Global.putInt(mContentResolver, Global.DOCK_SOUNDS_ENABLED, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceChecked_shouldEnabledDockingSound() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true);
-
-        assertThat(Global.getInt(mContentResolver, Global.DOCK_SOUNDS_ENABLED, 1)).isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceUnchecked_shouldDisabledDockingSound() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false);
-
-        assertThat(Global.getInt(mContentResolver, Global.DOCK_SOUNDS_ENABLED, 1)).isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
deleted file mode 100644
index 24f4b6cc887f153e431ce47d635cacc20bf61dfb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.accounts.AccountRestrictionHelper;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EmergencyBroadcastPreferenceControllerTest {
-
-    private static final String PREF_TEST_KEY = "test_key";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private AccountRestrictionHelper mAccountHelper;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private RestrictedPreference mPreference;
-
-    private EmergencyBroadcastPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        mController = new EmergencyBroadcastPreferenceController(mContext, mAccountHelper,
-                PREF_TEST_KEY);
-    }
-
-    @Test
-    public void updateState_shouldCheckRestriction() {
-        mController.updateState(mPreference);
-
-        verify(mPreference).checkRestrictionAndSetDisabled(anyString());
-    }
-
-    @Test
-    public void getPreferenceKey_shouldReturnKeyDefinedInConstructor() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(PREF_TEST_KEY);
-    }
-
-    @Test
-    public void isAvailable_notAdminUser_shouldReturnFalse() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-        when(mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
-        when(mPackageManager.getApplicationEnabledSetting(anyString()))
-                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
-        when(mAccountHelper.hasBaseUserRestriction(anyString(), anyInt())).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_hasConfigCellBroadcastRestriction_shouldReturnFalse() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
-        when(mPackageManager.getApplicationEnabledSetting(anyString()))
-                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
-        when(mAccountHelper.hasBaseUserRestriction(
-                eq(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS), anyInt())).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_cellBroadcastAppLinkDisabled_shouldReturnFalse() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(false);
-        when(mPackageManager.getApplicationEnabledSetting(anyString()))
-                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
-        when(mAccountHelper.hasBaseUserRestriction(anyString(), anyInt())).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_cellBroadcastReceiverDisabled_shouldReturnFalse() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
-        when(mPackageManager.getApplicationEnabledSetting(anyString()))
-                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
-        when(mAccountHelper.hasBaseUserRestriction(anyString(), anyInt())).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
deleted file mode 100644
index c3e887f319db18f2ba96a6a4386438a58f7e4e68..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.support.v7.preference.DropDownPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EmergencyTonePreferenceControllerTest {
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock
-    private Context mContext;
-
-    private EmergencyTonePreferenceController mController;
-    private DropDownPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final Context appContext = ShadowApplication.getInstance().getApplicationContext();
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.getCurrentPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        when(mActivity.getResources()).thenReturn(appContext.getResources());
-        mPreference = new DropDownPreference(appContext);
-        mController = new EmergencyTonePreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_cdma_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_notCdma_shouldReturnFalse() {
-        when(mTelephonyManager.getCurrentPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_emergencyToneOff_shouldSelectFirstItem() {
-        Global.putInt(mContentResolver, Global.EMERGENCY_TONE, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.getValue()).isEqualTo("0");
-    }
-
-    @Test
-    public void displayPreference_emergencyToneAlert_shouldSelectSecondItem() {
-        Global.putInt(mContentResolver, Global.EMERGENCY_TONE, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.getValue()).isEqualTo("1");
-    }
-
-    @Test
-    public void displayPreference_emergencyToneVibrate_shouldSelectThirdItem() {
-        Global.putInt(mContentResolver, Global.EMERGENCY_TONE, 2);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.getValue()).isEqualTo("2");
-    }
-
-    @Test
-    public void onPreferenceChanged_firstItemSelected_shouldSetEmergencyToneToOff() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, "0");
-
-        assertThat(Global.getInt(mContentResolver, Global.EMERGENCY_TONE, 0)).isEqualTo(0);
-    }
-
-    @Test
-    public void onPreferenceChanged_secondItemSelected_shouldSetEmergencyToneToAlert() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, "1");
-
-        assertThat(Global.getInt(mContentResolver, Global.EMERGENCY_TONE, 0)).isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChanged_thirdItemSelected_shouldSetEmergencyToneToVibrate() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, "2");
-
-        assertThat(Global.getInt(mContentResolver, Global.EMERGENCY_TONE, 0)).isEqualTo(2);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
deleted file mode 100644
index ca7fc444565710ef921b9999aecfdd63fac656a0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.media.AudioManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class MediaVolumePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-
-    private MediaVolumePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new MediaVolumePreferenceController(mContext, null, null);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getAudioStream_shouldReturnMusic() {
-        assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_MUSIC);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
deleted file mode 100644
index d3f66b9a204d9b2f91038680cb9b527163108778..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.notification;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NotificationAccessSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private NotificationAccessSettings mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFragment = new NotificationAccessSettings();
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW),
-                eq("app"));
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY),
-                eq("app"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
deleted file mode 100644
index 97c0d94d44539e016bb13fc6113715c0cc44fe70..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.notification;
-
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.robolectric.annotation.Config;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NotificationBackendTest {
-
-    @Test
-    public void testMarkAppRow_unblockablePackage() {
-        AppRow appRow = new AppRow();
-        String packageName = "foo.bar.unblockable";
-        appRow.pkg = packageName;
-        String[] nonBlockablePkgs = new String[2];
-        nonBlockablePkgs[0] = packageName;
-        nonBlockablePkgs[1] = "some.other.package";
-        NotificationBackend.markAppRowWithBlockables(nonBlockablePkgs, appRow, packageName);
-
-        // This package has a package lock but no locked channels
-        assertTrue(appRow.lockedImportance);
-        assertNull(appRow.lockedChannelId);
-    }
-
-    @Test
-    public void testMarkAppRow_unblockableChannelOrPkg() {
-        String channelBlockName = "foo.bar.pkgWithChannel";
-        String pkgBlockName = "foo.bar.pkgBlock";
-        String[] nonBlockablePkgs = new String[2];
-        nonBlockablePkgs[0] = pkgBlockName;
-        nonBlockablePkgs[1] = channelBlockName + ":SpecificChannel";
-
-        // This package has a channel level lock but no full package lock
-        AppRow channelBlockApp = new AppRow();
-        channelBlockApp.pkg = channelBlockName;
-        NotificationBackend.markAppRowWithBlockables(nonBlockablePkgs, channelBlockApp,
-                channelBlockName);
-        assertFalse(channelBlockApp.lockedImportance);
-        assertEquals("SpecificChannel", channelBlockApp.lockedChannelId);
-
-        // This other package has the reverse
-        AppRow pkgBlock = new AppRow();
-        pkgBlock.pkg = pkgBlockName;
-        NotificationBackend.markAppRowWithBlockables(nonBlockablePkgs, pkgBlock, pkgBlockName);
-        assertTrue(pkgBlock.lockedImportance);
-        assertNull(pkgBlock.lockedChannelId);
-
-        // This third package has no locks at all
-        AppRow otherAppRow = new AppRow();
-        otherAppRow.pkg ="foo.bar.nothingBlocked";
-        NotificationBackend.markAppRowWithBlockables(nonBlockablePkgs, otherAppRow,
-                "foo.bar.nothingBlocked");
-        assertFalse(otherAppRow.lockedImportance);
-        assertNull(otherAppRow.lockedChannelId);
-    }
-
-    @Test
-    public void testMarkAppRow_unblockableChannelAndPkg() {
-        AppRow appRow = new AppRow();
-        String packageName = "foo.bar.unblockable";
-        appRow.pkg = packageName;
-        String[] nonBlockablePkgs = new String[2];
-        nonBlockablePkgs[0] = "foo.bar.unblockable";
-        nonBlockablePkgs[1] = "foo.bar.unblockable:SpecificChannel";
-        NotificationBackend.markAppRowWithBlockables(nonBlockablePkgs, appRow, packageName);
-
-        // This package has both a channel lock and a package lock
-        assertTrue(appRow.lockedImportance);
-        assertEquals("SpecificChannel", appRow.lockedChannelId);
-    }
-
-    @Test
-    public void testMarkAppRow_channelNameWithColons() {
-        AppRow appRow = new AppRow();
-        String packageName = "foo.bar.unblockable";
-        String channelName = "SpecificChannel:1234:abc:defg";
-        appRow.pkg = packageName;
-        String[] nonBlockablePkgs = new String[1];
-        nonBlockablePkgs[0] = packageName + ":" + channelName;
-        NotificationBackend.markAppRowWithBlockables(nonBlockablePkgs, appRow, packageName);
-
-        assertEquals(channelName, appRow.lockedChannelId);
-    }
-
-
-    @Test
-    public void testMarkAppRow_blocklistWithNullEntries() {
-        AppRow appRow = new AppRow();
-        String packageName = "foo.bar.unblockable";
-        appRow.pkg = packageName;
-        String[] nonBlockablePkgs = new String[6]; // extra long list with some entries left null
-        nonBlockablePkgs[2] = "foo.bar.unblockable";
-        nonBlockablePkgs[4] = "foo.bar.unblockable:SpecificChannel";
-        NotificationBackend.markAppRowWithBlockables(nonBlockablePkgs, appRow, packageName);
-
-        assertTrue(appRow.lockedImportance);
-        assertEquals("SpecificChannel", appRow.lockedChannelId);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
deleted file mode 100644
index 940a948ea5c15d3d0164b16838eaa0be013d50ca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.media.RingtoneManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NotificationRingtonePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    private NotificationRingtonePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new NotificationRingtonePreferenceController(mContext);
-    }
-
-    @Test
-    public void getRingtoneType_shouldReturnNotification() {
-        assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_NOTIFICATION);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
deleted file mode 100644
index f919e7bc313ac665a9472e673118be9ad078d160..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.os.Vibrator;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NotificationVolumePreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private AudioHelper mHelper;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private AudioManager mAudioManager;
-    @Mock
-    private Vibrator mVibrator;
-
-    private NotificationVolumePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
-        when(mContext.getSystemService(Context.VIBRATOR_SERVICE)).thenReturn(mVibrator);
-        mController = new NotificationVolumePreferenceController(mContext, null, null, mHelper);
-    }
-
-    @Test
-    public void isAvailable_singleVolume_shouldReturnFalse() {
-        when(mHelper.isSingleVolume()).thenReturn(true);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_voiceCapable_shouldReturnFalse() {
-        when(mHelper.isSingleVolume()).thenReturn(false);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_notSingleVolume_notVoiceCapable_shouldReturnTrue() {
-        when(mHelper.isSingleVolume()).thenReturn(false);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getAudioStream_shouldReturnNotification() {
-        assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_NOTIFICATION);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
deleted file mode 100644
index 57ab4d35e4db6452f7673f7429ca7ce0302d9850..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.media.RingtoneManager;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PhoneRingtonePreferenceControllerTest {
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-
-    private Context mContext;
-    private PhoneRingtonePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
-        mContext = shadowContext.getApplicationContext();
-        mController = new PhoneRingtonePreferenceController(mContext);
-    }
-
-    @Test
-    public void isAvailable_notVoiceCapable_shouldReturnFalse() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_VoiceCapable_shouldReturnTrue() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getRingtoneType_shouldReturnRingtone() {
-        assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_RINGTONE);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
deleted file mode 100644
index f6c6bf2da4cc2f83d9339b19f045047ab0b01302..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
-
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PulseNotificationPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private PulseNotificationPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new PulseNotificationPreferenceController(mContext);
-    }
-
-    @Test
-    public void display_configIsTrue_shouldDisplay() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed))
-                .thenReturn(true);
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void display_configIsFalse_shouldNotDisplay() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed))
-                .thenReturn(false);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedWhenSettingIsOn() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1);
-
-        mController = new PulseNotificationPreferenceController(context);
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
-
-        mController = new PulseNotificationPreferenceController(context);
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
deleted file mode 100644
index 1a6d3d78662f47f677e5ed7068af9c5e80b78ea1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.NotificationManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.media.AudioManager;
-import android.os.Vibrator;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RingVolumePreferenceControllerTest {
-
-    @Mock
-    private AudioHelper mHelper;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private AudioManager mAudioManager;
-    @Mock
-    private Vibrator mVibrator;
-    @Mock
-    private NotificationManager mNotificationManager;
-    @Mock
-    private ComponentName mSuppressor;
-
-    private Context mContext;
-    private RingVolumePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
-        shadowContext.setSystemService(Context.AUDIO_SERVICE, mAudioManager);
-        shadowContext.setSystemService(Context.VIBRATOR_SERVICE, mVibrator);
-        shadowContext.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
-        mContext = shadowContext.getApplicationContext();
-        when(mNotificationManager.getEffectsSuppressor()).thenReturn(mSuppressor);
-        mController = new RingVolumePreferenceController(mContext, null, null, mHelper);
-    }
-
-    @Test
-    public void isAvailable_singleVolume_shouldReturnFalse() {
-        when(mHelper.isSingleVolume()).thenReturn(true);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_notVoiceCapable_shouldReturnFalse() {
-        when(mHelper.isSingleVolume()).thenReturn(false);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_notSingleVolume_VoiceCapable_shouldReturnTrue() {
-        when(mHelper.isSingleVolume()).thenReturn(false);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getAudioStream_shouldReturnRing() {
-        assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_RING);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
deleted file mode 100644
index e72ef53e9723ba2a6992fa9955168e2e3d959da1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.media.RingtoneManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RingtonePreferenceControllerBaseTest {
-
-    @Mock
-    private Context mContext;
-
-    private RingtonePreferenceControllerBase mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new RingtonePreferenceControllerBaseTestable(mContext);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-
-    @Test
-    public void updateState_shouldSetSummary() {
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setSummary(anyString());
-    }
-
-    private class RingtonePreferenceControllerBaseTestable extends
-        RingtonePreferenceControllerBase {
-        RingtonePreferenceControllerBaseTestable(Context context) {
-            super(context);
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return null;
-        }
-
-        @Override
-        public int getRingtoneType() {
-            return RingtoneManager.TYPE_RINGTONE;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
deleted file mode 100644
index f94f8bfe4b96d0e73364dfedc097463bbdd40dce..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ScreenLockSoundPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock
-    private Context mContext;
-
-    private ScreenLockSoundPreferenceController mController;
-    private SwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
-        mController = new ScreenLockSoundPreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_isAlwaysTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_lockScreenSoundEnabled_shouldCheckedPreference() {
-        System.putInt(mContentResolver, System.LOCKSCREEN_SOUNDS_ENABLED, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_lockScreenSoundDisabled_shouldUncheckedPreference() {
-        System.putInt(mContentResolver, System.LOCKSCREEN_SOUNDS_ENABLED, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceChecked_shouldEnabledLockScreenSound() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true);
-
-        assertThat(System.getInt(mContentResolver, System.LOCKSCREEN_SOUNDS_ENABLED, 1))
-            .isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceUnchecked_shouldDisabledLockScreenSound() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false);
-
-        assertThat(System.getInt(mContentResolver, System.LOCKSCREEN_SOUNDS_ENABLED, 1))
-            .isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
deleted file mode 100644
index 307536dd0737ec4ae4232e1ef53ecea76c5ca829..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings.Global;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.android.settings.notification.SettingPref.TYPE_GLOBAL;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SettingPrefControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-
-    private Context mContext;
-    private PreferenceControllerTestable mController;
-    private SettingPref mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(ShadowApplication.getInstance().getApplicationContext());
-        when(mContext.getContentResolver()).thenReturn(mContentResolver);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-        mController = new PreferenceControllerTestable(mContext, mSetting, null);
-        mPreference = mController.getPref();
-    }
-
-    @Test
-    public void displayPreference_shouldInitPreference() {
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).init(mSetting);
-    }
-
-    @Test
-    public void isAvailable_shouldCallisApplicable() {
-        mController.isAvailable();
-
-        verify(mPreference).isApplicable(mContext);
-    }
-
-    @Test
-    public void getPreferenceKey_shouldReturnPrefKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(mController.KEY_TEST);
-    }
-
-    @Test
-    public void updateState_shouldUpdatePreference() {
-        mController.updateState(null);
-
-        verify(mPreference).update(mContext);
-    }
-
-    @Test
-    public void onResume_shouldRegisterContentObserver() {
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        verify(mContentResolver).registerContentObserver(
-            Global.getUriFor("Setting1"), false, mController.getObserver());
-    }
-
-    @Test
-    public void onPause_shouldUnregisterContentObserver() {
-        mController.displayPreference(mScreen);
-        mController.onPause();
-
-        verify(mContentResolver).unregisterContentObserver(mController.getObserver());
-    }
-
-    @Test
-    public void onContentChange_shouldUpdatePreference() {
-        mController.displayPreference(mScreen);
-        mController.onResume();
-        mController.getObserver().onChange(false, Global.getUriFor("Setting1"));
-
-        verify(mPreference).update(mContext);
-    }
-
-    @Test
-    public void updateNonIndexableKeys_applicable_shouldNotUpdate() {
-        final List<String> keys = new ArrayList<>();
-
-        mController.updateNonIndexableKeys(keys);
-
-        assertThat(keys).isEmpty();
-    }
-
-    @Test
-    public void updateNonIndexableKeys_notApplicable_shouldUpdate() {
-        mController.setApplicable(false);
-        final List<String> keys = new ArrayList<>();
-
-        mController.updateNonIndexableKeys(keys);
-
-        assertThat(keys).isNotEmpty();
-    }
-
-    private class PreferenceControllerTestable extends SettingPrefController {
-
-        private static final String KEY_TEST = "key1";
-        private boolean mApplicable = true;
-
-        public PreferenceControllerTestable(Context context, SettingsPreferenceFragment parent,
-            Lifecycle lifecycle) {
-            super(context, parent, lifecycle);
-            mPreference = spy(new SettingPref(
-                TYPE_GLOBAL, KEY_TEST, "Setting1", 1) {
-                @Override
-                public boolean isApplicable(Context context) {
-                    return mApplicable;
-                }
-            });
-        }
-
-        SettingPref getPref() {
-            return mPreference;
-        }
-
-        PreferenceControllerTestable.SettingsObserver getObserver() {
-            return mSettingsObserver;
-        }
-
-        void setApplicable(boolean applicable) {
-            mApplicable = applicable;
-        }
-
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
deleted file mode 100644
index 59b70785e267f971fd3ffc251f0856e6a6a7f428..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-
-import android.media.AudioManager;
-import android.os.UserManager;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowAudioHelper;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SoundSettingsTest {
-
-    @Test
-    @Config( shadows = {
-            ShadowUserManager.class,
-            ShadowAudioHelper.class,
-    })
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = spy(RuntimeEnvironment.application);
-        AudioManager audioManager = mock(AudioManager.class);
-        doReturn(audioManager).when(context).getSystemService(Context.AUDIO_SERVICE);
-
-        UserManager userManager = mock(UserManager.class);
-        when(userManager.isAdminUser()).thenReturn(false);
-        doReturn(userManager).when(context).getSystemService(Context.USER_SERVICE);
-
-        final List<String> niks = SoundSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final int xmlId = (new SoundSettings()).getPreferenceScreenResId();
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.zen_mode_settings));
-        // Add keys with hidden resources
-        keys.add("alarm_volume");
-        keys.add("ring_volume");
-        keys.add("notification_volume");
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
deleted file mode 100644
index 86f3d818a5f793d5b84c0d23763c1777094c0784..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.notification;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-public class SuppressorHelperTest {
-    private static final String SUPPRESSOR_NAME = "wear";
-
-    private ComponentName mSuppressor;
-    @Mock
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private ServiceInfo mServiceInfo;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mSuppressor = new ComponentName("", "");
-
-        try {
-            when(mContext.getPackageManager()).thenReturn(mPackageManager);
-            when(mPackageManager.getServiceInfo(mSuppressor, 0)).thenReturn(mServiceInfo);
-            when(mServiceInfo.loadLabel(mPackageManager)).thenReturn(new String(SUPPRESSOR_NAME));
-        } catch (PackageManager.NameNotFoundException e) {
-            // Do nothing. This exception will never happen in mock
-        }
-    }
-
-    @Test
-    public void testGetSuppressionText_SuppressorNull_ReturnNull() {
-        String text = SuppressorHelper.getSuppressionText(mContext, null);
-        assertThat(text).isNull();
-    }
-
-    @Test
-    public void testGetSuppressorCaption_SuppressorNotNull_ReturnSuppressorName() {
-        String text = SuppressorHelper.getSuppressorCaption(mContext, mSuppressor);
-        assertThat(text).isEqualTo(SUPPRESSOR_NAME);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
deleted file mode 100644
index eaf9bb5e963e63bbbad30613d074c2e4cce54add..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.media.AudioManager;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TouchSoundPreferenceControllerTest {
-
-    @Mock
-    private AudioManager mAudioManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock
-    private Context mContext;
-
-    private TouchSoundPreferenceController mController;
-    private SwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
-        mController = new TouchSoundPreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_isAlwaysTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_soundEffectEnabled_shouldCheckedPreference() {
-        System.putInt(mContentResolver, System.SOUND_EFFECTS_ENABLED, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_soundEffectDisabled_shouldUncheckedPreference() {
-        System.putInt(mContentResolver, System.SOUND_EFFECTS_ENABLED, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceChecked_shouldEnabledSoundEffect() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true);
-
-        assertThat(System.getInt(mContentResolver, System.SOUND_EFFECTS_ENABLED, 1)).isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceUnchecked_shouldDisabledSoundEffect() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false);
-
-        assertThat(System.getInt(mContentResolver, System.SOUND_EFFECTS_ENABLED, 1)).isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
deleted file mode 100644
index b0ab54bdc77597a38b6dd95196bb481836c7b0d5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Vibrator;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VibrateOnTouchPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ContentResolver mContentResolver;
-    @Mock
-    private SoundSettings mSetting;
-    @Mock
-    private Context mContext;
-    @Mock
-    private Vibrator mVibrator;
-
-    private VibrateOnTouchPreferenceController mController;
-    private SwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.VIBRATOR_SERVICE)).thenReturn(mVibrator);
-        when(mContext.getSystemService(Context.VIBRATOR_SERVICE)).thenReturn(mVibrator);
-        when(mVibrator.hasVibrator()).thenReturn(true);
-        when(mSetting.getActivity()).thenReturn(mActivity);
-        when(mActivity.getContentResolver()).thenReturn(mContentResolver);
-        mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
-        mController = new VibrateOnTouchPreferenceController(mContext, mSetting, null);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(mScreen).when(mSetting).getPreferenceScreen();
-    }
-
-    @Test
-    public void isAvailable_hasHaptic_shouldReturnTrue() {
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noHaptic_shouldReturnFalse() {
-        when(mVibrator.hasVibrator()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_hapticEnabled_shouldCheckedPreference() {
-        System.putInt(mContentResolver, System.HAPTIC_FEEDBACK_ENABLED, 1);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_hapticDisabled_shouldUncheckedPreference() {
-        System.putInt(mContentResolver, System.HAPTIC_FEEDBACK_ENABLED, 0);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceChecked_shouldEnabledHaptic() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true);
-
-        assertThat(System.getInt(mContentResolver, System.HAPTIC_FEEDBACK_ENABLED, 1)).isEqualTo(1);
-    }
-
-    @Test
-    public void onPreferenceChanged_preferenceUnchecked_shouldDisabledHaptic() {
-        mController.displayPreference(mScreen);
-
-        mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false);
-
-        assertThat(System.getInt(mContentResolver, System.HAPTIC_FEEDBACK_ENABLED, 1)).isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
deleted file mode 100644
index 054309c2b9be617e7c5c7f0f6614c36326a6c5a1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VibrateWhenRingPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-
-    private VibrateWhenRingPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        mController = new VibrateWhenRingPreferenceController(mContext);
-    }
-
-    @Test
-    public void display_voiceCapable_shouldDisplay() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        when(mScreen.findPreference(mController.getPreferenceKey()))
-            .thenReturn(mock(Preference.class));
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void display_notVoiceCapable_shouldNotDisplay() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void updateState_settingIsOn_preferenceShouldBeChecked() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), VIBRATE_WHEN_RINGING, 1);
-
-        mController = new VibrateWhenRingPreferenceController(context);
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_settingIsOff_preferenceShouldNotBeChecked() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), VIBRATE_WHEN_RINGING, 0);
-
-        mController = new VibrateWhenRingPreferenceController(context);
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
deleted file mode 100644
index a1d9205db1cb29089fb2a098ca2c843d1e1c5a8e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VolumeSeekBarPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private VolumeSeekBarPreference mPreference;
-    @Mock
-    private VolumeSeekBarPreference.Callback mCallback;
-
-    private VolumeSeekBarPreferenceControllerTestable mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(mPreference);
-        mController =
-            new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback);
-    }
-
-    @Test
-    public void displayPreference_available_shouldUpdatePreference() {
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setCallback(mCallback);
-        verify(mPreference).setStream(mController.AUDIO_STREAM);
-        verify(mPreference).setMuteIcon(mController.MUTE_ICON);
-    }
-
-    @Test
-    public void displayPreference_notAvailable_shouldNotUpdatePreference() {
-        mController =
-            new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback, false);
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference, never()).setCallback(any(VolumeSeekBarPreference.Callback.class));
-        verify(mPreference, never()).setStream(anyInt());
-        verify(mPreference, never()).setMuteIcon(anyInt());
-    }
-
-    @Test
-    public void onResume_shouldResumePreference() {
-        mController.displayPreference(mScreen);
-
-        mController.onResume();
-
-        verify(mPreference).onActivityResume();
-    }
-
-    @Test
-    public void onPause_shouldPausePreference() {
-        mController.displayPreference(mScreen);
-
-        mController.onPause();
-
-        verify(mPreference).onActivityPause();
-    }
-
-    private class VolumeSeekBarPreferenceControllerTestable extends
-        VolumeSeekBarPreferenceController {
-
-        private final static int AUDIO_STREAM = 1;
-        private final static int MUTE_ICON = 2;
-
-        private boolean mAvailable;
-
-        VolumeSeekBarPreferenceControllerTestable(Context context,
-            VolumeSeekBarPreference.Callback callback) {
-            this(context, callback, true);
-        }
-
-        VolumeSeekBarPreferenceControllerTestable(Context context,
-            VolumeSeekBarPreference.Callback callback, boolean available) {
-            super(context, callback, null);
-            mAvailable = available;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return null;
-        }
-
-        @Override
-        public boolean handlePreferenceTreeClick(Preference preference) {
-            return false;
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return mAvailable;
-        }
-
-        @Override
-        public int getAudioStream() {
-            return AUDIO_STREAM;
-        }
-
-        @Override
-        public int getMuteIcon() {
-            return MUTE_ICON;
-        }
-
-        private void setAvailable(boolean available) {
-
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
deleted file mode 100644
index b091cd37bd0477839536c92893962aeb0801e80d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.media.AudioManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VolumeSeekBarPreferenceTest {
-
-    @Mock
-    private AudioManager mAudioManager;
-    @Mock
-    private VolumeSeekBarPreference mPreference;
-    @Mock
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
-        mPreference.mAudioManager = mAudioManager;
-    }
-
-    @Test
-    public void setStream_shouldSetMaxAndProgress() {
-        final int stream = 5;
-        final int max = 17;
-        final int progress = 4;
-        when(mAudioManager.getStreamMaxVolume(stream)).thenReturn(max);
-        when(mAudioManager.getStreamVolume(stream)).thenReturn(progress);
-        doCallRealMethod().when(mPreference).setStream(anyInt());
-
-        mPreference.setStream(stream);
-
-        verify(mPreference).setMax(max);
-        verify(mPreference).setProgress(progress);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
deleted file mode 100644
index 0c826ed1fbc6d85fa2cf6ad6fcf54ce440a4f1b3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.DefaultRingtonePreference;
-import com.android.settings.R;
-import com.android.settings.RingtonePreference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WorkSoundPreferenceControllerTest {
-
-    private static final String KEY_WORK_CATEGORY = "sound_work_settings_section";
-    private static final String KEY_WORK_USE_PERSONAL_SOUNDS = "work_use_personal_sounds";
-    private static final String KEY_WORK_PHONE_RINGTONE = "work_ringtone";
-    private static final String KEY_WORK_NOTIFICATION_RINGTONE = "work_notification_ringtone";
-    private static final String KEY_WORK_ALARM_RINGTONE = "work_alarm_ringtone";
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private PreferenceCategory mWorkCategory;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private AudioHelper mAudioHelper;
-    @Mock
-    private SoundSettings mFragment;
-
-    private WorkSoundPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        when(mScreen.findPreference(KEY_WORK_CATEGORY))
-                .thenReturn(mWorkCategory);
-        when(mWorkCategory.findPreference(KEY_WORK_USE_PERSONAL_SOUNDS))
-                .thenReturn(mock(TwoStatePreference.class));
-        when(mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE))
-                .thenReturn(mock(DefaultRingtonePreference.class));
-        when(mWorkCategory.findPreference(KEY_WORK_NOTIFICATION_RINGTONE))
-                .thenReturn(mock(DefaultRingtonePreference.class));
-        when(mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE))
-                .thenReturn(mock(DefaultRingtonePreference.class));
-
-        mController = new WorkSoundPreferenceController(mContext, mFragment, null, mAudioHelper);
-    }
-
-    @Test
-    public void isAvailable_managedProfileAndNotSingleVolume_shouldReturnTrue() {
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noManagedProfile_shouldReturnFalse() {
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.USER_NULL);
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_singleVolume_shouldReturnFalse() {
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
-        when(mAudioHelper.isSingleVolume()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void onManagedProfileAdded_shouldDisplayPreferenceCategory() {
-        // Given a device without any managed profiles:
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.USER_NULL);
-
-        // When the fragment first displays, the category should not appear.
-        mController.displayPreference(mScreen);
-        verify(mWorkCategory).setVisible(false);
-
-        // However, when a managed profile is added later, the category should appear.
-        mController.onResume();
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.myUserId());
-        mController.onManagedProfileAdded(UserHandle.myUserId());
-
-        verify(mWorkCategory).setVisible(true);
-    }
-
-    @Test
-    public void onManagedProfileRemoved_shouldHidePreferenceCategory() {
-        // Given a device with a managed profile:
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
-
-        // Which is in resumed state:
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        verify(mWorkCategory, times(2)).setVisible(true);
-
-        // When a managed profile is removed, the category should be hidden.
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.USER_NULL);
-        mController.onManagedProfileRemoved(UserHandle.myUserId());
-
-        verify(mWorkCategory).setVisible(false);
-    }
-
-
-    @Test
-    public void displayPreference_isAvailable_shouldShowPreferenceCategory() {
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-
-        mController.displayPreference(mScreen);
-        verify(mWorkCategory).setVisible(true);
-    }
-
-    @Test
-    public void displayPreference_notAvailable_shouldHidePreferenceCategory() {
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.USER_NULL);
-        when(mAudioHelper.isSingleVolume()).thenReturn(true);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-
-        mController.displayPreference(mScreen);
-        verify(mWorkCategory).setVisible(false);
-    }
-
-    @Test
-    public void onPreferenceChange_shouldUpdateSummary() {
-        final Preference preference = mock(Preference.class);
-        when(preference.getKey()).thenReturn(KEY_WORK_PHONE_RINGTONE);
-
-        mController.onPreferenceChange(preference, "hello");
-
-        verify(preference).setSummary(nullable(String.class));
-    }
-
-    @Test
-    public void onResume_noVoiceCapability_shouldHidePhoneRingtone() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-        mController = new WorkSoundPreferenceController(mContext, mFragment, null, mAudioHelper);
-
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-
-        // Precondition: work profile is available.
-        assertThat(mController.isAvailable()).isTrue();
-
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        verify(mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE)).setVisible(false);
-    }
-
-    @Test
-    public void onResume_availableButLocked_shouldRedactPreferences() {
-        final String notAvailable = "(not available)";
-        when(mContext.getString(R.string.managed_profile_not_available_label))
-                .thenReturn(notAvailable);
-
-        // Given a device with a managed profile:
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(false);
-
-        // When resumed:
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        verify(mWorkCategory, times(2)).setVisible(true);
-
-        // Sound preferences should explain that the profile isn't available yet.
-        verify(mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE))
-                .setSummary(eq(notAvailable));
-        verify(mWorkCategory.findPreference(KEY_WORK_NOTIFICATION_RINGTONE))
-                .setSummary(eq(notAvailable));
-        verify(mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE))
-                .setSummary(eq(notAvailable));
-    }
-
-    @Test
-    public void onResume_shouldSetUserIdToPreference() {
-        final int managedProfileUserId = 10;
-        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
-                .thenReturn(managedProfileUserId);
-        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
-        when(mAudioHelper.isSingleVolume()).thenReturn(false);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        verify((RingtonePreference) mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE))
-                .setUserId(managedProfileUserId);
-        verify((RingtonePreference) mWorkCategory.findPreference(KEY_WORK_NOTIFICATION_RINGTONE))
-                .setUserId(managedProfileUserId);
-        verify((RingtonePreference) mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE))
-                .setUserId(managedProfileUserId);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
deleted file mode 100644
index 591378f2560530f2c7cc497755c7e3ed1b45a169..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ZenAccessSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        ZenAccessSettings.logSpecialPermissionChange(true, "app", mContext);
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_DND_ALLOW),
-                eq("app"));
-
-        ZenAccessSettings.logSpecialPermissionChange(false, "app", mContext);
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_DND_DENY),
-                eq("app"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
deleted file mode 100644
index 1d71a8a5f0af32643a4844d6949788c71d228540..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ZenModePreferenceControllerTest {
-
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private NotificationManager mNotificationManager;
-    @Mock
-    private Policy mPolicy;
-
-    private Context mContext;
-    private ZenModePreferenceController mController;
-    private ZenModeSettings.SummaryBuilder mSummaryBuilder;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowApplication = ShadowApplication.getInstance();
-        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
-        mContext = shadowApplication.getApplicationContext();
-        mController = new ZenModePreferenceController(mContext);
-        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
-        mSummaryBuilder = spy(new ZenModeSettings.SummaryBuilder(mContext));
-        ReflectionHelpers.setField(mController, "mSummaryBuilder", mSummaryBuilder);
-        doReturn(0).when(mSummaryBuilder).getEnabledAutomaticRulesCount();
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_preferenceEnabled_shouldSetSummary() {
-        when(mPreference.isEnabled()).thenReturn(true);
-
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary(mContext.getString(R.string.zen_mode_settings_summary_off));
-
-        doReturn(1).when(mSummaryBuilder).getEnabledAutomaticRulesCount();
-        mController.updateState(mPreference);
-        verify(mPreference).setSummary(mContext.getResources().getQuantityString(
-            R.plurals.zen_mode_settings_summary_on, 1, 1));
-    }
-
-    @Test
-    public void updateState_preferenceDisabled_shouldNotSetSummary() {
-        when(mPreference.isEnabled()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference, never()).setSummary(anyString());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
deleted file mode 100644
index 716e2b274e52dcc5fd0470eb2c12724f50fa1625..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.NotificationManager;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ZenModeSettingsTest {
-
-    private ZenModeSettings.SummaryBuilder mBuilder;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application.getApplicationContext();
-        mBuilder = new ZenModeSettings.SummaryBuilder(mContext);
-    }
-
-    @Test
-    public void testAppend_conditionFalse_shouldNotAppend() {
-        String original = "test";
-
-        final String result = mBuilder.append(original, false, R.string.zen_mode_alarms);
-
-        assertThat(result).isEqualTo(original);
-    }
-
-    @Test
-    public void testAppend_conditionTrue_shouldAppend() {
-        String original = "test";
-        String alarm = mContext.getString(R.string.zen_mode_alarms);
-
-        final String result = mBuilder.append(original, true, R.string.zen_mode_alarms);
-
-        assertThat(result).contains(alarm);
-        assertThat(result).contains(original);
-        assertTrue(result.indexOf(original) < result.indexOf(alarm));
-    }
-
-    @Test
-    public void testPrepend() {
-        String original = mContext.getString(R.string.zen_mode_alarms);
-        String reminders = mContext.getString(R.string.zen_mode_reminders);
-
-        final String result = mBuilder.prepend(original, true, R.string.zen_mode_reminders);
-        assertThat(result).contains(original);
-        assertThat(result).contains(reminders);
-        assertTrue(result.indexOf(reminders) < result.indexOf(original));
-    }
-
-    @Test
-    public void testGetPrioritySettingSummary_sameOrderAsTargetPage() {
-        NotificationManager.Policy policy = new NotificationManager.Policy(
-                NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS
-                        | NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
-                0, 0);
-        final String result = mBuilder.getPrioritySettingSummary(policy);
-
-        String alarms = mContext.getString(R.string.zen_mode_alarms);
-        String reminders = mContext.getString(R.string.zen_mode_reminders);
-        String events = mContext.getString(R.string.zen_mode_events);
-
-        assertThat(result).contains(alarms);
-        assertThat(result).contains(reminders);
-        assertThat(result).contains(events);
-        assertTrue(result.indexOf(reminders) < result.indexOf(events) &&
-                result.indexOf(events) < result.indexOf(alarms));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
deleted file mode 100644
index 28b0264a347dc7a54bccfaf95a32fa66983a3f5e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class
-        })
-public class ChooseLockGenericControllerTest {
-
-    private ChooseLockGenericController mController;
-
-    @Mock
-    private ManagedLockPasswordProvider mManagedLockPasswordProvider;
-
-    @Mock
-    private DevicePolicyManager mDevicePolicyManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mController = new ChooseLockGenericController(
-                application,
-                0 /* userId */,
-                mDevicePolicyManager,
-                mManagedLockPasswordProvider);
-        SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, false);
-        SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, false);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void isScreenLockVisible_shouldRespectResourceConfig() {
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            // All locks except managed defaults to visible
-            assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible")
-                    .isEqualTo(lock != ScreenLockType.MANAGED);
-        }
-
-        SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
-        SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
-                .isFalse();
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
-    }
-
-    @Test
-    public void isScreenLockVisible_notCurrentUser_shouldHideSwipe() {
-        mController = new ChooseLockGenericController(application, 1 /* userId */);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
-    }
-
-    @Test
-    public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
-        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-
-        assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible")
-                .isTrue();
-    }
-
-    @Test
-    public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1))
-                    .named(lock + " enabled")
-                    .isFalse();
-        }
-    }
-
-    @Test
-    public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality))
-                    .named(lock + " enabled")
-                    .isTrue();
-        }
-    }
-
-    @Test
-    public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1))
-                    .named(lock + " enabled")
-                    .isTrue();
-        }
-    }
-
-    @Test
-    public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
-        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1))
-                    .named(lock + " disabledByAdmin")
-                    .isTrue();
-        }
-    }
-
-    @Test
-    public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
-        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
-        }
-    }
-
-    @Test
-    public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
-        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
-        }
-    }
-
-    @Test
-    public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
-        doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-        assertThat(mController.isScreenLockDisabledByAdmin(
-                ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
-                .named("MANANGED disabledByAdmin")
-                .isTrue();
-    }
-
-    @Test
-    public void getTitle_shouldContainEnumName() {
-        doReturn("MANAGED").when(mManagedLockPasswordProvider).getPickerOptionTitle(anyBoolean());
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.getTitle(lock).toString())
-                    .containsMatch(Pattern.compile(lock.toString(), Pattern.CASE_INSENSITIVE));
-        }
-    }
-
-    @Test
-    public void getVisibleScreenLockTypes_qualitySomething_shouldReturnPatterPinPassword() {
-        assertThat(mController.getVisibleScreenLockTypes(
-                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false))
-                .isEqualTo(Arrays.asList(
-                        ScreenLockType.PATTERN,
-                        ScreenLockType.PIN,
-                        ScreenLockType.PASSWORD));
-    }
-
-    @Test
-    public void getVisibleScreenLockTypes_showDisabled_shouldReturnAllButManaged() {
-        assertThat(mController.getVisibleScreenLockTypes(
-                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, true))
-                .isEqualTo(Arrays.asList(
-                        ScreenLockType.NONE,
-                        ScreenLockType.SWIPE,
-                        ScreenLockType.PATTERN,
-                        ScreenLockType.PIN,
-                        ScreenLockType.PASSWORD));
-    }
-
-    @Test
-    public void upgradeQuality_noDpmRequirement_shouldReturnQuality() {
-        doReturn(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
-                .when(mDevicePolicyManager)
-                .getPasswordQuality(nullable(ComponentName.class), anyInt());
-
-        int upgradedQuality = mController.upgradeQuality(
-                DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
-        assertThat(upgradedQuality).named("upgradedQuality")
-                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
-    }
-
-    @Test
-    public void upgradeQuality_dpmRequirement_shouldReturnRequiredQuality() {
-        doReturn(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC)
-                .when(mDevicePolicyManager)
-                .getPasswordQuality(nullable(ComponentName.class), anyInt());
-
-        int upgradedQuality = mController.upgradeQuality(
-                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        assertThat(upgradedQuality).named("upgradedQuality")
-                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
deleted file mode 100644
index b8f06793ac37b6502d753d9921180e1b9375147d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Intent;
-import android.os.UserHandle;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment;
-import com.android.settings.password.ChooseLockPassword.IntentBuilder;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.setupwizardlib.GlifLayout;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowDrawable;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEventLogWriter.class,
-                ShadowUtils.class
-        })
-public class ChooseLockPasswordTest {
-
-    @Before
-    public void setUp() throws Exception {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_headlineFontFamily, "");
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void intentBuilder_setPassword_shouldAddExtras() {
-        Intent intent = new IntentBuilder(application)
-                .setPassword("password")
-                .setPasswordQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC)
-                .setPasswordLengthRange(123, 456)
-                .setUserId(123)
-                .build();
-
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
-                .isFalse();
-        assertThat(intent.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
-                .isEqualTo("password");
-        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MIN_KEY, 0))
-                .named("PASSWORD_MIN_KEY")
-                .isEqualTo(123);
-        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MAX_KEY, 0))
-                .named("PASSWORD_MAX_KEY")
-                .isEqualTo(456);
-        assertThat(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
-                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
-                .isEqualTo(123);
-    }
-
-    @Test
-    public void intentBuilder_setChallenge_shouldAddExtras() {
-        Intent intent = new IntentBuilder(application)
-                .setChallenge(12345L)
-                .setPasswordQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC)
-                .setPasswordLengthRange(123, 456)
-                .setUserId(123)
-                .build();
-
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
-                .isTrue();
-        assertThat(intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
-                .isEqualTo(12345L);
-        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MIN_KEY, 0))
-                .named("PASSWORD_MIN_KEY")
-                .isEqualTo(123);
-        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MAX_KEY, 0))
-                .named("PASSWORD_MAX_KEY")
-                .isEqualTo(456);
-        assertThat(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
-                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
-                .isEqualTo(123);
-    }
-
-    @Test
-    public void assertThat_chooseLockIconChanged_WhenFingerprintExtraSet() {
-        ShadowDrawable drawable = setActivityAndGetIconDrawable(true);
-        assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);
-    }
-
-    @Test
-    public void assertThat_chooseLockIconNotChanged_WhenFingerprintExtraSet() {
-        ShadowDrawable drawable = setActivityAndGetIconDrawable(false);
-        assertThat(drawable.getCreatedFromResId()).isNotEqualTo(R.drawable.ic_fingerprint_header);
-    }
-
-    private ShadowDrawable setActivityAndGetIconDrawable(boolean addFingerprintExtra) {
-        ChooseLockPassword passwordActivity =
-                Robolectric.buildActivity(
-                        ChooseLockPassword.class,
-                        new IntentBuilder(application)
-                                .setUserId(UserHandle.myUserId())
-                                .setForFingerprint(addFingerprintExtra)
-                                .build())
-                        .setup().get();
-        ChooseLockPasswordFragment fragment = (ChooseLockPasswordFragment)
-                passwordActivity.getFragmentManager().findFragmentById(R.id.main_content);
-        return Shadows.shadowOf(((GlifLayout) fragment.getView()).getIcon());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
deleted file mode 100644
index c74448b5dd9955f68a7ec54205f85e36dbf4900f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.content.Intent;
-import android.os.UserHandle;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
-import com.android.settings.password.ChooseLockPattern.IntentBuilder;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.setupwizardlib.GlifLayout;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowDrawable;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEventLogWriter.class,
-                ShadowUtils.class
-        })
-public class ChooseLockPatternTest {
-
-    @Test
-    public void activityCreationTest() {
-        // Basic sanity test for activity created without crashing
-        Robolectric.buildActivity(ChooseLockPattern.class, new IntentBuilder(application).build())
-                .setup().get();
-    }
-
-    @Test
-    public void intentBuilder_setPattern_shouldAddExtras() {
-        Intent intent = new IntentBuilder(application)
-                .setPattern("pattern")
-                .setUserId(123)
-                .build();
-
-        assertThat(intent
-                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
-                .isFalse();
-        assertThat(intent
-                .getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
-                .isEqualTo("pattern");
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
-                .isEqualTo(123);
-    }
-
-    @Test
-    public void intentBuilder_setChallenge_shouldAddExtras() {
-        Intent intent = new IntentBuilder(application)
-                .setChallenge(12345L)
-                .setUserId(123)
-                .build();
-
-        assertThat(intent
-                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
-                .isTrue();
-        assertThat(intent
-                .getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
-                .isEqualTo(12345L);
-        assertThat(intent
-                .getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
-                .isEqualTo(123);
-    }
-
-    @Test
-    public void assertThat_chooseLockIconChanged_WhenFingerprintExtraSet() {
-        ChooseLockPattern activity = createActivity(true);
-        ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
-                activity.getFragmentManager().findFragmentById(R.id.main_content);
-        ShadowDrawable drawable = Shadows.shadowOf(((GlifLayout) fragment.getView()).getIcon());
-        assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);
-    }
-
-    private ChooseLockPattern createActivity(boolean addFingerprintExtra) {
-        return Robolectric.buildActivity(
-                ChooseLockPattern.class,
-                new IntentBuilder(application)
-                        .setUserId(UserHandle.myUserId())
-                        .setForFingerprint(addFingerprintExtra)
-                        .build())
-                .setup().get();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
deleted file mode 100644
index 20a05e3b2dc62c423793ac518edc96789ab00fd4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.os.UserHandle;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.setupwizardlib.util.WizardManagerHelper;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowActivity.IntentForResult;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowUserManager.class,
-                ShadowUtils.class
-        })
-public class ChooseLockSettingsHelperTest {
-
-    @Test
-    public void testLaunchConfirmationActivityWithExternalAndChallenge() {
-
-        final int userId = UserHandle.myUserId();
-        final int request = 100;
-        final long challenge = 10000L;
-
-        final Activity activity = Robolectric.setupActivity(Activity.class);
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivityWithExternalAndChallenge(
-                request, // request
-                "title",
-                "header",
-                "description",
-                true, // external
-                challenge,
-                userId
-        );
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        Intent startedIntent = shadowActivity.getNextStartedActivity();
-
-        assertEquals(new ComponentName("com.android.settings",
-                        ConfirmLockPattern.InternalActivity.class.getName()),
-                startedIntent.getComponent());
-        assertFalse(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
-        assertTrue(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-        assertEquals(challenge, startedIntent.getLongExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
-        assertEquals(
-                true,
-                (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
-        assertEquals(true, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
-        assertEquals(true, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
-        assertEquals(true, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));
-        assertEquals(true, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false));
-    }
-
-    @Test
-    public void testLaunchConfirmationActivityInternalAndChallenge() {
-
-        final int userId = UserHandle.myUserId();
-        final int request = 100;
-        final long challenge = 10000L;
-
-        final Activity activity = Robolectric.setupActivity(Activity.class);
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivityWithExternalAndChallenge(
-                request,
-                "title",
-                "header",
-                "description",
-                false, // external
-                challenge,
-                userId
-        );
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        Intent startedIntent = shadowActivity.getNextStartedActivity();
-
-        assertEquals(new ComponentName("com.android.settings",
-                        ConfirmLockPattern.InternalActivity.class.getName()),
-                startedIntent.getComponent());
-        assertFalse(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
-        assertTrue(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-        assertEquals(challenge, startedIntent.getLongExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
-        assertEquals(
-                false,
-                (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
-        assertEquals(false, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
-        assertEquals(false, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
-        assertEquals(false, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));
-        assertEquals(false, startedIntent.getBooleanExtra(
-                ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false));
-    }
-
-    @Test
-    public void testLaunchConfirmationActivity_internal_shouldPropagateTheme() {
-        Intent intent = new Intent()
-                .putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
-        Activity activity = Robolectric.buildActivity(Activity.class)
-                .withIntent(intent)
-                .get();
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */);
-
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity.requestCode).isEqualTo(123);
-        assertThat(startedActivity.intent.getStringExtra(WizardManagerHelper.EXTRA_THEME))
-                .isEqualTo(WizardManagerHelper.THEME_GLIF_V2);
-    }
-
-
-    private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) {
-        LockPatternUtils mockLockPatternUtils = mock(LockPatternUtils.class);
-        when(mockLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
-                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(activity);
-        helper.mLockPatternUtils = mockLockPatternUtils;
-        return helper;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
deleted file mode 100644
index 0a0734f54c01401ad77c2871bb03c7e15108cdb4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowDialog;
-import org.robolectric.util.FragmentTestUtil;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowEventLogWriter.class,
-                ShadowUserManager.class,
-                ShadowUtils.class
-        })
-public class ChooseLockTypeDialogFragmentTest {
-    private Context mContext;
-    private TestFragment mFragment;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mFragment = new TestFragment();
-        FragmentTestUtil.startFragment(mFragment);
-    }
-
-    @Test
-    public void testThatDialog_IsShown() {
-        AlertDialog latestDialog = startLockFragment();
-        assertNotNull(latestDialog);
-        ShadowDialog shadowDialog = Shadows.shadowOf(latestDialog);
-        // verify that we are looking at the expected dialog.
-        assertEquals(shadowDialog.getTitle(),
-                mContext.getString(R.string.setup_lock_settings_options_dialog_title));
-    }
-
-    @Test
-    public void testThat_OnClickListener_IsCalled() {
-        mFragment.mDelegate = mock(OnLockTypeSelectedListener.class);
-        AlertDialog lockDialog = startLockFragment();
-        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(lockDialog);
-        shadowAlertDialog.clickOnItem(0);
-        verify(mFragment.mDelegate, times(1)).onLockTypeSelected(any(ScreenLockType.class));
-    }
-
-    @Test
-    public void testThat_OnClickListener_IsNotCalledWhenCancelled() {
-        mFragment.mDelegate = mock(OnLockTypeSelectedListener.class);
-        AlertDialog lockDialog = startLockFragment();
-        lockDialog.dismiss();
-        verify(mFragment.mDelegate, never()).onLockTypeSelected(any(ScreenLockType.class));
-    }
-
-
-    private AlertDialog startLockFragment() {
-        ChooseLockTypeDialogFragment chooseLockTypeDialogFragment =
-                ChooseLockTypeDialogFragment.newInstance(1234);
-        chooseLockTypeDialogFragment.show(mFragment.getChildFragmentManager(), null);
-        return ShadowAlertDialog.getLatestAlertDialog();
-    }
-
-
-    public static class TestFragment extends Fragment
-            implements OnLockTypeSelectedListener{
-        OnLockTypeSelectedListener mDelegate;
-        @Override
-        public void onLockTypeSelected(ScreenLockType lock) {
-            if (mDelegate != null) {
-                mDelegate.onLockTypeSelected(lock);
-            }
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
deleted file mode 100644
index d76968e86407f669ff0bcd5c3c0bb7eb2174eb21..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
-
-import android.app.Activity;
-import android.app.FragmentManager;
-
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-        })
-public class ConfirmCredentialTest {
-    @Test
-    public void testLastTryDialogShownExactlyOnce() {
-        FragmentManager fm = Robolectric.buildActivity(Activity.class).get().getFragmentManager();
-
-        // Launch only one instance at a time.
-        assertThat(LastTryDialog.show(
-                fm, "title", android.R.string.yes, android.R.string.ok, false)).isTrue();
-        assertThat(LastTryDialog.show(
-                fm, "title", android.R.string.yes, android.R.string.ok, false)).isFalse();
-
-        // After cancelling, the dialog should be re-shown when asked for.
-        LastTryDialog.hide(fm);
-        assertThat(LastTryDialog.show(
-                fm, "title", android.R.string.yes, android.R.string.ok, false)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
deleted file mode 100644
index 8beefa8c1940608d5a2e66a4bb7db54da3090e81..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.admin.DevicePolicyManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION)
-public class ScreenLockTypeTest {
-
-    @Test
-    public void fromQuality_shouldReturnLockWithAssociatedQuality() {
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC))
-                .isEqualTo(ScreenLockType.PASSWORD);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC))
-                .isEqualTo(ScreenLockType.PASSWORD);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK))
-                .isNull();
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX))
-                .isEqualTo(ScreenLockType.PASSWORD);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_MANAGED))
-                .isEqualTo(ScreenLockType.MANAGED);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC))
-                .isEqualTo(ScreenLockType.PIN);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX))
-                .isEqualTo(ScreenLockType.PIN);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING))
-                .isEqualTo(ScreenLockType.PATTERN);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
-                .isEqualTo(ScreenLockType.SWIPE);
-    }
-
-    @Test
-    public void fromKey_shouldReturnLockWithGivenKey() {
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(ScreenLockType.fromKey(lock.preferenceKey)).isEqualTo(lock);
-        }
-        assertThat(ScreenLockType.fromKey("nonexistent")).isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
deleted file mode 100644
index cb863a0863a1e092887c4cd8d7f34601d7d4805b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.Shadows.shadowOf;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SetNewPasswordActivityTest {
-
-    private int mProvisioned;
-
-    @Before
-    public void setUp() {
-        mProvisioned = Settings.Global.getInt(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 0);
-    }
-
-    @After
-    public void tearDown() {
-        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, mProvisioned);
-    }
-
-    @Test
-    public void testChooseLockGeneric() {
-        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 1);
-        SetNewPasswordActivity activity =
-                Robolectric.buildActivity(SetNewPasswordActivity.class).get();
-        activity.launchChooseLock(new Bundle());
-        ShadowActivity shadowActivity = shadowOf(activity);
-        Intent intent = shadowActivity.getNextStartedActivityForResult().intent;
-
-        assertThat(intent.getComponent())
-                .isEqualTo(new ComponentName(activity, ChooseLockGeneric.class));
-    }
-
-    @Test
-    public void testSetupChooseLockGeneric() {
-        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 0);
-        SetNewPasswordActivity activity =
-                Robolectric.buildActivity(SetNewPasswordActivity.class).get();
-        activity.launchChooseLock(new Bundle());
-        ShadowActivity shadowActivity = shadowOf(activity);
-        Intent intent = shadowActivity.getNextStartedActivityForResult().intent;
-
-        assertThat(intent.getComponent())
-                .isEqualTo(new ComponentName(activity, SetupChooseLockGeneric.class));
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
deleted file mode 100644
index 96775addb8cd4f67d5584a3ad6662abcdc0da19d..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
-
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
-        .HIDE_DISABLED_PREFS;
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
-        .MINIMUM_QUALITY_KEY;
-import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
-import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
-import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-
-/**
- * Tests for {@link SetNewPasswordController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class SetNewPasswordControllerTest {
-    private static final int CURRENT_USER_ID = 101;
-    private static final long FINGERPRINT_CHALLENGE = -9876512313131L;
-
-    @Mock PackageManager mPackageManager;
-    @Mock IFingerprintManager mFingerprintManager;
-    @Mock DevicePolicyManager mDevicePolicyManager;
-
-    @Mock private SetNewPasswordController.Ui mUi;
-    private SetNewPasswordController mSetNewPasswordController;
-
-    @Before
-    public void setUp()  {
-        MockitoAnnotations.initMocks(this);
-        mSetNewPasswordController = new SetNewPasswordController(
-                CURRENT_USER_ID, mPackageManager, mFingerprintManager, mDevicePolicyManager, mUi);
-
-        when(mFingerprintManager.preEnroll()).thenReturn(FINGERPRINT_CHALLENGE);
-        when(mPackageManager.hasSystemFeature(eq(FEATURE_FINGERPRINT))).thenReturn(true);
-    }
-
-    @Test
-    public void launchChooseLockWithFingerprint() {
-        // GIVEN the device supports fingerprint.
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        // GIVEN there are no enrolled fingerprints.
-        when(mFingerprintManager.hasEnrolledFingerprints(CURRENT_USER_ID)).thenReturn(false);
-        // GIVEN DPC does not disallow fingerprint for keyguard usage.
-        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
-                .thenReturn(0);
-
-        // WHEN the controller dispatches a set new password intent.
-        mSetNewPasswordController.dispatchSetNewPasswordIntent();
-
-        // THEN the choose lock activity is launched with fingerprint extras.
-        ArgumentCaptor<Bundle> bundleArgumentCaptor = ArgumentCaptor.forClass(Bundle.class);
-        verify(mUi).launchChooseLock(bundleArgumentCaptor.capture());
-        // THEN the extras have all values for fingerprint setup.
-        compareFingerprintExtras(bundleArgumentCaptor.getValue());
-    }
-
-    @Test
-    public void launchChooseLockWithoutFingerprint_noFingerprintFeature() {
-        // GIVEN the device does NOT support fingerprint feature.
-        when(mPackageManager.hasSystemFeature(eq(FEATURE_FINGERPRINT))).thenReturn(false);
-
-        // WHEN the controller dispatches a set new password intent.
-        mSetNewPasswordController.dispatchSetNewPasswordIntent();
-
-        // THEN the choose lock activity is launched without fingerprint extras.
-        ArgumentCaptor<Bundle> bundleArgumentCaptor = ArgumentCaptor.forClass(Bundle.class);
-        verify(mUi).launchChooseLock(bundleArgumentCaptor.capture());
-        assertBundleContainsUserIdOnly(bundleArgumentCaptor.getValue());
-    }
-
-    @Test
-    public void launchChooseLockWithoutFingerprint_noFingerprintSensor() {
-        // GIVEN the device does NOT support fingerprint.
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
-        // GIVEN there are no enrolled fingerprints.
-        when(mFingerprintManager.hasEnrolledFingerprints(CURRENT_USER_ID)).thenReturn(false);
-        // GIVEN DPC does not disallow fingerprint for keyguard usage.
-        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
-                .thenReturn(0);
-
-        // WHEN the controller dispatches a set new password intent.
-        mSetNewPasswordController.dispatchSetNewPasswordIntent();
-
-        // THEN the choose lock activity is launched without a bundle contains user id only.
-        ArgumentCaptor<Bundle> bundleArgumentCaptor = ArgumentCaptor.forClass(Bundle.class);
-        verify(mUi).launchChooseLock(bundleArgumentCaptor.capture());
-        assertBundleContainsUserIdOnly(bundleArgumentCaptor.getValue());
-    }
-
-    @Test
-    public void launchChooseLockWithoutFingerprint_hasFingerprintEnrolled() {
-        // GIVEN the device supports fingerprint.
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        // GIVEN there are no enrolled fingerprints.
-        when(mFingerprintManager.hasEnrolledFingerprints(CURRENT_USER_ID)).thenReturn(true);
-        // GIVEN DPC does not disallow fingerprint for keyguard usage.
-        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
-                .thenReturn(0);
-
-        // WHEN the controller dispatches a set new password intent.
-        mSetNewPasswordController.dispatchSetNewPasswordIntent();
-
-        // THEN the choose lock activity is launched without a bundle contains user id only.
-        ArgumentCaptor<Bundle> bundleArgumentCaptor = ArgumentCaptor.forClass(Bundle.class);
-        verify(mUi).launchChooseLock(bundleArgumentCaptor.capture());
-        assertBundleContainsUserIdOnly(bundleArgumentCaptor.getValue());
-    }
-
-    @Test
-    public void launchChooseLockWithoutFingerprint_deviceAdminDisallowFingerprintForKeyguard() {
-        // GIVEN the device supports fingerprint.
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        // GIVEN there is an enrolled fingerprint.
-        when(mFingerprintManager.hasEnrolledFingerprints(CURRENT_USER_ID)).thenReturn(true);
-        // GIVEN DPC disallows fingerprint for keyguard usage.
-        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
-                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
-
-        // WHEN the controller dispatches a set new password intent.
-        mSetNewPasswordController.dispatchSetNewPasswordIntent();
-
-        // THEN the choose lock activity is launched without a bundle contains user id only.
-        ArgumentCaptor<Bundle> bundleArgumentCaptor = ArgumentCaptor.forClass(Bundle.class);
-        verify(mUi).launchChooseLock(bundleArgumentCaptor.capture());
-        assertBundleContainsUserIdOnly(bundleArgumentCaptor.getValue());
-    }
-
-    private void compareFingerprintExtras(Bundle actualBundle) {
-        assertEquals(
-                "Password quality must be something in order to config fingerprint.",
-                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
-                actualBundle.getInt(MINIMUM_QUALITY_KEY));
-        assertTrue(
-                "All disabled preference should be removed.",
-                actualBundle.getBoolean(HIDE_DISABLED_PREFS));
-        assertTrue(
-                "There must be a fingerprint challenge.",
-                actualBundle.getBoolean(EXTRA_KEY_HAS_CHALLENGE));
-        assertEquals(
-                "The fingerprint challenge must come from the FingerprintManager",
-                FINGERPRINT_CHALLENGE,
-                actualBundle.getLong(EXTRA_KEY_CHALLENGE));
-        assertTrue(
-                "The request must be a fingerprint set up request.",
-                actualBundle.getBoolean(EXTRA_KEY_FOR_FINGERPRINT));
-        assertEquals(
-                "User id must be equaled to the input one.",
-                CURRENT_USER_ID,
-                actualBundle.getInt(Intent.EXTRA_USER_ID));
-    }
-
-    private void assertBundleContainsUserIdOnly(Bundle actualBundle) {
-        assertThat(actualBundle.size()).isEqualTo(1);
-        assertThat(actualBundle.getInt(Intent.EXTRA_USER_ID)).isEqualTo(CURRENT_USER_ID);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
deleted file mode 100644
index 1195a2c2ecdb78685371c1ed714d855a3a032368..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.RuntimeEnvironment.application;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.AlertDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
-import com.android.settings.password.ChooseLockPassword.IntentBuilder;
-import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowActivity.IntentForResult;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowDialog;
-
-import java.util.Collections;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEventLogWriter.class,
-                ShadowUtils.class
-        })
-public class SetupChooseLockPasswordTest {
-
-    @Before
-    public void setUp() throws Exception {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.string.config_headlineFontFamily, "");
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void createActivity_shouldNotCrash() {
-        // Basic sanity test for activity created without crashing
-        Robolectric.buildActivity(SetupChooseLockPassword.class,
-                SetupChooseLockPassword.modifyIntentForSetup(
-                        application,
-                        new IntentBuilder(application).build()))
-                .setup().get();
-    }
-
-    @Test
-    public void createActivity_withShowOptionsButtonExtra_shouldShowButton() {
-        SetupChooseLockPassword activity = createSetupChooseLockPassword();
-        Button optionsButton = activity.findViewById(R.id.screen_lock_options);
-        assertThat(optionsButton).isNotNull();
-        optionsButton.performClick();
-        assertThat(ShadowDialog.getLatestDialog()).isNotNull();
-    }
-
-    @Test
-    @Config(shadows = ShadowChooseLockGenericController.class)
-    public void createActivity_withShowOptionsButtonExtra_buttonNotVisibleIfNoVisibleLockTypes() {
-        SetupChooseLockPassword activity = createSetupChooseLockPassword();
-        Button optionsButton = activity.findViewById(R.id.screen_lock_options);
-        assertThat(optionsButton).isNotNull();
-        assertThat(optionsButton.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void allSecurityOptions_shouldBeShown_When_OptionsButtonIsClicked() {
-        SetupChooseLockPassword activity = createSetupChooseLockPassword();
-        activity.findViewById(R.id.screen_lock_options).performClick();
-        AlertDialog latestAlertDialog = ShadowAlertDialog.getLatestAlertDialog();
-        int count = Shadows.shadowOf(latestAlertDialog).getAdapter().getCount();
-        assertThat(count).named("List items shown").isEqualTo(3);
-    }
-
-    @Test
-    public void createActivity_clickDifferentOption_extrasShouldBePropagated() {
-        Bundle bundle = new Bundle();
-        bundle.putString("foo", "bar");
-
-        Intent intent = new IntentBuilder(application).build();
-        intent.putExtra(ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS, bundle);
-        intent = SetupChooseLockPassword.modifyIntentForSetup(application, intent);
-        intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
-
-        SetupChooseLockPassword activity =
-                Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
-
-        SetupChooseLockPasswordFragment fragment =
-                (SetupChooseLockPasswordFragment) activity.getFragmentManager()
-                        .findFragmentById(R.id.main_content);
-        fragment.onLockTypeSelected(ScreenLockType.PATTERN);
-
-        ShadowActivity shadowActivity = shadowOf(activity);
-        IntentForResult chooseLockIntent = shadowActivity.getNextStartedActivityForResult();
-        assertThat(chooseLockIntent).isNotNull();
-        assertThat(chooseLockIntent.requestCode)
-                .isEqualTo(SetupChooseLockPasswordFragment.REQUEST_SCREEN_LOCK_OPTIONS);
-        assertThat(chooseLockIntent.intent.getStringExtra("foo")).named("Foo extra")
-                .isEqualTo("bar");
-    }
-
-    private SetupChooseLockPassword createSetupChooseLockPassword() {
-        Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
-                application,
-                new IntentBuilder(application).build());
-        intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
-        return Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
-    }
-
-    @Implements(ChooseLockGenericController.class)
-    public static class ShadowChooseLockGenericController {
-        @Implementation
-        public List<ScreenLockType> getVisibleScreenLockTypes(int quality,
-                boolean includeDisabled) {
-            return Collections.emptyList();
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
deleted file mode 100644
index 0e6f28a5686004b5ab48033439a44fc95bd4468e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowEventLogWriter.class,
-                ShadowUtils.class
-        })
-public class SetupSkipDialogTest {
-
-    private Activity mActivity;
-
-    @Before
-    public void setUp() {
-        mActivity = Robolectric.setupActivity(Activity.class);
-    }
-
-    @Test
-    public void frpMessages_areShownCorrectly_whenNotSupported() {
-        SetupSkipDialog setupSkipDialog = SetupSkipDialog.newInstance(false);
-        setupSkipDialog.show(mActivity.getFragmentManager());
-
-        AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
-        assertNotNull(alertDialog);
-        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
-        assertEquals(application.getString(R.string.lock_screen_intro_skip_title),
-                shadowAlertDialog.getTitle());
-        assertEquals(application.getString(R.string.lock_screen_intro_skip_dialog_text),
-                shadowAlertDialog.getMessage());
-    }
-
-    @Test
-    public void frpMessages_areShownCorrectly_whenSupported() {
-        SetupSkipDialog setupSkipDialog = SetupSkipDialog.newInstance(true);
-        setupSkipDialog.show(mActivity.getFragmentManager());
-
-        AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
-        assertNotNull(alertDialog);
-        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
-        assertEquals(application.getString(R.string.lock_screen_intro_skip_title),
-                shadowAlertDialog.getTitle());
-        assertEquals(application.getString(R.string.lock_screen_intro_skip_dialog_text_frp),
-                shadowAlertDialog.getMessage());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
deleted file mode 100644
index cf34f452d14168dd8507171a6b8919d682d275e9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.print;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.res.Resources;
-import android.print.PrintJob;
-import android.print.PrintJobInfo;
-import android.print.PrintManager;
-import android.printservice.PrintServiceInfo;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PrintSettingsFragmentTest {
-
-    @Mock
-    private PrintSettingsFragment.PrintSummaryProvider.PrintManagerWrapper mPrintManager;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private Resources mRes;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-    private SummaryLoader.SummaryProvider mSummaryProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getResources()).thenReturn(mRes);
-        mSummaryProvider = new PrintSettingsFragment.PrintSummaryProvider(mActivity, mSummaryLoader,
-                mPrintManager);
-    }
-
-    @Test
-    public void testSummary_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
-        final List<PrintJob> printJobs = new ArrayList<>();
-        final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
-        printJobs.add(job);
-        when(job.getInfo().getState()).thenReturn(PrintJobInfo.STATE_STARTED);
-        when(mPrintManager.getPrintJobs()).thenReturn(printJobs);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mRes).getQuantityString(R.plurals.print_jobs_summary, 1, 1);
-    }
-
-    @Test
-    public void testSummary_shouldSetSummaryToNumberOfPrintServices() {
-        final List<PrintServiceInfo> printServices = mock(List.class);
-        when(printServices.isEmpty()).thenReturn(false);
-        when(printServices.size()).thenReturn(2);
-        // 2 services
-        when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES))
-                .thenReturn(printServices);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mRes).getQuantityString(R.plurals.print_settings_summary, 2, 2);
-
-        // No service
-        when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)).thenReturn(null);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mActivity).getString(R.string.print_settings_summary_no_service);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java
deleted file mode 100644
index 4896dc48dd43c84a180b7551ba01004687bf1f86..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.accessibility.AccessibilityManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccessibilityServiceResultLoaderTest {
-
-    private static final String QUERY = "test_query";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private AccessibilityManager mAccessibilityManager;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-
-    private AccessibilityServiceResultLoader mLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))
-                .thenReturn(mAccessibilityManager);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
-        mLoader = new AccessibilityServiceResultLoader(mContext, QUERY, mSiteMapManager);
-    }
-
-    @Test
-    public void query_noService_shouldNotReturnAnything() {
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    @Test
-    public void query_hasServiceMatchingTitle_shouldReturnResult() {
-        addFakeAccessibilityService();
-
-        List<? extends SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
-        assertThat(results).hasSize(1);
-
-        SearchResult result = results.get(0);
-        assertThat(result.title).isEqualTo(QUERY);
-    }
-
-    @Test
-    public void query_serviceDoesNotMatchTitle_shouldReturnResult() {
-        addFakeAccessibilityService();
-
-        mLoader = new AccessibilityServiceResultLoader(mContext,
-                QUERY + "no_match", mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    private void addFakeAccessibilityService() {
-        final List<AccessibilityServiceInfo> services = new ArrayList<>();
-        final AccessibilityServiceInfo info = mock(AccessibilityServiceInfo.class);
-        final ResolveInfo resolveInfo = mock(ResolveInfo.class);
-        when(info.getResolveInfo()).thenReturn(resolveInfo);
-        when(resolveInfo.loadIcon(mPackageManager)).thenReturn(new ColorDrawable(Color.BLUE));
-        when(resolveInfo.loadLabel(mPackageManager)).thenReturn(QUERY);
-        resolveInfo.serviceInfo = new ServiceInfo();
-        resolveInfo.serviceInfo.packageName = "pkg";
-        resolveInfo.serviceInfo.name = "class";
-        services.add(info);
-
-        when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(services);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
deleted file mode 100644
index 6c6d7ab64c60e5b7500204bbb1ed85398d717fdf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BaseSearchIndexProviderTest {
-
-    private static final String TEST_PREF_KEY = "test_pref_key";
-
-    @Mock
-    private Context mContext;
-    private BaseSearchIndexProvider mIndexProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mIndexProvider = spy(BaseSearchIndexProvider.class);
-    }
-
-    @Test
-    public void getNonIndexableKeys_noPreferenceController_shouldReturnEmptyList() {
-        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();
-    }
-
-    public static class AvailablePreferenceController extends AbstractPreferenceController
-            implements PreferenceControllerMixin {
-        public AvailablePreferenceController(Context context) {
-            super(context);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return true;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return TEST_PREF_KEY;
-        }
-    }
-
-    @Test
-    public void getNonIndexableKeys_preferenceIsAvailable_shouldReturnEmptyList() {
-        List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new AvailablePreferenceController(mContext));
-        doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
-
-        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);
-    }
-
-    public static class NotAvailablePreferenceController extends AbstractPreferenceController
-            implements PreferenceControllerMixin {
-        public NotAvailablePreferenceController(Context context) {
-            super(context);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return false;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return TEST_PREF_KEY;
-        }
-    }
-
-    @Test
-    public void getNonIndexableKeys_preferenceIsNotAvailable_shouldReturnKey() {
-        List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new NotAvailablePreferenceController(mContext));
-        doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
-
-        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).contains(TEST_PREF_KEY);
-    }
-
-    @Test
-    public void getNonIndexableKeys_pageSearchIsDisabled_shouldSuppressEverything() {
-        final BaseSearchIndexProvider provider = new BaseSearchIndexProvider() {
-            @Override
-            public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                    boolean enabled) {
-                final SearchIndexableResource sir = new SearchIndexableResource(context);
-                sir.xmlResId = R.xml.data_usage;
-                return Arrays.asList(sir);
-            }
-
-            @Override
-            protected boolean isPageSearchEnabled(Context context) {
-                return false;
-            }
-        };
-
-        final List<String> nonIndexableKeys = provider
-                .getNonIndexableKeys(RuntimeEnvironment.application);
-
-        assertThat(nonIndexableKeys).containsAllOf("status_header", "limit_summary",
-                "restrict_background");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
deleted file mode 100644
index a15a449fdf8dee5759eeee70e6032093c3de2ad4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.graphics.drawable.Drawable;
-
-import com.android.settings.DisplaySettings;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.gestures.SwipeToNotificationSettings;
-import com.android.settings.search.ResultPayload.Availability;
-import com.android.settings.search.ResultPayload.PayloadType;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wifi.WifiSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CursorToSearchResultConverterTest {
-
-    private static final List<String> TITLES = Arrays.asList("title1", "title2", "title3");
-    private static final String SUMMARY = "summary";
-    private static final String TARGET_PACKAGE = "a.b.c";
-    private static final String TARGET_CLASS = "a.b.c.class";
-    private static final String KEY = "key";
-    private static final Intent INTENT = new Intent("com.android.settings");
-    private static final int ICON = R.drawable.ic_search_24dp;
-    private static final int BASE_RANK = 1;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SiteMapManager mSiteMapManager;
-    private Drawable mDrawable;
-    private CursorToSearchResultConverter mConverter;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        Context context = Robolectric.buildActivity(Activity.class).get();
-        mDrawable = context.getDrawable(ICON);
-        mConverter = new CursorToSearchResultConverter(context);
-    }
-
-    @Test
-    public void testParseNullResults_ReturnsNull() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, null, BASE_RANK);
-        assertThat(results).isNull();
-    }
-
-    @Test
-    public void testParseCursor_NotNull() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        assertThat(results).isNotNull();
-    }
-
-    @Test
-    public void testParseCursor_MatchesRank() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(BASE_RANK);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesTitle() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (SearchResult result : results) {
-            assertThat(TITLES).contains(result.title);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesSummary() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (SearchResult result : results) {
-            assertThat(result.summary).isEqualTo(SUMMARY);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesIcon() {
-        final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
-        final String BLANK = "";
-        cursor.addRow(new Object[]{
-                KEY.hashCode(),      // Doc ID
-                "Longer than 20 characters", // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                DisplaySettings.class.getName(),
-                BLANK,   // screen title
-                ICON,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                KEY,   // Key
-                PayloadType.INTENT,       // Payload Type
-                payload     // Payload
-        });
-
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, cursor, BASE_RANK);
-
-        for (SearchResult result : results) {
-            Drawable resultDrawable = result.icon;
-            assertThat(resultDrawable).isNotNull();
-            assertThat(resultDrawable.toString()).isEqualTo(mDrawable.toString());
-        }
-    }
-
-    @Test
-    public void testParseCursor_NoIcon() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor("noIcon" /* key */, "" /* className */), BASE_RANK);
-        for (SearchResult result : results) {
-            assertThat(result.icon).isNull();
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesPayloadType() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        ResultPayload payload;
-        for (SearchResult result : results) {
-            payload = result.payload;
-            assertThat(payload.getType()).isEqualTo(PayloadType.INTENT);
-        }
-    }
-
-    @Test
-    public void testLongTitle_PenalizedInRank() {
-        final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
-        final String BLANK = "";
-        cursor.addRow(new Object[]{
-                KEY.hashCode(),      // Doc ID
-                "Longer than 20 characters", // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                DisplaySettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                KEY,   // Key
-                PayloadType.INTENT,       // Payload Type
-                payload     // Payload
-        });
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(BASE_RANK + 1);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesResultPayload() {
-        final Set<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        ResultPayload payload;
-        for (SearchResult result : results) {
-            payload = result.payload;
-            Intent intent = payload.getIntent();
-            assertThat(intent.getAction()).isEqualTo(INTENT.getAction());
-        }
-    }
-
-
-    @Test
-    public void testParseCursor_MatchesInlineSwitchPayload() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String uri = "test.com";
-        final int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        final int source = ResultPayload.SettingsSource.SECURE;
-        final String intentKey = "key";
-        final String intentVal = "value";
-        final Intent intent = new Intent();
-        intent.putExtra(intentKey, intentVal);
-        final InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1 /* onValue */,
-                intent, true /* isDeviceSupported */, 0 /* defautValue */);
-
-        cursor.addRow(new Object[]{
-                KEY.hashCode(),      // Doc ID
-                TITLES.get(0), // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                SwipeToNotificationSettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                KEY,   // Key
-                type,    // Payload Type
-                ResultPayloadUtils.marshall(payload) // Payload
-        });
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            final InlineSwitchPayload newPayload = (InlineSwitchPayload) result.payload;
-            final Intent rebuiltIntent = newPayload.getIntent();
-            assertThat(newPayload.mSettingKey).isEqualTo(uri);
-            assertThat(newPayload.getType()).isEqualTo(type);
-            assertThat(newPayload.mSettingSource).isEqualTo(source);
-            assertThat(newPayload.isStandard()).isTrue();
-            assertThat(newPayload.getAvailability()).isEqualTo(Availability.AVAILABLE);
-            assertThat(rebuiltIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
-        }
-    }
-
-    // The following tests are temporary, and should be removed when we replace the Search
-    // White-list solution for elevating ranking.
-
-    @Test
-    public void testWifiKey_PrioritizedResult() {
-        final String key = "main_toggle_wifi";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testBluetoothKey_PrioritizedResult() {
-        final String key = "main_toggle_bluetooth";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testAirplaneKey_PrioritizedResult() {
-        final String key = "toggle_airplane";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testHotspotKey_PrioritizedResult() {
-        final String key = "tether_settings";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testBatterySaverKey_PrioritizedResult() {
-        final String key = "battery_saver";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testNFCKey_PrioritizedResult() {
-        final String key = "toggle_nfc";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testDataSaverKey_PrioritizedResult() {
-        final String key = "restrict_background";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testDataUsageKey_PrioritizedResult() {
-        final String key = "data_usage_enable";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    @Test
-    public void testRoamingKey_PrioritizedResult() {
-        final String key = "button_roaming_key";
-        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
-        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
-                BASE_RANK);
-
-        for (SearchResult result : results) {
-            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
-        }
-    }
-
-    // End of temporary tests
-
-    private MatrixCursor getDummyCursor() {
-        String[] keys = new String[] {KEY + "1", KEY + "2", KEY + "3"};
-        return getDummyCursor(keys, "" /* className */);
-    }
-
-    private MatrixCursor getDummyCursor(String key, String className) {
-        String[] keys = new String[] {key};
-        return getDummyCursor(keys, className);
-    }
-
-    private MatrixCursor getDummyCursor(String[] keys, String className) {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
-
-        for (int i = 0; i < keys.length; i++) {
-            ArrayList<Object> item = new ArrayList<>(DatabaseResultLoader.SELECT_COLUMNS.length);
-            item.add(keys[i].hashCode()); // Doc ID
-            item.add(TITLES.get(i)); // Title
-            item.add(SUMMARY); // Summary on
-            item.add(BLANK); // summary off
-            item.add(className); // classname
-            item.add(BLANK); // screen title
-            item.add(null); // Icon
-            item.add(INTENT.getAction()); // Intent action
-            item.add(TARGET_PACKAGE); // target package
-            item.add(TARGET_CLASS); // target class
-            item.add(keys[i]); // Key
-            item.add(Integer.toString(0));     // Payload Type
-            item.add(payload); // Payload
-
-            cursor.addRow(item);
-        }
-        return cursor;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
deleted file mode 100644
index afc7d7a95ac73429367daec83d274920ecb772ec..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-import android.util.ArraySet;
-import com.android.settings.DateTimeSettings;
-import com.android.settings.R;
-import com.android.settings.SecuritySettings;
-import com.android.settings.TestConfig;
-import com.android.settings.core.codeinspection.CodeInspector;
-import com.android.settings.datausage.DataPlanUsageSummary;
-import com.android.settings.datausage.DataUsageSummary;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        assetDir = "/tests/robotests/assets")
-public class DataIntegrityTest {
-
-    @Test
-    @Config(shadows = {
-            SettingsShadowResources.class,
-            SettingsShadowResources.SettingsShadowTheme.class,
-    })
-    public void testIndexableResources_uniqueKeys() {
-        final Context context = RuntimeEnvironment.application;
-        // Aggregation of all keys
-        final Set<String> masterKeys = new ArraySet<>();
-        // Aggregation of the incorrectly duplicate keys
-        final Set<String> duplicateKeys = new ArraySet<>();
-        // Keys for a specific page
-        final Set<String> pageKeys = new ArraySet<>();
-        // List of all Xml preferences
-        final Set<Integer> xmlList = new ArraySet<>();
-        // Duplicates we know about.
-        List<String> grandfatheredKeys = new ArrayList<>();
-        CodeInspector.initializeGrandfatherList(grandfatheredKeys,
-                "whitelist_duplicate_index_key");
-
-        // Get a list of all Xml.
-        for (SearchIndexableResource val : SearchIndexableResources.values()) {
-            final int xmlResId = val.xmlResId;
-            if (xmlResId != 0) {
-                xmlList.add(xmlResId);
-            } else {
-                // Take class and get all keys
-                final Class clazz = DatabaseIndexingUtils.getIndexableClass(val.className);
-
-                // Skip classes that are invalid or cannot be mocked. Add them as special Xml below.
-                if (clazz == null
-                        || clazz == DateTimeSettings.class
-                        || clazz == DataPlanUsageSummary.class
-                        || clazz == DataUsageSummary.class
-                        || clazz == SecuritySettings.class) {
-                    continue;
-                }
-
-                Indexable.SearchIndexProvider provider = DatabaseIndexingUtils
-                        .getSearchIndexProvider(clazz);
-
-                if (provider == null) {
-                    continue;
-                }
-
-                List<SearchIndexableResource> subXml =
-                        provider.getXmlResourcesToIndex(context, true);
-
-                if (subXml == null) {
-                    continue;
-                }
-                for (SearchIndexableResource resource : subXml) {
-                    final int subXmlResId = resource.xmlResId;
-                    if (subXmlResId != 0) {
-                        xmlList.add(subXmlResId);
-                    }
-                }
-            }
-        }
-        addSpecialXml(xmlList);
-
-        // Get keys from all Xml and check for duplicates.
-        for (Integer xmlResId : xmlList) {
-            // Get all keys to be indexed
-            final List<String> prefKeys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlResId);
-            pageKeys.addAll(prefKeys);
-            // Find all already-existing keys.
-            pageKeys.retainAll(masterKeys);
-            // Keep list of offending duplicate keys.
-            duplicateKeys.addAll(pageKeys);
-            // Add all keys to master key list.
-            masterKeys.addAll(prefKeys);
-            pageKeys.clear();
-        }
-        assertThat(duplicateKeys).containsExactlyElementsIn(grandfatheredKeys);
-    }
-
-    /**
-     * Add XML preferences from Fragments which have issues being instantiated in robolectric.
-     */
-    private void addSpecialXml(Set<Integer> xmlList) {
-        xmlList.add(R.xml.date_time_prefs);
-        xmlList.add(R.xml.data_usage);
-        xmlList.add(R.xml.data_usage_cellular);
-        xmlList.add(R.xml.data_usage_wifi);
-        xmlList.add(R.xml.security_settings_misc);
-    }
-
-
-}
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
deleted file mode 100644
index 70ed568447dab2977dd1c1a83cf2bb0b4006a7ee..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
+++ /dev/null
@@ -1,1221 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
-import android.content.pm.ResolveInfo;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.SearchIndexableResource;
-import android.util.ArrayMap;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowDatabaseIndexingUtils;
-import com.android.settings.testutils.shadow.ShadowRunnableAsyncTask;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowContentResolver;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {
-        ShadowRunnableAsyncTask.class,
-        ShadowDatabaseIndexingUtils.class,
-        ShadowContentResolver.class
-    }
-)
-public class DatabaseIndexingManagerTest {
-    private final String localeStr = "en_US";
-
-    private final int rank = 8;
-    private final String title = "title\u2011title";
-    private final String updatedTitle = "title-title";
-    private final String normalizedTitle = "titletitle";
-    private final String summaryOn = "summary\u2011on";
-    private final String updatedSummaryOn = "summary-on";
-    private final String normalizedSummaryOn = "summaryon";
-    private final String summaryOff = "summary\u2011off";
-    private final String updatedSummaryOff = "summary-off";
-    private final String normalizedSummaryOff = "summaryoff";
-    private final String entries = "entries";
-    private final String keywords = "keywords, keywordss, keywordsss";
-    private final String spaceDelimittedKeywords = "keywords keywordss keywordsss";
-    private final String screenTitle = "screen title";
-    private final String className = "class name";
-    private final int iconResId = 0xff;
-    private final int noIcon = 0;
-    private final String action = "action";
-    private final String targetPackage = "target package";
-    private final String targetClass = "target class";
-    private final String packageName = "package name";
-    private final String key = "key";
-    private final int userId = -1;
-    private final boolean enabled = true;
-
-    private final String AUTHORITY_ONE = "authority";
-    private final String PACKAGE_ONE = "com.android.settings";
-
-    private final String TITLE_ONE = "title one";
-    private final String TITLE_TWO = "title two";
-    private final String KEY_ONE = "key one";
-    private final String KEY_TWO = "key two";
-
-    private Context mContext;
-
-    private DatabaseIndexingManager mManager;
-    private SQLiteDatabase mDb;
-
-    @Mock
-    private PackageManager mPackageManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mManager = spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-
-        doReturn(mPackageManager).when(mContext).getPackageManager();
-        FakeFeatureFactory.setupForTest(mContext);
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void testDatabaseSchema() {
-        Cursor dbCursor = mDb.query("prefs_index", null, null, null, null, null, null);
-        List<String> columnNames = new ArrayList<>(Arrays.asList(dbCursor.getColumnNames()));
-        // Note that docid is not included.
-        List<String> expColumnNames = new ArrayList<>(Arrays.asList(new String[]{
-                "locale",
-                "data_rank",
-                "data_title",
-                "data_title_normalized",
-                "data_summary_on",
-                "data_summary_on_normalized",
-                "data_summary_off",
-                "data_summary_off_normalized",
-                "data_entries",
-                "data_keywords",
-                "class_name",
-                "screen_title",
-                "intent_action",
-                "intent_target_package",
-                "intent_target_class",
-                "icon",
-                "enabled",
-                "data_key_reference",
-                "user_id",
-                "payload_type",
-                "payload"
-        }));
-        // Prevent database schema regressions
-        assertThat(columnNames).containsAllIn(expColumnNames);
-    }
-
-    // Tests for the flow: IndexOneRaw -> UpdateOneRowWithFilteredData -> UpdateOneRow
-
-    @Test
-    public void testInsertRawColumn_rowInserted() {
-        SearchIndexableRaw raw = getFakeRaw();
-        mManager.indexOneSearchIndexableData(mDb, localeStr, raw,
-                new HashMap<>()/* Non-indexable keys */);
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void testInsertRawColumn_nonIndexableKey_resultIsDisabled() {
-        SearchIndexableRaw raw = getFakeRaw();
-        Map<String, Set<String>> niks = new HashMap<>();
-        Set<String> keys = new HashSet<>();
-        keys.add(raw.key);
-        niks.put(raw.intentTargetPackage, keys);
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, raw, niks);
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
-        assertThat(cursor.getCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void testInsertRawColumn_rowMatches() {
-        SearchIndexableRaw raw = getFakeRaw();
-        mManager.indexOneSearchIndexableData(mDb, localeStr, raw,
-                new HashMap<>()/* Non-indexable keys */);
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        cursor.moveToPosition(0);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(raw.rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo(updatedTitle);
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo(normalizedTitle);
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo(updatedSummaryOn);
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo(normalizedSummaryOn);
-        // Summary Off
-        assertThat(cursor.getString(6)).isEqualTo(updatedSummaryOff);
-        // Summary off normalized
-        assertThat(cursor.getString(7)).isEqualTo(normalizedSummaryOff);
-        // Entries
-        assertThat(cursor.getString(8)).isEqualTo(raw.entries);
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo(spaceDelimittedKeywords);
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo(raw.screenTitle);
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(raw.className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(raw.iconResId);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(raw.intentAction);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(raw.intentTargetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(raw.intentTargetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(raw.enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isNotNull();
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(raw.userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testInsertRawColumn_mismatchedLocale_noRowInserted() {
-        SearchIndexableRaw raw = getFakeRaw("ca-fr");
-        mManager.indexOneSearchIndexableData(mDb, localeStr, raw, null /* Non-indexable keys */);
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(0);
-    }
-
-    // Tests for the flow: IndexOneResource -> IndexFromResource ->
-    //                     UpdateOneRowWithFilteredData -> UpdateOneRow
-
-    @Test
-    public void testNullResource_NothingInserted() {
-        mManager.indexOneSearchIndexableData(mDb, localeStr, null /* searchIndexableResource */,
-                new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void testAddResource_RowsInserted() {
-        SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(17);
-    }
-
-    @Test
-    public void testAddResource_withNIKs_rowsInsertedDisabled() {
-        SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
-        // Only add 2 of 16 items to be disabled.
-        String[] keys = {"brightness", "wallpaper"};
-        Map<String, Set<String>> niks = getNonIndexableKeys(keys);
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, niks);
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
-        assertThat(cursor.getCount()).isEqualTo(2);
-        cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        assertThat(cursor.getCount()).isEqualTo(15);
-    }
-
-    @Test
-    public void testAddResourceHeader_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.application_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(1);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("App info");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("app info");
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo("Manage apps, set up quick launch shortcuts");
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo("manage apps, set up quick launch shortcuts");
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEmpty();
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("App info");
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(0);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("applications_settings");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testAddResource_withChildFragment_shouldUpdateSiteMapDb() {
-        // FIXME: This test was failing. (count = 6 at the end)
-
-//        SearchIndexableResource resource = getFakeResource(R.xml.network_and_internet);
-//        mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
-//                new HashMap<>());
-//        Cursor query = mDb.query(IndexDatabaseHelper.Tables.TABLE_SITE_MAP, SITE_MAP_COLUMNS,
-//                null, null, null, null, null);
-//        query.moveToPosition(-1);
-//        int count = 0;
-//        while (query.moveToNext()) {
-//            count++;
-//            assertThat(query.getString(query.getColumnIndex(SiteMapColumns.PARENT_CLASS)))
-//                    .isEqualTo(className);
-//            assertThat(query.getString(query.getColumnIndex(SiteMapColumns.PARENT_TITLE)))
-//                    .isEqualTo(mContext.getString(R.string.network_dashboard_title));
-//            assertThat(query.getString(query.getColumnIndex(SiteMapColumns.CHILD_CLASS)))
-//                    .isNotEmpty();
-//            assertThat(query.getString(query.getColumnIndex(SiteMapColumns.CHILD_TITLE)))
-//                    .isNotEmpty();
-//        }
-//        assertThat(count).isEqualTo(5);
-    }
-
-    @Test
-    public void testAddResource_customSetting_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        final String prefTitle =
-                mContext.getString(R.string.fingerprint_swipe_for_notifications_title);
-        final String prefSummary =
-                mContext.getString(R.string.fingerprint_swipe_for_notifications_summary);
-        final String keywords = mContext.getString(R.string.keywords_gesture);
-        Cursor cursor = mDb.rawQuery(
-                "SELECT * FROM prefs_index where data_title='" + prefTitle + "'", null);
-        cursor.moveToFirst();
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo(prefTitle);
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo(prefTitle.toLowerCase());
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo(prefSummary);
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo(prefSummary.toLowerCase());
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo(keywords);
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo(
-                mContext.getString(R.string.fingerprint_swipe_for_notifications_title));
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("gesture_swipe_down_fingerprint");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testAddResource_checkboxPreference_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.application_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        /* Should return 6 results, with the following titles:
-         * Advanced Settings, Apps, Manage Apps, Preferred install location, Running Services
-         */
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(0);
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Advanced settings");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("advanced settings");
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo("Enable more settings options");
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo("enable more settings options");
-        // Summary Off
-        assertThat(cursor.getString(6)).isEqualTo("Enable more settings options");
-        // Summary Off
-        assertThat(cursor.getString(7)).isEqualTo("enable more settings options");
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEmpty();
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("App info");
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("toggle_advanced_settings");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testAddResource_listPreference_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.application_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(3);
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Preferred install location");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("preferred install location");
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo(
-                "Change the preferred installation location for new apps");
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo(
-                "change the preferred installation location for new apps");
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isEqualTo("Internal device storage|Removable SD card|" +
-                "Let the system decide|");
-        // Keywords
-        assertThat(cursor.getString(9)).isEmpty();
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("App info");
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("app_install_location");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testAddResource_iconAddedFromXml() {
-        SearchIndexableResource resource = getFakeResource(R.xml.connected_devices);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(0);
-
-        // Icon
-        assertThat(cursor.getInt(12)).isNotEqualTo(noIcon);
-    }
-
-    // Tests for the flow: IndexOneResource -> IndexFromProvider -> IndexFromResource ->
-    //                     UpdateOneRowWithFilteredData -> UpdateOneRow
-
-    @Test
-    public void testResourceProvider_rowInserted() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        resource.xmlResId = 0;
-        resource.className = "com.android.settings.display.ScreenZoomSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void testResourceProvider_rowMatches() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        resource.xmlResId = 0;
-        resource.className = "com.android.settings.display.ScreenZoomSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        cursor.moveToPosition(0);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(0);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Display size");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("display size");
-        // Summary On
-        assertThat(cursor.getString(4)).isEmpty();
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEmpty();
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo("display density screen zoom scale scaling");
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("Display size");
-        // Class Name
-        assertThat(cursor.getString(11))
-                .isEqualTo("com.android.settings.display.ScreenZoomSettings");
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isNull();
-        // Target Package
-        assertThat(cursor.getString(14)).isNull();
-        // Target Class
-        assertThat(cursor.getString(15)).isNull();
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isNull();
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testResourceProvider_resourceRowInserted() {
-        SearchIndexableResource resource = getFakeResource(0);
-        resource.className = "com.android.settings.LegalSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(6);
-    }
-
-    @Test
-    public void testResourceProvider_resourceRowMatches() {
-        SearchIndexableResource resource = getFakeResource(0 /* xml */);
-        resource.className = "com.android.settings.display.ScreenZoomSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(0);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(0);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Display size");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("display size");
-        // Summary On
-        assertThat(cursor.getString(4)).isEmpty();
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEmpty();
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo(
-                "display density screen zoom scale scaling");
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("Display size");
-        // Class Name
-        assertThat(cursor.getString(11))
-                .isEqualTo("com.android.settings.display.ScreenZoomSettings");
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isNull();
-        // Target Package
-        assertThat(cursor.getString(14)).isNull();
-        // Target Class
-        assertThat(cursor.getString(15)).isNull();
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isNull();
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testResourceProvider_disabledResource_rowsInserted() {
-        SearchIndexableResource resource = getFakeResource(0 /* xml */);
-        resource.className = "com.android.settings.LegalSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
-                new HashMap<String, Set<String>>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        assertThat(cursor.getCount()).isEqualTo(1);
-        cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
-        assertThat(cursor.getCount()).isEqualTo(5);
-    }
-
-    @Test
-    public void testResource_withTitleAndSettingName_titleNotInserted() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        mManager.indexFromResource(mDb, localeStr, resource, new ArrayList<String>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE" +
-                " enabled = 1", null);
-        assertThat(cursor.getCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void testResourceProvider_nonSubsettingIntent() {
-        SearchIndexableResource resource = getFakeResource(0 /* xml */);
-        String fakeAction = "fake_action";
-        resource.className = "com.android.settings.LegalSettings";
-        resource.intentAction = fakeAction;
-        resource.intentTargetPackage = SearchIndexableResources.SUBSETTING_TARGET_PACKAGE;
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        cursor.moveToPosition(0);
-
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(fakeAction);
-        // Target Package
-        assertThat(cursor.getString(14))
-                .isEqualTo(SearchIndexableResources.SUBSETTING_TARGET_PACKAGE);
-    }
-
-    // Test new public indexing flow
-
-    @Test
-    public void testPerformIndexing_fullIndex_getsDataFromProviders() {
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
-
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
-
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.performIndexing();
-
-        verify(manager).addIndexablesFromRemoteProvider(PACKAGE_ONE, AUTHORITY_ONE);
-        verify(manager).updateDatabase(true /* isFullIndex */, Locale.getDefault().toString());
-    }
-
-    @Test
-    public void testPerformIndexing_incrementalIndex_noDataAdded() {
-        final List<ResolveInfo> providerInfo = getDummyResolveInfo();
-        skipFullIndex(providerInfo);
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(providerInfo);
-
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.mDataToProcess.dataToUpdate.clear();
-
-        manager.performIndexing();
-
-        verify(manager, times(0)).addDataToDatabase(any(SQLiteDatabase.class), anyString(),
-                anyList(), anyMap());
-        verify(manager, times(0)).addIndexablesFromRemoteProvider(PACKAGE_ONE, AUTHORITY_ONE);
-        verify(manager).updateDataInDatabase(any(SQLiteDatabase.class), anyMap());
-    }
-
-    @Test
-    public void testPerformIndexing_localeChanged_databaseDropped() {
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
-
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
-
-        // Initialize the Manager
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        // Insert data point which will be dropped
-        final String oldTitle = "This is French";
-        insertSpecialCase(oldTitle, true, "key");
-
-        // Add a data point to be added by the indexing
-        SearchIndexableRaw raw = new SearchIndexableRaw(mContext);
-        final String newTitle = "This is English";
-        raw.title = newTitle;
-        manager.mDataToProcess.dataToUpdate.add(raw);
-
-        manager.performIndexing();
-
-        // Assert that the New Title is inserted
-        final Cursor newCursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE data_title = '" +
-                newTitle + "'", null);
-        assertThat(newCursor.getCount()).isEqualTo(1);
-
-        // Assert that the Old Title is no longer in the database, since it was dropped
-        final Cursor oldCursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE data_title = '" +
-                oldTitle + "'", null);
-        assertThat(oldCursor.getCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void testPerformIndexing_onOta_FullIndex() {
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(
-                AUTHORITY_ONE, provider
-        );
-
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
-
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.performIndexing();
-
-        verify(manager).updateDatabase(true /* isFullIndex */, Locale.getDefault().toString());
-    }
-
-    @Test
-    public void testPerformIndexing_onPackageChange_shouldFullIndex() {
-        final List<ResolveInfo> providers = getDummyResolveInfo();
-        final String buildNumber = Build.FINGERPRINT;
-        final String locale = Locale.getDefault().toString();
-        skipFullIndex(providers);
-
-        // This snapshot is already indexed. Should return false
-        assertThat(IndexDatabaseHelper.isFullIndex(
-                mContext, locale, buildNumber,
-                IndexDatabaseHelper.buildProviderVersionedNames(providers)))
-                .isFalse();
-
-        // Change provider version number, this should trigger full index.
-        providers.get(0).providerInfo.applicationInfo.versionCode++;
-
-        assertThat(IndexDatabaseHelper.isFullIndex(mContext, locale, buildNumber,
-                IndexDatabaseHelper.buildProviderVersionedNames(providers)))
-                .isTrue();
-    }
-
-    @Test
-    public void testPerformIndexing_onOta_buildNumberIsCached() {
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(
-                AUTHORITY_ONE, provider
-        );
-
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
-
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.performIndexing();
-
-        assertThat(IndexDatabaseHelper.getInstance(mContext).isBuildIndexed(mContext,
-                Build.FINGERPRINT)).isTrue();
-    }
-
-    @Test
-    public void testFullUpdatedDatabase_noData_addDataToDatabaseNotCalled() {
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
-        mManager.mDataToProcess.dataToUpdate.clear();
-        verify(mManager, times(0)).addDataToDatabase(any(SQLiteDatabase.class), anyString(),
-                anyList(), anyMap());
-    }
-
-    @Test
-    public void testFullUpdatedDatabase_updatedDataInDatabaseNotCalled() {
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
-        verify(mManager, times(0)).updateDataInDatabase(any(SQLiteDatabase.class), anyMap());
-    }
-
-    @Test
-    public void testLocaleUpdated_afterIndexing_localeNotAdded() {
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
-        assertThat(IndexDatabaseHelper.getInstance(mContext)
-                .isLocaleAlreadyIndexed(mContext, localeStr)).isFalse();
-    }
-
-    @Test
-    public void testLocaleUpdated_afterFullIndexing_localeAdded() {
-        mManager.performIndexing();
-        assertThat(IndexDatabaseHelper.getInstance(mContext)
-                .isLocaleAlreadyIndexed(mContext, localeStr)).isTrue();
-    }
-
-    @Test
-    public void testUpdateDatabase_newEligibleData_addedToDatabase() {
-        // Test that addDataToDatabase is called when dataToUpdate is non-empty
-        mManager.mDataToProcess.dataToUpdate.add(getFakeRaw());
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        cursor.moveToPosition(0);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo(updatedTitle);
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo(normalizedTitle);
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo(updatedSummaryOn);
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo(normalizedSummaryOn);
-        // Summary Off
-        assertThat(cursor.getString(6)).isEqualTo(updatedSummaryOff);
-        // Summary off normalized
-        assertThat(cursor.getString(7)).isEqualTo(normalizedSummaryOff);
-        // Entries
-        assertThat(cursor.getString(8)).isEqualTo(entries);
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo(spaceDelimittedKeywords);
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo(screenTitle);
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(iconResId);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isNotNull();
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testUpdateDataInDatabase_enabledResultsAreNonIndexable_becomeDisabled() {
-        // Both results are enabled, and then TITLE_ONE gets disabled.
-        final boolean enabled = true;
-        insertSpecialCase(TITLE_ONE, enabled, KEY_ONE);
-        insertSpecialCase(TITLE_TWO, enabled, KEY_TWO);
-        Map<String, Set<String>> niks = new ArrayMap<>();
-        Set<String> keys = new HashSet<>();
-        keys.add(KEY_ONE);
-        niks.put(targetPackage, keys);
-
-        mManager.updateDataInDatabase(mDb, niks);
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
-        cursor.moveToPosition(0);
-
-        assertThat(cursor.getString(2)).isEqualTo(TITLE_ONE);
-    }
-
-    @Test
-    public void testUpdateDataInDatabase_disabledResultsAreIndexable_becomeEnabled() {
-        // Both results are initially disabled, and then TITLE_TWO gets enabled.
-        final boolean enabled = false;
-        insertSpecialCase(TITLE_ONE, enabled, KEY_ONE);
-        insertSpecialCase(TITLE_TWO, enabled, KEY_TWO);
-        Map<String, Set<String>> niks = new ArrayMap<>();
-        Set<String> keys = new HashSet<>();
-        keys.add(KEY_ONE);
-        niks.put(targetPackage, keys);
-
-        mManager.updateDataInDatabase(mDb, niks);
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        cursor.moveToPosition(0);
-
-        assertThat(cursor.getString(2)).isEqualTo(TITLE_TWO);
-    }
-
-    @Test
-    public void testEmptyNonIndexableKeys_emptyDataKeyResources_addedToDatabase() {
-        insertSpecialCase(TITLE_ONE, true /* enabled */, null /* dataReferenceKey */);
-
-        mManager.updateDatabase(false, localeStr);
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        cursor.moveToPosition(0);
-        assertThat(cursor.getCount()).isEqualTo(1);
-        assertThat(cursor.getString(2)).isEqualTo(TITLE_ONE);
-    }
-
-    @Test
-    public void testUpdateAsyncTask_onPostExecute_performsCallback() {
-        IndexingCallback callback = mock(IndexingCallback.class);
-
-        DatabaseIndexingManager.IndexingTask task = mManager.new IndexingTask(callback);
-        task.execute();
-
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(callback).onIndexingFinished();
-    }
-
-    @Test
-    public void testUpdateAsyncTask_onPostExecute_setsIndexingComplete() {
-        SearchFeatureProviderImpl provider = new SearchFeatureProviderImpl();
-        DatabaseIndexingManager manager = spy(provider.getIndexingManager(mContext));
-        DatabaseIndexingManager.IndexingTask task = manager.new IndexingTask(null);
-        doNothing().when(manager).performIndexing();
-
-        task.execute();
-        Robolectric.flushForegroundThreadScheduler();
-
-        assertThat(provider.isIndexingComplete(mContext)).isTrue();
-    }
-
-    // Util functions
-
-    private void skipFullIndex(List<ResolveInfo> providers) {
-        IndexDatabaseHelper.setLocaleIndexed(mContext, Locale.getDefault().toString());
-        IndexDatabaseHelper.setBuildIndexed(mContext, Build.FINGERPRINT);
-        IndexDatabaseHelper.setProvidersIndexed(mContext,
-                IndexDatabaseHelper.buildProviderVersionedNames(providers));
-    }
-
-    private SearchIndexableRaw getFakeRaw() {
-        return getFakeRaw(localeStr);
-    }
-
-    private SearchIndexableRaw getFakeRaw(String localeStr) {
-        SearchIndexableRaw data = new SearchIndexableRaw(mContext);
-        data.locale = new Locale(localeStr);
-        data.rank = rank;
-        data.title = title;
-        data.summaryOn = summaryOn;
-        data.summaryOff = summaryOff;
-        data.entries = entries;
-        data.keywords = keywords;
-        data.screenTitle = screenTitle;
-        data.className = className;
-        data.packageName = packageName;
-        data.iconResId = iconResId;
-        data.intentAction = action;
-        data.intentTargetPackage = targetPackage;
-        data.intentTargetClass = targetClass;
-        data.key = key;
-        data.userId = userId;
-        data.enabled = enabled;
-        return data;
-    }
-
-    private SearchIndexableResource getFakeResource(int xml) {
-        SearchIndexableResource sir = new SearchIndexableResource(mContext);
-        sir.rank = rank;
-        sir.xmlResId = xml;
-        sir.className = className;
-        sir.packageName = packageName;
-        sir.iconResId = iconResId;
-        sir.intentAction = action;
-        sir.intentTargetPackage = targetPackage;
-        sir.intentTargetClass = targetClass;
-        sir.enabled = enabled;
-        return sir;
-    }
-
-    private Map<String, Set<String>> getNonIndexableKeys(String[] keys) {
-        Map<String, Set<String>> niks = new HashMap<>();
-        Set<String> keysList = new HashSet<>();
-        keysList.addAll(Arrays.asList(keys));
-        niks.put(packageName, keysList);
-        return niks;
-    }
-
-    private List<ResolveInfo> getDummyResolveInfo() {
-        List<ResolveInfo> infoList = new ArrayList<>();
-        ResolveInfo info = new ResolveInfo();
-        info.providerInfo = new ProviderInfo();
-        info.providerInfo.exported = true;
-        info.providerInfo.authority = AUTHORITY_ONE;
-        info.providerInfo.packageName = PACKAGE_ONE;
-        info.providerInfo.applicationInfo = new ApplicationInfo();
-        infoList.add(info);
-
-        return infoList;
-    }
-
-    // TODO move this method and its counterpart in CursorToSearchResultConverterTest into
-    // a util class with public fields to assert values.
-    private Cursor getDummyCursor() {
-        MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
-        final String BLANK = "";
-
-        ArrayList<String> item =
-                new ArrayList<>(INDEXABLES_RAW_COLUMNS.length);
-        item.add("42"); // Rank
-        item.add(TITLE_ONE); // Title
-        item.add(BLANK); // Summary on
-        item.add(BLANK); // summary off
-        item.add(BLANK); // entries
-        item.add(BLANK); // keywords
-        item.add(BLANK); // screen title
-        item.add(BLANK); // classname
-        item.add("123"); // Icon
-        item.add(BLANK); // Intent action
-        item.add(BLANK); // target package
-        item.add(BLANK); // target class
-        item.add(KEY_ONE); // Key
-        item.add("-1"); // userId
-        cursor.addRow(item);
-
-        return cursor;
-    }
-
-    private void insertSpecialCase(String specialCase, boolean enabled, String key) {
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, specialCase.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, localeStr);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, "");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, targetPackage);
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, enabled);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, key);
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private class DummyProvider extends ContentProvider {
-
-        @Override
-        public boolean onCreate() {
-            return false;
-        }
-
-        @Override
-        public Cursor query(@NonNull Uri uri, @Nullable String[] projection,
-                @Nullable String selection, @Nullable String[] selectionArgs,
-                @Nullable String sortOrder) {
-            if (uri.toString().contains("xml")) {
-                return null;
-            }
-            return getDummyCursor();
-        }
-
-        @Override
-        public String getType(@NonNull Uri uri) {
-            return null;
-        }
-
-        @Override
-        public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
-            return null;
-        }
-
-        @Override
-        public int delete(@NonNull Uri uri, @Nullable String selection,
-                @Nullable String[] selectionArgs) {
-            return 0;
-        }
-
-        @Override
-        public int update(@NonNull Uri uri, @Nullable ContentValues values,
-                @Nullable String selection, @Nullable String[] selectionArgs) {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
deleted file mode 100644
index 3bfa93665bcfa49eed049bd116c1d0d3995d17cf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.util.ArrayMap;
-
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.Map;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DatabaseIndexingUtilsTest {
-
-    private Context mContext;
-    @Mock
-    private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void testGetPreferenceControllerUriMap_BadClassName_ReturnsNull() {
-        Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap("dummy", mContext);
-        assertThat(map).isNull();
-    }
-
-    @Test
-    public void testGetPreferenceControllerUriMap_NullContext_ReturnsNull() {
-        Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap("dummy", null);
-        assertThat(map).isNull();
-    }
-
-    @Test
-    public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
-        final String className = "com.android.settings.system.SystemDashboardFragment";
-        final Map<String, PreferenceControllerMixin> map =
-                DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
-        assertThat(map.get("system_update_settings"))
-                .isInstanceOf(SystemUpdatePreferenceController.class);
-    }
-
-    @Test
-    public void testGetPayloadFromMap_NullMap_ReturnsNull() {
-        ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(null, "");
-        assertThat(payload).isNull();
-    }
-
-    @Test
-    public void testGetPayloadFromMap_MatchingKey_ReturnsPayload() {
-        final String key = "key";
-        PreferenceControllerMixin prefController = new PreferenceControllerMixin() {
-            @Override
-            public ResultPayload getResultPayload() {
-                return new ResultPayload(null);
-            }
-        };
-        ArrayMap<String, PreferenceControllerMixin> map = new ArrayMap<>();
-        map.put(key, prefController);
-
-        ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(map, key);
-        assertThat(payload).isInstanceOf(ResultPayload.class);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
deleted file mode 100644
index 90f6e87907e9056016b98bbd09dd9f969a6aa39a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DatabaseResultLoaderTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    private Context mContext;
-
-    SQLiteDatabase mDb;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        FakeFeatureFactory.setupForTest(mMockContext);
-        FakeFeatureFactory factory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-        when(factory.searchFeatureProvider.getSiteMapManager())
-                .thenReturn(mSiteMapManager);
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        setUpDb();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void testMatchTitle() {
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-        verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void testMatchSummary() {
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "summary",
-                mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testMatchKeywords() {
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "keywords",
-                mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testMatchEntries() {
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "entries",
-                mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testSpecialCaseWord_matchesNonPrefix() {
-        insertSpecialCase("Data usage");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordNoDash() {
-        insertSpecialCase("wi-fi calling");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithDash() {
-        insertSpecialCase("priorités seulment");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorités",
-                mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithoutDash() {
-        insertSpecialCase("priorités seulment");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorites",
-                mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() {
-        insertSpecialCase("wi-fi calling");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi calling",
-                mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_matchesPrefixOfEntry() {
-        insertSpecialCase("Photos");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() {
-        insertSpecialCase("Photos");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "hot", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() {
-        insertSpecialCase("Apps Notifications");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() {
-        insertSpecialCase("Apps Notifications");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry() {
-        insertSpecialCase("Apps Notifications");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pp", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry() {
-        insertSpecialCase("Apps Notifications");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "tion", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() {
-        insertSpecialCase("Apps & Notifications");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry() {
-        insertSpecialCase("Apps & Notifications");
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testResultMatchedByMultipleQueries_duplicatesRemoved() {
-        String key = "durr";
-        insertSameValueAllFieldsCase(key);
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, key, null);
-
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseTwoWords_multipleResults() {
-        final String caseOne = "Apple pear";
-        final String caseTwo = "Banana apple";
-        insertSpecialCase(caseOne);
-        insertSpecialCase(caseTwo);
-        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", null);
-        Set<? extends SearchResult> results = loader.loadInBackground();
-        Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList(caseOne, caseTwo));
-        Set<CharSequence> actualTitles = new HashSet<>();
-        for (SearchResult result : results) {
-            actualTitles.add(result.title);
-        }
-        assertThat(actualTitles).isEqualTo(expectedTitles);
-    }
-
-    private void insertSpecialCase(String specialCase) {
-        String normalized = DatabaseIndexingUtils.normalizeHyphen(specialCase);
-        normalized = DatabaseIndexingUtils.normalizeString(normalized);
-        final ResultPayload payload = new ResultPayload(new Intent());
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, normalized.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, normalized);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, normalized.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private void setUpDb() {
-        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(new Intent()));
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "alpha title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "alpha entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "alpha keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_0");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "bravo title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "bravo entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "bravo keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_1");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 3);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "charlie title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "charlie entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "charlie keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_2");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private void insertSameValueAllFieldsCase(String key) {
-        final ResultPayload payload = new ResultPayload(new Intent());
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, key.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, key);
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, key);
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, key);
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, key);
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, key.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
deleted file mode 100644
index a0d316363adda3075f3e85e69789c8283e5e2d09..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.DatabaseIndexingManager.DatabaseRow;
-import com.android.settings.search.DatabaseIndexingManager.DatabaseRow.Builder;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DatabaseRowTest {
-    private Builder mBuilder;
-
-    private static final String LOCALE = "locale";
-    private static final String UPDATED_TITLE = "updated title";
-    private static final String NORMALIZED_TITLE = "normal title";
-    private static final String UPDATED_SUMMARY_ON = "updated summary on";
-    private static final String NORMALIZED_SUMMARY_ON = "normalized summary on";
-    private static final String UPDATED_SUMMARY_OFF = "updated summary off";
-    private static final String NORMALIZED_SUMMARY_OFF = "normalized summary off";
-    private static final String ENTRIES = "entries";
-    private static final String CLASS_NAME = "class name";
-    private static final String SCREEN_TITLE = "screen title";
-    private static final int ICON_RES_ID = 0xff;
-    private static final int RANK = 1;
-    private static final String SPACE_DELIMITED_KEYWORDS = "keywords";
-    private static final String INTENT_ACTION = "intent action";
-    private static final String INTENT_TARGET_PACKAGE = "target package";
-    private static final String INTENT_TARGET_CLASS = "target class";
-    private static final boolean ENABLED = true;
-    private static final String KEY = "key";
-    private static final int USER_ID = 1;
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mBuilder = createBuilder();
-    }
-
-    @Test
-    public void testFullRowBuild_nonNull() {
-        DatabaseRow row = generateRow();
-        assertThat(row).isNotNull();
-    }
-
-    @Test
-    public void testPrimitivesBuild_noDataLoss() {
-        DatabaseRow row = generateRow();
-
-        assertThat(row.locale).isEqualTo(LOCALE);
-        assertThat(row.updatedTitle).isEqualTo(UPDATED_TITLE);
-        assertThat(row.normalizedTitle).isEqualTo(NORMALIZED_TITLE);
-        assertThat(row.updatedSummaryOn).isEqualTo(UPDATED_SUMMARY_ON);
-        assertThat(row.normalizedSummaryOn).isEqualTo(NORMALIZED_SUMMARY_ON);
-        assertThat(row.updatedSummaryOff).isEqualTo(UPDATED_SUMMARY_OFF);
-        assertThat(row.normalizedSummaryOff).isEqualTo(NORMALIZED_SUMMARY_OFF);
-        assertThat(row.entries).isEqualTo(ENTRIES);
-        assertThat(row.className).isEqualTo(CLASS_NAME);
-        assertThat(row.screenTitle).isEqualTo(SCREEN_TITLE);
-        assertThat(row.iconResId).isEqualTo(ICON_RES_ID);
-        assertThat(row.rank).isEqualTo(RANK);
-        assertThat(row.spaceDelimitedKeywords).isEqualTo(SPACE_DELIMITED_KEYWORDS);
-        assertThat(row.intentAction).isEqualTo(INTENT_ACTION);
-        assertThat(row.intentTargetClass).isEqualTo(INTENT_TARGET_CLASS);
-        assertThat(row.intentTargetPackage).isEqualTo(INTENT_TARGET_PACKAGE);
-        assertThat(row.enabled).isEqualTo(ENABLED);
-        assertThat(row.userId).isEqualTo(USER_ID);
-        assertThat(row.key).isEqualTo(KEY);
-        assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INTENT);
-        assertThat(row.payload).isNotNull();
-    }
-
-    @Test
-    public void testGenericIntent_addedToPayload() {
-        final DatabaseRow row = generateRow();
-        final ResultPayload payload = ResultPayloadUtils.unmarshall(row.payload,
-                ResultPayload.CREATOR);
-        final ComponentName name = payload.getIntent().getComponent();
-        assertThat(name.getClassName()).isEqualTo(INTENT_TARGET_CLASS);
-        assertThat(name.getPackageName()).isEqualTo(INTENT_TARGET_PACKAGE);
-    }
-
-    @Test
-    public void testRowWithInlinePayload_genericPayloadNotAdded() {
-        final String URI = "test uri";
-        final InlineSwitchPayload payload = new InlineSwitchPayload(URI, 0 /* mSettingSource */,
-                1 /* onValue */, null /* intent */, true /* isDeviceSupported */, 1 /* default */);
-        mBuilder.setPayload(payload);
-        final DatabaseRow row = generateRow();
-        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
-                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
-
-        assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INLINE_SWITCH);
-        assertThat(unmarshalledPayload.mSettingKey).isEqualTo(URI);
-    }
-
-    @Test
-    public void testRowWithInlinePayload_intentAddedToInlinePayload() {
-        final String URI = "test uri";
-        final ComponentName component = new ComponentName(INTENT_TARGET_PACKAGE,
-                INTENT_TARGET_CLASS);
-        final Intent intent = new Intent();
-        intent.setComponent(component);
-
-        final InlineSwitchPayload payload = new InlineSwitchPayload(URI, 0 /* mSettingSource */,
-                1 /* onValue */, intent, true /* isDeviceSupported */, 1 /* default */);
-        mBuilder.setPayload(payload);
-        final DatabaseRow row = generateRow();
-        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
-                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
-        final ComponentName name = unmarshalledPayload.getIntent().getComponent();
-
-        assertThat(name.getClassName()).isEqualTo(INTENT_TARGET_CLASS);
-        assertThat(name.getPackageName()).isEqualTo(INTENT_TARGET_PACKAGE);
-    }
-
-
-    private DatabaseRow generateRow() {
-        return mBuilder.build(mContext);
-    }
-
-    private DatabaseRow.Builder createBuilder() {
-        mBuilder = new DatabaseRow.Builder();
-        mBuilder.setLocale(LOCALE)
-                .setUpdatedTitle(UPDATED_TITLE)
-                .setNormalizedTitle(NORMALIZED_TITLE)
-                .setUpdatedSummaryOn(UPDATED_SUMMARY_ON)
-                .setNormalizedSummaryOn(NORMALIZED_SUMMARY_ON)
-                .setUpdatedSummaryOff(UPDATED_SUMMARY_OFF)
-                .setNormalizedSummaryOff(NORMALIZED_SUMMARY_OFF)
-                .setEntries(ENTRIES)
-                .setClassName(CLASS_NAME)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIconResId(ICON_RES_ID)
-                .setRank(RANK)
-                .setSpaceDelimitedKeywords(SPACE_DELIMITED_KEYWORDS)
-                .setIntentAction(INTENT_ACTION)
-                .setIntentTargetPackage(INTENT_TARGET_PACKAGE)
-                .setIntentTargetClass(INTENT_TARGET_CLASS)
-                .setEnabled(ENABLED)
-                .setKey(KEY)
-                .setUserId(USER_ID);
-        return mBuilder;
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
deleted file mode 100644
index b2a155319a959c17d42cf5240a3c492dfd5cae3a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import java.util.List;
-
-public class FakeIndexProvider implements Indexable {
-
-    public static final String KEY = "TestKey";
-
-    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    return null;
-                }
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    List<String> result = super.getNonIndexableKeys(context);
-                    result.add(KEY);
-                    return result;
-                }
-
-                @Override
-                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
-                    return null;
-                }
-            };
-
-}
diff --git a/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
deleted file mode 100644
index bee8d93c1be94ee46aa845279f19d4b998e228e9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.android.settings.search;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Parcel;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InlineListPayloadTest {
-
-    private static final String DUMMY_SETTING = "inline_list_key";
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void testConstructor_DataRetained() {
-        final String uri = "test.com";
-        final int type = ResultPayload.PayloadType.INLINE_LIST;
-        final int source = ResultPayload.SettingsSource.SYSTEM;
-        final String intentKey = "key";
-        final String intentVal = "value";
-        final Intent intent = new Intent();
-        intent.putExtra(intentKey, intentVal);
-
-        InlineListPayload payload = new InlineListPayload(uri, source,
-                intent, true /* isAvailable */, 1 /* numOptions */, 1 /* default */);
-
-        final Intent retainedIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
-        assertThat(payload.getType()).isEqualTo(type);
-        assertThat(payload.mSettingSource).isEqualTo(source);
-        assertThat(payload.getAvailability()).isEqualTo(ResultPayload.Availability.AVAILABLE);
-        assertThat(retainedIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
-    }
-
-    @Test
-    public void testParcelConstructor_DataRetained() {
-        String uri = "test.com";
-        int type = ResultPayload.PayloadType.INLINE_LIST;
-        int source = ResultPayload.SettingsSource.SYSTEM;
-        final String intentKey = "key";
-        final String intentVal = "value";
-        final Intent intent = new Intent();
-        intent.putExtra(intentKey, intentVal);
-
-        Parcel parcel = Parcel.obtain();
-        parcel.writeParcelable(intent, 0);
-        parcel.writeString(uri);
-        parcel.writeInt(source);
-        parcel.writeInt(InlineSwitchPayload.TRUE);
-        parcel.writeInt(InlineSwitchPayload.TRUE);
-        parcel.setDataPosition(0);
-
-        InlineListPayload payload = InlineListPayload
-                .CREATOR.createFromParcel(parcel);
-
-        final Intent builtIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
-        assertThat(payload.getType()).isEqualTo(type);
-        assertThat(payload.mSettingSource).isEqualTo(source);
-        assertThat(payload.getAvailability()).isEqualTo(ResultPayload.Availability.AVAILABLE);
-        assertThat(builtIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
-    }
-
-    @Test
-    public void testInputStandardization_inputDoesntChange() {
-        InlineListPayload payload = new InlineListPayload(DUMMY_SETTING,
-                ResultPayload.SettingsSource.SYSTEM, null /* intent */, true /* isDeviceSupport */,
-                3 /* numOptions */, 0 /* default */);
-        int input = 2;
-
-        assertThat(payload.standardizeInput(input)).isEqualTo(input);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetSystem_negativeValue_throwsError() {
-        InlineListPayload payload = new InlineListPayload(DUMMY_SETTING,
-                ResultPayload.SettingsSource.SYSTEM, null /* intent */, true /* isDeviceSupport */,
-                3 /* numOptions */, 0 /* default */);
-
-        payload.setValue(mContext, -1);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetSystem_exceedsMaxValue_throwsError() {
-        int maxOptions = 4;
-        InlineListPayload payload = new InlineListPayload(DUMMY_SETTING,
-                ResultPayload.SettingsSource.SYSTEM, null /* intent */, true /* isDeviceSupport */,
-                maxOptions /* numOptions */, 0 /* default */);
-
-        payload.setValue(mContext, maxOptions + 1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
deleted file mode 100644
index 1747cca5bba3047b593bf0f2faac52ad9d6345c9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.android.settings.search;
-
-import android.content.Context;
-import android.content.ContentResolver;
-import android.content.Intent;
-import android.os.Parcel;
-import android.provider.Settings;
-import com.android.settings.TestConfig;
-import com.android.settings.search.ResultPayload.SettingsSource;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InlinePayloadTest {
-
-    private Context mContext;
-
-    private final String KEY = "key";
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void testGetSecure_returnsSecureSetting() {
-        InlinePayload payload = getDummyPayload(SettingsSource.SECURE);
-        int currentValue = 2;
-        Settings.Secure.putInt(mContext.getContentResolver(), KEY, currentValue);
-
-        int newValue = payload.getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-
-    @Test
-    public void testGetGlobal_returnsGlobalSetting() {
-        InlinePayload payload = getDummyPayload(SettingsSource.GLOBAL);
-        int currentValue = 2;
-        Settings.Global.putInt(mContext.getContentResolver(), KEY, currentValue);
-
-        int newValue = payload.getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-
-    @Test
-    public void testGetSystem_returnsSystemSetting() {
-        InlinePayload payload = getDummyPayload(SettingsSource.SYSTEM);
-        int currentValue = 2;
-        Settings.System.putInt(mContext.getContentResolver(), KEY, currentValue);
-
-        int newValue = payload.getValue(mContext);
-
-        assertThat(newValue).isEqualTo(currentValue);
-    }
-
-    @Test
-    public void testSetSecure_updatesSecureSetting() {
-        InlinePayload payload = getDummyPayload(SettingsSource.SECURE);
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, KEY, 0);
-
-        payload.setValue(mContext, newValue);
-        int updatedValue = Settings.System.getInt(resolver, KEY, -1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    public void testSetGlobal_updatesGlobalSetting() {
-        InlinePayload payload = getDummyPayload(SettingsSource.GLOBAL);
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Global.putInt(resolver, KEY, 0);
-
-        payload.setValue(mContext, newValue);
-        int updatedValue = Settings.Global.getInt(resolver, KEY, -1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    @Test
-    public void testSetSystem_updatesSystemSetting() {
-        InlinePayload payload = getDummyPayload(SettingsSource.SECURE);
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
-
-        payload.setValue(mContext, newValue);
-        int updatedValue = Settings.System.getInt(resolver, KEY, -1);
-
-        assertThat(updatedValue).isEqualTo(newValue);
-    }
-
-    private InlinePayload getDummyPayload(int source) {
-        return new ConcreteInlinePayload(KEY, source, null /* intent */,
-                true /* isDeviceSupported */);
-    }
-
-    class ConcreteInlinePayload extends InlinePayload {
-
-        public ConcreteInlinePayload(String key, @SettingsSource int source, Intent intent,
-                boolean isDeviceSupported) {
-            super(key, source, intent, isDeviceSupported, 0 /* defaultValue */);
-        }
-
-        @Override
-        public int getType() {
-            return 0;
-        }
-
-        @Override
-        protected int standardizeInput(int input) throws IllegalArgumentException {
-            return input;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
deleted file mode 100644
index b067ea689e3028c29f14ba7f835174a3d60027da..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.ContentResolver;
-import android.content.Intent;
-import android.os.Parcel;
-import android.provider.Settings;
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.ResultPayload.Availability;
-import com.android.settings.search.ResultPayload.SettingsSource;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InlineSwitchPayloadTest {
-
-    private static final String DUMMY_SETTING = "inline_test";
-    private static final int STANDARD_ON = 1;
-    private static final int FLIPPED_ON = 0;
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void testConstructor_DataRetained() {
-        final String uri = "test.com";
-        final int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        final int source = SettingsSource.SECURE;
-        final String intentKey = "key";
-        final String intentVal = "value";
-        final Intent intent = new Intent();
-        intent.putExtra(intentKey, intentVal);
-
-        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1, intent, true,
-                1 /* default */);
-        final Intent retainedIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
-        assertThat(payload.getType()).isEqualTo(type);
-        assertThat(payload.mSettingSource).isEqualTo(source);
-        assertThat(payload.isStandard()).isTrue();
-        assertThat(payload.getAvailability()).isEqualTo(ResultPayload.Availability.AVAILABLE);
-        assertThat(retainedIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
-    }
-
-    @Test
-    public void testParcelConstructor_DataRetained() {
-        String uri = "test.com";
-        int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        int source = SettingsSource.SECURE;
-        final String intentKey = "key";
-        final String intentVal = "value";
-        final Intent intent = new Intent();
-        intent.putExtra(intentKey, intentVal);
-        Parcel parcel = Parcel.obtain();
-        parcel.writeParcelable(intent, 0);
-        parcel.writeString(uri);
-        parcel.writeInt(source);
-        parcel.writeInt(InlineSwitchPayload.TRUE);
-        parcel.writeInt(InlineSwitchPayload.TRUE);
-        parcel.writeInt(InlineSwitchPayload.TRUE);
-        parcel.setDataPosition(0);
-
-        InlineSwitchPayload payload = InlineSwitchPayload.CREATOR.createFromParcel(parcel);
-
-        final Intent builtIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
-        assertThat(payload.getType()).isEqualTo(type);
-        assertThat(payload.mSettingSource).isEqualTo(source);
-        assertThat(payload.isStandard()).isTrue();
-        assertThat(payload.getAvailability()).isEqualTo(Availability.AVAILABLE);
-        assertThat(builtIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
-    }
-
-    @Test
-    public void testGetSystem_flippedSetting_returnsFlippedValue() {
-        // Stores 1s as 0s, and vis versa
-        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
-                FLIPPED_ON, null /* intent */, true, 1 /* default */);
-        int currentValue = 1;
-        Settings.System.putInt(mContext.getContentResolver(), DUMMY_SETTING, currentValue);
-
-        int newValue = payload.getValue(mContext);
-
-        assertThat(newValue).isEqualTo(1 - currentValue);
-    }
-
-    @Test
-    public void testSetSystem_flippedSetting_updatesToFlippedValue() {
-        // Stores 1s as 0s, and vis versa
-        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
-                FLIPPED_ON, null /* intent */, true, 1 /* default */);
-        int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, newValue);
-
-        payload.setValue(mContext, newValue);
-        int updatedValue = Settings.System.getInt(resolver, DUMMY_SETTING, -1);
-
-        assertThat(updatedValue).isEqualTo(1 - newValue);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetSystem_negativeValue_ThrowsError() {
-        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
-                STANDARD_ON, null /* intent */, true, 1 /* default */);
-
-        payload.setValue(mContext, -1);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetSystem_highValue_ThrowsError() {
-        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
-                STANDARD_ON, null /* intent */, true, 1 /* default */);
-
-        payload.setValue(mContext, 2);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
deleted file mode 100644
index 86aee6f6fa01c9d716bf8969d443cf12ee1aee3e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InlineSwitchViewHolderTest {
-
-    private static final String TITLE = "title";
-    private static final String SUMMARY = "summary";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private SearchFragment mFragment;
-
-    @Mock
-    private InlineSwitchPayload mPayload;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private InlineSwitchViewHolder mHolder;
-    private Drawable mIcon;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final Context context = RuntimeEnvironment.application;
-        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        mHolder = new InlineSwitchViewHolder(
-                LayoutInflater.from(context).inflate(R.layout.search_inline_switch_item, null),
-                context);
-        ReflectionHelpers.setField(mHolder, "mMetricsFeatureProvider",
-                mFeatureFactory.metricsFeatureProvider);
-    }
-
-    @Test
-    public void testConstructor_MembersNotNull() {
-        assertThat(mHolder.titleView).isNotNull();
-        assertThat(mHolder.summaryView).isNotNull();
-        assertThat(mHolder.iconView).isNotNull();
-        assertThat(mHolder.switchView).isNotNull();
-    }
-
-    @Test
-    public void testBindViewElements_AllUpdated() {
-        when(mPayload.getValue(any(Context.class))).thenReturn(1);
-        SearchResult result = getSearchResult();
-        mHolder.onBind(mFragment, result);
-        // Precondition: switch is on.
-        assertThat(mHolder.switchView.isChecked()).isTrue();
-
-        mHolder.switchView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
-        assertThat(mHolder.switchView.isChecked()).isFalse();
-    }
-
-    private SearchResult getSearchResult() {
-        SearchResult.Builder builder = new SearchResult.Builder();
-
-        builder.setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setRank(1)
-                .setPayload(new InlineSwitchPayload("" /* uri */, 0 /* mSettingSource */,
-                        1 /* onValue */, null /* intent */, true /* isDeviceSupported */,
-                        1 /* default */))
-                .addBreadcrumbs(new ArrayList<>())
-                .setIcon(mIcon)
-                .setPayload(mPayload)
-                .setStableId(TITLE.hashCode());
-
-        return builder.build();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java
deleted file mode 100644
index a955af179ff12f64200879c60bab0a1e97f74654..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-import static com.android.settings.search.InputDeviceResultLoader.PHYSICAL_KEYBOARD_FRAGMENT;
-import static com.android.settings.search.InputDeviceResultLoader.VIRTUAL_KEYBOARD_FRAGMENT;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.hardware.input.InputManager;
-import android.view.InputDevice;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowInputDevice;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowInputDevice.class
-        })
-public class InputDeviceResultLoaderTest {
-
-    private static final String QUERY = "test_query";
-    private static final List<String> PHYSICAL_KEYBOARD_BREADCRUMB;
-    private static final List<String> VIRTUAL_KEYBOARD_BREADCRUMB;
-
-    static {
-        PHYSICAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
-        VIRTUAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
-        PHYSICAL_KEYBOARD_BREADCRUMB.add("Settings");
-        PHYSICAL_KEYBOARD_BREADCRUMB.add("physical keyboard");
-        VIRTUAL_KEYBOARD_BREADCRUMB.add("Settings");
-        VIRTUAL_KEYBOARD_BREADCRUMB.add("virtual keyboard");
-    }
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    @Mock
-    private InputManager mInputManager;
-    @Mock
-    private InputMethodManager mImm;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private InputDeviceResultLoader mLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(Context.INPUT_SERVICE))
-                .thenReturn(mInputManager);
-        when(mContext.getSystemService(INPUT_METHOD_SERVICE))
-                .thenReturn(mImm);
-        when(mContext.getPackageManager())
-                .thenReturn(mPackageManager);
-        when(mContext.getString(anyInt()))
-                .thenAnswer(invocation -> RuntimeEnvironment.application.getString(
-                        (Integer) invocation.getArguments()[0]));
-        mLoader = new InputDeviceResultLoader(mContext, QUERY, mSiteMapManager);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowInputDevice.reset();
-    }
-
-    @Test
-    public void query_noKeyboard_shouldNotReturnAnything() {
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    @Test
-    public void query_hasPhysicalKeyboard_match() {
-        addPhysicalKeyboard(QUERY);
-        when(mSiteMapManager.buildBreadCrumb(mContext, PHYSICAL_KEYBOARD_FRAGMENT,
-                RuntimeEnvironment.application.getString(R.string.physical_keyboard_title)))
-                .thenReturn(PHYSICAL_KEYBOARD_BREADCRUMB);
-
-        final List<SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
-
-        assertThat(results).hasSize(1);
-        assertThat(results.get(0).title).isEqualTo(QUERY);
-        assertThat(results.get(0).breadcrumbs)
-                .containsExactlyElementsIn(PHYSICAL_KEYBOARD_BREADCRUMB);
-    }
-
-    @Test
-    public void query_hasVirtualKeyboard_match() {
-        addVirtualKeyboard(QUERY);
-        when(mSiteMapManager.buildBreadCrumb(mContext, VIRTUAL_KEYBOARD_FRAGMENT,
-                RuntimeEnvironment.application.getString(R.string.add_virtual_keyboard)))
-                .thenReturn(VIRTUAL_KEYBOARD_BREADCRUMB);
-
-        final List<SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
-        assertThat(results).hasSize(1);
-        assertThat(results.get(0).title).isEqualTo(QUERY);
-        assertThat(results.get(0).breadcrumbs)
-                .containsExactlyElementsIn(VIRTUAL_KEYBOARD_BREADCRUMB);
-    }
-
-    @Test
-    public void query_hasPhysicalVirtualKeyboard_doNotMatch() {
-        addPhysicalKeyboard("abc");
-        addVirtualKeyboard("def");
-
-        assertThat(mLoader.loadInBackground()).isEmpty();
-        verifyZeroInteractions(mSiteMapManager);
-    }
-
-    private void addPhysicalKeyboard(String name) {
-        final InputDevice device = mock(InputDevice.class);
-        when(device.isVirtual()).thenReturn(false);
-        when(device.isFullKeyboard()).thenReturn(true);
-        when(device.getName()).thenReturn(name);
-        ShadowInputDevice.sDeviceIds = new int[]{0};
-        ShadowInputDevice.addDevice(0, device);
-    }
-
-    private void addVirtualKeyboard(String name) {
-        final List<InputMethodInfo> imis = new ArrayList<>();
-        final InputMethodInfo info = mock(InputMethodInfo.class);
-        imis.add(info);
-        when(info.getServiceInfo()).thenReturn(new ServiceInfo());
-        when(info.loadLabel(mPackageManager)).thenReturn(name);
-        info.getServiceInfo().packageName = "pkg";
-        info.getServiceInfo().name = "class";
-        when(mImm.getInputMethodList()).thenReturn(imis);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
deleted file mode 100644
index 19854fcf09e0ed10f3e25013853af92e02e2d447..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
-import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.ApplicationTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InstalledAppResultLoaderTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PackageManagerWrapper mPackageManagerWrapper;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-
-    private InstalledAppResultLoader mLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        final FakeFeatureFactory factory = FakeFeatureFactory.setupForTest(mContext);
-        when(factory.searchFeatureProvider.getSiteMapManager())
-                .thenReturn(mSiteMapManager);
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getString(R.string.applications_settings))
-                .thenReturn("app");
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app2", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app3", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app4", 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app", 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "appBuffer", 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-    }
-
-    @Test
-    public void query_noMatchingQuery_shouldReturnEmptyResult() {
-        final String query = "abc";
-
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnNonSystemApps() {
-        final String query = "app";
-
-        mLoader = spy(new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager));
-        when(mLoader.getContext()).thenReturn(mContext);
-        when(mSiteMapManager.buildBreadCrumb(eq(mContext), anyString(), anyString()))
-                .thenReturn(Arrays.asList(new String[]{"123"}));
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(3);
-        verify(mSiteMapManager)
-                .buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnSystemAppUpdates() {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_UPDATED_SYSTEM_APP,
-                                0 /* targetSdkVersion */)));
-        final String query = "app";
-
-        mLoader = spy(new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager));
-        when(mLoader.getContext()).thenReturn(mContext);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-        verify(mSiteMapManager)
-                .buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnSystemAppIfLaunchable() {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        final List<ResolveInfo> list = mock(List.class);
-        when(list.size()).thenReturn(1);
-        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
-                any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(list);
-
-        final String query = "app";
-
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnSystemAppIfHomeApp() {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
-                any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(null);
-
-        when(mPackageManagerWrapper.getHomeActivities(anyList())).thenAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                final List<ResolveInfo> list = (List<ResolveInfo>) invocation.getArguments()[0];
-                final ResolveInfo info = new ResolveInfo();
-                info.activityInfo = new ActivityInfo();
-                info.activityInfo.packageName = "app1";
-                list.add(info);
-                return null;
-            }
-        });
-
-        final String query = "app";
-
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_matchingQuery_shouldNotReturnSystemAppIfNotLaunchable() {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
-                any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(null);
-
-        final String query = "app";
-
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground()).isEmpty();
-        verify(mSiteMapManager, never())
-                .buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void query_matchingQuery_multipleResults() {
-        final String query = "app";
-
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-        final Set<? extends SearchResult> results = mLoader.loadInBackground();
-
-        Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList("app4", "app", "appBuffer"));
-        Set<CharSequence> actualTitles = new HashSet<>();
-        for (SearchResult result : results) {
-            actualTitles.add(result.title);
-        }
-        assertThat(actualTitles).isEqualTo(expectedTitles);
-    }
-
-    @Test
-    public void query_normalWord_MatchPrefix() {
-        final String query = "ba";
-        final String packageName = "Bananas";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_CapitalCase_DoestMatchSecondWord() {
-        final String query = "Apples";
-        final String packageName = "BananasApples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void query_TwoWords_MatchesFirstWord() {
-        final String query = "Banana";
-        final String packageName = "Bananas Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_TwoWords_MatchesSecondWord() {
-        final String query = "Apple";
-        final String packageName = "Bananas Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_ThreeWords_MatchesThirdWord() {
-        final String query = "Pear";
-        final String packageName = "Bananas Apples Pears";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_DoubleSpacedWords_MatchesSecondWord() {
-        final String query = "Apple";
-        final String packageName = "Bananas  Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_SpecialChar_MatchesSecondWord() {
-        final String query = "Apple";
-        final String packageName = "Bananas & Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_TabSeparated_MatchesSecondWord() {
-        final String query = "Apple";
-        final String packageName = "Bananas\tApples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_LeadingNumber_MatchesWord() {
-        final String query = "4";
-        final String packageName = "4Bananas";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void query_FirstWordPrefixOfQuery_NoMatch() {
-        final String query = "Bananass";
-        final String packageName = "Bananas Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void query_QueryLongerThanAppName_NoMatch() {
-        final String query = "BananasApples";
-        final String packageName = "Bananas";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void query_appExistsInBothProfiles() {
-        final String query = "carrot";
-        final String packageName = "carrot";
-        final int user1 = 0;
-        final int user2 = 10;
-        final int uid = 67672;
-        List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(user1, "user 1", 0));
-        infos.add(new UserInfo(user2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user1)))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(UserHandle.getUid(user1, uid) /* uid */,
-                                packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user2)))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(UserHandle.getUid(user2, uid) /* uid */,
-                                packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        Set<AppSearchResult> searchResults = (Set<AppSearchResult>) mLoader.loadInBackground();
-        assertThat(searchResults).hasSize(2);
-
-        Set<Integer> uidResults = searchResults.stream().map(result -> result.info.uid).collect(
-                Collectors.toSet());
-        assertThat(uidResults).containsExactly(
-                UserHandle.getUid(user1, uid),
-                UserHandle.getUid(user2, uid));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
deleted file mode 100644
index a3826f66d6cf57977f7916f9cf4d0899e4aca39c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchResult.Builder;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class IntentSearchViewHolderTest {
-
-    private static final String TITLE = "title";
-    private static final String SUMMARY = "summary";
-    private static final int USER_ID = 10;
-    private static final String BADGED_LABEL = "work title";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SearchFragment mFragment;
-    @Mock
-    private PackageManager mPackageManager;
-    private FakeFeatureFactory mFeatureFactory;
-    private IntentSearchViewHolder mHolder;
-    private Drawable mIcon;
-    private Drawable mBadgedIcon;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        final Context context = RuntimeEnvironment.application;
-        final View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
-        mHolder = new IntentSearchViewHolder(view);
-
-        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
-        mBadgedIcon = context.getDrawable(R.drawable.ic_add);
-        when(mFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
-    }
-
-    @Test
-    public void testConstructor_membersNotNull() {
-        assertThat(mHolder.titleView).isNotNull();
-        assertThat(mHolder.summaryView).isNotNull();
-        assertThat(mHolder.iconView).isNotNull();
-        assertThat(mHolder.breadcrumbView).isNotNull();
-    }
-
-    @Test
-    public void testBindViewElements_allUpdated() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
-
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-    }
-
-    @Test
-    public void testBindViewIcon_nullIcon_imageDrawableIsNull() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, null);
-        mHolder.onBind(mFragment, result);
-
-        assertThat(mHolder.iconView.getDrawable()).isNull();
-    }
-
-    @Test
-    public void testBindViewElements_emptySummary_hideSummaryView() {
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setRank(1)
-                .setPayload(new ResultPayload(null))
-                .setIcon(mIcon)
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testBindViewElements_withBreadcrumb_shouldFormatBreadcrumb() {
-        final List<String> breadcrumbs = new ArrayList<>();
-        breadcrumbs.add("a");
-        breadcrumbs.add("b");
-        breadcrumbs.add("c");
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setRank(1)
-                .setPayload(new ResultPayload(null))
-                .addBreadcrumbs(breadcrumbs)
-                .setIcon(mIcon)
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-        assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mHolder.breadcrumbView.getText()).isEqualTo("a > b > c");
-    }
-
-    @Test
-    public void testBindElements_placeholderSummary_visibilityIsGone() {
-        final String nonBreakingSpace = mContext.getString(R.string.summary_placeholder);
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setSummary(nonBreakingSpace)
-                .setPayload(new ResultPayload(null))
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testBindElements_dynamicSummary_visibilityIsGone() {
-        final String dynamicSummary = "%s";
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setSummary(dynamicSummary)
-                .setPayload(new ResultPayload(null))
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testBindViewElements_appSearchResult() {
-        when(mPackageManager.getUserBadgedLabel(any(CharSequence.class),
-                eq(new UserHandle(USER_ID)))).thenReturn(BADGED_LABEL);
-
-        final SearchResult result = getAppSearchResult(
-                TITLE, SUMMARY, mIcon, getApplicationInfo(USER_ID, TITLE, mIcon));
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
-        assertThat(mHolder.titleView.getContentDescription()).isEqualTo(BADGED_LABEL);
-
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-        verify(mFragment.getActivity()).startActivityAsUser(
-                any(Intent.class), eq(new UserHandle(USER_ID)));
-    }
-
-    @Test
-    public void testBindViewElements_validSubSettingIntent_shouldLaunch() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
-        when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
-                .thenReturn(Arrays.asList(new ResolveInfo()));
-
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-        verify(mFragment).startActivity(result.payload.getIntent());
-    }
-
-    @Test
-    public void testBindViewElements_invalidSubSettingIntent_shouldNotLaunchAnything() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
-        when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
-                .thenReturn(null);
-
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-        verify(mFragment, never()).startActivity(any(Intent.class));
-    }
-
-    private SearchResult getSearchResult(String title, String summary, Drawable icon) {
-        Builder builder = new Builder();
-        builder.setStableId(Objects.hash(title, summary, icon))
-                .setTitle(title)
-                .setSummary(summary)
-                .setRank(1)
-                .setPayload(new ResultPayload(
-                        new Intent().setComponent(new ComponentName("pkg", "class"))))
-                .addBreadcrumbs(new ArrayList<>())
-                .setStableId(1)
-                .setIcon(icon);
-
-        return builder.build();
-    }
-
-    private SearchResult getAppSearchResult(
-            String title, String summary, Drawable icon, ApplicationInfo applicationInfo) {
-        AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.setTitle(title)
-                .setSummary(summary)
-                .setRank(1)
-                .setPayload(new ResultPayload(
-                        new Intent().setComponent(new ComponentName("pkg", "class"))))
-                .addBreadcrumbs(new ArrayList<>())
-                .setIcon(icon);
-        builder.setAppInfo(applicationInfo);
-        return builder.build();
-    }
-
-    private ApplicationInfo getApplicationInfo(int userId, CharSequence appLabel, Drawable icon) {
-        ApplicationInfo applicationInfo = spy(new ApplicationInfo());
-        applicationInfo.uid = UserHandle.getUid(userId, 12345);
-        doReturn(icon).when(applicationInfo).loadIcon(any(PackageManager.class));
-        doReturn(appLabel).when(applicationInfo).loadLabel(any(PackageManager.class));
-        return applicationInfo;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java b/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java
deleted file mode 100644
index 0a06a35191517937bfb9b5272401cb434b4b2c4e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class MockAccessibilityLoader extends AccessibilityServiceResultLoader {
-
-    public MockAccessibilityLoader(Context context) {
-        super(context, "test_query", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockAppLoader.java b/tests/robotests/src/com/android/settings/search/MockAppLoader.java
deleted file mode 100644
index c68cbdf623d401802d69398fdf487f6caec983ff..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/MockAppLoader.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import com.android.settings.search.InstalledAppResultLoader;
-import com.android.settings.search.SearchResult;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Mock loader to subvert the requirements of returning data while also driving the Loader
- * lifecycle.
- */
-class MockAppLoader extends InstalledAppResultLoader {
-
-    public MockAppLoader(Context context) {
-        super(context, null, "", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockDBLoader.java b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
deleted file mode 100644
index b28c1ed97f641add821ad1c428051c9251730eaf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/MockDBLoader.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import com.android.settings.search.DatabaseResultLoader;
-import com.android.settings.search.SearchResult;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Mock loader to subvert the requirements of returning data while also driving the Loader
- * lifecycle.
- */
-class MockDBLoader extends DatabaseResultLoader {
-
-    public MockDBLoader(Context context) {
-        super(context, "test", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java b/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java
deleted file mode 100644
index 2c16b14a3b065aa3d759042b926708782def00af..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class MockInputDeviceResultLoader extends InputDeviceResultLoader {
-    public MockInputDeviceResultLoader(Context context) {
-        super(context, "test_query", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
deleted file mode 100644
index 0bb43c5b1c222aaef5941b5c716b4d829735b849..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Intent;
-import android.os.Parcel;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ResultPayloadTest {
-    private ResultPayload mPayload;
-
-    private final String EXTRA_KEY = "key";
-    private final String EXTRA_VALUE = "value";
-
-    @Test
-    public void testParcelOrdering_StaysValid() {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
-        Parcel parcel = Parcel.obtain();
-
-        mPayload = new ResultPayload(intent);
-        mPayload.writeToParcel(parcel, 0);
-        // Reset parcel for reading
-        parcel.setDataPosition(0);
-        ResultPayload newPayload = ResultPayload.CREATOR.createFromParcel(parcel);
-
-        String originalIntentExtra = mPayload.getIntent().getStringExtra(EXTRA_KEY);
-        String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
-        assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
deleted file mode 100644
index 50bdb842725c62041a71625400ccf9ded3371e28..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Intent;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static junit.framework.Assert.fail;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ResultPayloadUtilsTest {
-    private ResultPayload payload;
-
-    private final String EXTRA_KEY = "key";
-    private final String EXTRA_VALUE = "value";
-
-    @Before
-    public void setUp() {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
-        payload = new ResultPayload(intent);
-    }
-
-    @Test
-    public void testUnmarshallBadData_ExceptionThrown() {
-        byte[] badData = "I'm going to fail :)".getBytes();
-        try {
-            ResultPayloadUtils.unmarshall(badData, ResultPayload.CREATOR);
-            fail("unmarshall should throw exception");
-        } catch ( RuntimeException e) {
-            assertThat(e).isNotNull();
-        }
-    }
-
-    @Test
-    public void testMarshallResultPayload_NonEmptyArray() {
-        byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
-        assertThat(marshalledPayload).isNotNull();
-        assertThat(marshalledPayload).isNotEmpty();
-    }
-
-    @Test
-    public void testUnmarshall_PreservedData() {
-        byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
-        ResultPayload newPayload = ResultPayloadUtils.unmarshall(marshalledPayload,
-                ResultPayload.CREATOR);
-
-        String originalIntentExtra = payload.getIntent().getStringExtra(EXTRA_KEY);
-        String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
-        assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
deleted file mode 100644
index 780a8a5dbc9fa1dec6197818960df4fa5db3aa5c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryLoaderTest {
-
-    private Context mContext;
-    private SQLiteDatabase mDb;
-    private SavedQueryLoader mLoader;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        mLoader = new SavedQueryLoader(mContext);
-        setUpDb();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void loadInBackground_shouldReturnSavedQueries() {
-        final List<? extends SearchResult> results = mLoader.loadInBackground();
-        assertThat(results.size()).isEqualTo(SavedQueryLoader.MAX_PROPOSED_SUGGESTIONS);
-        for (SearchResult result : results) {
-            assertThat(result.viewType).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
-        }
-    }
-
-    private void setUpDb() {
-        final long now = System.currentTimeMillis();
-        for (int i = 0; i < SavedQueryLoader.MAX_PROPOSED_SUGGESTIONS + 2; i++) {
-            ContentValues values = new ContentValues();
-            values.put(IndexDatabaseHelper.SavedQueriesColumns.QUERY, String.valueOf(i));
-            values.put(IndexDatabaseHelper.SavedQueriesColumns.TIME_STAMP, now);
-            mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES, null, values);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
deleted file mode 100644
index 7421d1a1e2448131560d8cff8115f8684fcf96a8..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryPayloadTest {
-
-    private SavedQueryPayload mPayload;
-
-    @Test
-    public void getType_shouldBeSavedQueryType() {
-        mPayload = new SavedQueryPayload("Test");
-        assertThat(mPayload.getType()).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
deleted file mode 100644
index af8cfe40bd3cc4ad2735ad8501f5b74afefc18d7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryRecorderAndRemoverTest {
-
-    private Context mContext;
-    private SavedQueryRecorder mRecorder;
-    private SavedQueryRemover mRemover;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void canSaveAndRemoveQuery() {
-        final String query = "test";
-        mRecorder = new SavedQueryRecorder(mContext, query);
-        mRemover = new SavedQueryRemover(mContext);
-
-        // Record a new query and load all queries from DB
-        mRecorder.loadInBackground();
-        final SavedQueryLoader loader = new SavedQueryLoader(mContext);
-        List<? extends SearchResult> results = loader.loadInBackground();
-
-        // Should contain the newly recorded query
-        assertThat(results.size()).isEqualTo(1);
-        assertThat(results.get(0).title).isEqualTo(query);
-
-        // Remove the query and load all queries from DB
-        mRemover.loadInBackground();
-        results = loader.loadInBackground();
-
-        // Saved query list should be empty because it's removed.
-        assertThat(results).isEmpty();
-    }
-
-    @Test
-    public void canRemoveAllQueriesAtOnce() {
-        mRemover = new SavedQueryRemover(mContext);;
-
-        // Record a new query and load all queries from DB
-        new SavedQueryRecorder(mContext, "Test1").loadInBackground();
-        new SavedQueryRecorder(mContext, "Test2").loadInBackground();
-        final SavedQueryLoader loader = new SavedQueryLoader(mContext);
-        List<? extends SearchResult> results = loader.loadInBackground();
-        assertThat(results.size()).isEqualTo(2);
-
-        mRemover.loadInBackground();
-        results = loader.loadInBackground();
-
-        // Saved query list should be empty because it's removed.
-        assertThat(results).isEmpty();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
deleted file mode 100644
index bb8f6d12da859a8d6ca3f331a66844e2fd574d3f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryViewHolderTest {
-
-    @Mock
-    private SearchFragment mSearchFragment;
-    private Context mContext;
-    private SavedQueryViewHolder mHolder;
-    private View mView;
-    private View mTitleView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mView = LayoutInflater.from(mContext)
-                .inflate(R.layout.search_saved_query_item, null);
-        mTitleView = mView.findViewById(android.R.id.title);
-        mHolder = new SavedQueryViewHolder(mView);
-    }
-
-    @Test
-    public void onBind_shouldBindClickCallback() {
-        final SearchResult result = mock(SearchResult.class);
-        mHolder.onBind(mSearchFragment, result);
-
-        mHolder.itemView.performClick();
-
-        verify(mSearchFragment).onSavedQueryClicked(nullable(CharSequence.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
deleted file mode 100644
index 30ffaf8b3ec4fb3adbb430cd32e2fac2ba70b921..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.app.Activity;
-import android.view.Menu;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchFeatureProviderImplTest {
-    private SearchFeatureProviderImpl mProvider;
-    private Activity mActivity;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Menu menu;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = Robolectric.buildActivity(Activity.class).create().visible().get();
-        mProvider = new SearchFeatureProviderImpl();
-    }
-
-    @Test
-    public void getSiteMapManager_shouldCacheInstance() {
-        final SiteMapManager manager1 = mProvider.getSiteMapManager();
-        final SiteMapManager manager2 = mProvider.getSiteMapManager();
-
-        assertThat(manager1).isSameAs(manager2);
-    }
-
-    @Test
-    public void getDatabaseSearchLoader_shouldCleanupQuery() {
-        final String query = "  space ";
-        final DatabaseResultLoader loader = mProvider.getDatabaseSearchLoader(mActivity, query);
-
-        assertThat(loader.mQueryText).isEqualTo(query.trim());
-    }
-
-    @Test
-    public void getInstalledAppSearchLoader_shouldCleanupQuery() {
-        final String query = "  space ";
-        final InstalledAppResultLoader loader =
-                mProvider.getInstalledAppSearchLoader(mActivity, query);
-
-        assertThat(loader.mQuery).isEqualTo(query.trim());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
deleted file mode 100644
index d78a8184f528806c5b28b6a5b58383c906b174d0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.LoaderManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.Loader;
-import android.os.Bundle;
-import android.util.Pair;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-        })
-public class SearchFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private DatabaseResultLoader mDatabaseResultLoader;
-    @Mock
-    private InstalledAppResultLoader mInstalledAppResultLoader;
-    @Mock
-    private AccessibilityServiceResultLoader mAccessibilityServiceResultLoader;
-    @Mock
-    private InputDeviceResultLoader mInputDeviceResultLoader;
-
-    @Mock
-    private SavedQueryLoader mSavedQueryLoader;
-    @Mock
-    private SavedQueryController mSavedQueryController;
-    @Mock
-    private SearchResultsAdapter mSearchResultsAdapter;
-    @Captor
-    private ArgumentCaptor<String> mQueryCaptor = ArgumentCaptor.forClass(String.class);
-
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
-    }
-
-    @After
-    public void tearDown() {
-        DatabaseTestUtils.clearDb(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void screenRotate_shouldPersistQuery() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        final Bundle bundle = new Bundle();
-        final String testQuery = "test";
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        ReflectionHelpers.setField(fragment, "mShowingSavedQuery", false);
-        fragment.mQuery = testQuery;
-
-        activityController.saveInstanceState(bundle).pause().stop().destroy();
-
-        activityController = Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup(bundle);
-
-        assertThat(fragment.mQuery).isEqualTo(testQuery);
-    }
-
-    @Test
-    public void screenRotateEmptyString_ShouldNotCrash() {
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        final Bundle bundle = new Bundle();
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.mQuery = "";
-
-        activityController.saveInstanceState(bundle).pause().stop().destroy();
-
-        activityController = Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup(bundle);
-
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getDatabaseSearchLoader(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getInstalledAppSearchLoader(any(Context.class), anyString());
-    }
-
-    @Test
-    public void queryTextChange_shouldTriggerLoaderAndInitializeSearch() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        final String testQuery = "test";
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
-        fragment.onQueryTextChange(testQuery);
-        activityController.get().onBackPressed();
-
-        activityController.pause().stop().destroy();
-
-        verify(mFeatureFactory.metricsFeatureProvider, never()).action(
-                any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY));
-        verify(mFeatureFactory.metricsFeatureProvider).histogram(
-                any(Context.class), eq(SearchFragment.RESULT_CLICK_COUNT), eq(0));
-        verify(mFeatureFactory.searchFeatureProvider)
-                .getDatabaseSearchLoader(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider)
-                .getInstalledAppSearchLoader(any(Context.class), anyString());
-        verify(mSearchResultsAdapter).initializeSearch(mQueryCaptor.capture());
-        assertThat(mQueryCaptor.getValue()).isEqualTo(testQuery);
-    }
-
-    @Test
-    public void onSearchResultsDisplayed_noResult_shouldShowNoResultView() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        fragment.onSearchResultsDisplayed(0 /* count */);
-
-        assertThat(fragment.mNoResultsView.getVisibility()).isEqualTo(View.VISIBLE);
-        verify(mFeatureFactory.metricsFeatureProvider).visible(
-                any(Context.class),
-                anyInt(),
-                eq(MetricsProto.MetricsEvent.SETTINGS_SEARCH_NO_RESULT));
-    }
-
-    @Test
-    public void queryTextChangeToEmpty_shouldLoadSavedQueryAndNotInitializeSearch() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-        ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
-        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
-        fragment.mQuery = "123";
-
-        fragment.onQueryTextChange("");
-
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getDatabaseSearchLoader(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getInstalledAppSearchLoader(any(Context.class), anyString());
-        verify(mSavedQueryController).loadSavedQueries();
-        verify(mSearchResultsAdapter, never()).initializeSearch(anyString());
-    }
-
-    @Test
-    public void updateIndex_TriggerOnCreate() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.onAttach(null);
-        verify(mFeatureFactory.searchFeatureProvider).updateIndexAsync(any(Context.class),
-                any(IndexingCallback.class));
-    }
-
-    @Test
-    public void syncLoaders_MergeWhenAllLoadersDone() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockDBLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.onQueryTextChange("non-empty");
-
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(fragment, times(2)).onLoadFinished(any(Loader.class), any(Set.class));
-    }
-
-    @Test
-    public void whenNoQuery_HideFeedbackIsCalled() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockDBLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-        when(fragment.getLoaderManager()).thenReturn(mock(LoaderManager.class));
-
-        fragment.onQueryTextChange("");
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(mFeatureFactory.searchFeatureProvider).hideFeedbackButton();
-    }
-
-    @Test
-    public void onLoadFinished_ShowsFeedback() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockDBLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAccessibilityLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(new MockInputDeviceResultLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.onQueryTextChange("non-empty");
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(mFeatureFactory.searchFeatureProvider).showFeedbackButton(any(SearchFragment.class),
-                any(View.class));
-    }
-
-    @Test
-    public void preIndexingFinished_isIndexingFinishedFlag_isFalse() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(false);
-    }
-
-    @Test
-    public void onIndexingFinished_notShowingSavedQuery_initLoaders() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        final LoaderManager loaderManager = mock(LoaderManager.class);
-        when(fragment.getLoaderManager()).thenReturn(loaderManager);
-        fragment.mShowingSavedQuery = false;
-        fragment.mQuery = null;
-
-        fragment.onIndexingFinished();
-
-        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.DATABASE),
-                eq(null), any(LoaderManager.LoaderCallbacks.class));
-        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.INSTALLED_APPS),
-                eq(null), any(LoaderManager.LoaderCallbacks.class));
-    }
-
-    @Test
-    public void onIndexingFinished_showingSavedQuery_loadsSavedQueries() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        fragment.mShowingSavedQuery = true;
-        ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
-
-        fragment.onIndexingFinished();
-
-        verify(fragment.mSavedQueryController).loadSavedQueries();
-    }
-
-    @Test
-    public void onIndexingFinished_noActivity_shouldNotCrash() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-        fragment.mQuery = "bright";
-        ReflectionHelpers.setField(fragment, "mLoaderManager", null);
-        ReflectionHelpers.setField(fragment, "mHost", null);
-
-        fragment.onIndexingFinished();
-        // no crash
-    }
-
-    @Test
-    public void onSearchResultClicked_shouldLogResultMeta() {
-        SearchFragment fragment = new SearchFragment();
-        ReflectionHelpers.setField(fragment, "mMetricsFeatureProvider",
-                mFeatureFactory.metricsFeatureProvider);
-        ReflectionHelpers.setField(fragment, "mSearchFeatureProvider",
-                mFeatureFactory.searchFeatureProvider);
-        ReflectionHelpers.setField(fragment, "mSearchAdapter", mock(SearchResultsAdapter.class));
-        fragment.mSavedQueryController = mock(SavedQueryController.class);
-
-        // Should log result name, result count, clicked rank, etc.
-        final SearchViewHolder resultViewHolder = mock(SearchViewHolder.class);
-        when(resultViewHolder.getClickActionMetricName())
-                .thenReturn(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT);
-        ResultPayload payLoad = new ResultPayload(
-                (new Intent()).putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, "test_setting"));
-        SearchResult searchResult = new SearchResult.Builder()
-                .setStableId(payLoad.hashCode())
-                .setPayload(payLoad)
-                .setTitle("setting_title")
-                .build();
-        fragment.onSearchResultClicked(resultViewHolder, searchResult);
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
-                eq("test_setting"),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT)),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK)),
-                argThat(pairMatches(MetricsProto.MetricsEvent
-                                .FIELD_SETTINGS_SEARCH_RESULT_ASYNC_RANKING_STATE)),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH)));
-
-        verify(mFeatureFactory.searchFeatureProvider).searchResultClicked(nullable(Context.class),
-                nullable(String.class), eq(searchResult));
-    }
-
-    @Test
-    public void onResume_shouldCallSearchRankingWarmupIfSmartSearchRankingEnabled(){
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
-                .thenReturn(true);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        verify(mFeatureFactory.searchFeatureProvider)
-                .searchRankingWarmup(any(Context.class));
-    }
-
-    @Test
-    public void onResume_shouldNotCallSearchRankingWarmupIfSmartSearchRankingDisabled(){
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
-                .thenReturn(false);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .searchRankingWarmup(any(Context.class));
-    }
-
-    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag) {
-        return pair -> pair.first == tag;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
deleted file mode 100644
index b4a91c57fba7a5a6cece274281bef8c4ea4ce151..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import android.util.ArraySet;
-import android.util.Log;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.codeinspection.CodeInspector;
-import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-/**
- * {@link CodeInspector} to ensure fragments implement search components correctly.
- */
-public class SearchIndexProviderCodeInspector extends CodeInspector {
-    private static final String TAG = "SearchCodeInspector";
-
-    private static final String NOT_IMPLEMENTING_INDEXABLE_ERROR =
-            "SettingsPreferenceFragment should implement Indexable, but these do not:\n";
-    private static final String NOT_CONTAINING_PROVIDER_OBJECT_ERROR =
-            "Indexable should have public field "
-                    + DatabaseIndexingManager.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
-                    + " but these are not:\n";
-    private static final String NOT_SHARING_PREF_CONTROLLERS_BETWEEN_FRAG_AND_PROVIDER =
-            "DashboardFragment should share pref controllers with its SearchIndexProvider, but "
-                    + " these are not: \n";
-    private static final String NOT_IN_INDEXABLE_PROVIDER_REGISTRY =
-            "Class containing " + DatabaseIndexingManager.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
-                    + " must be added to " + SearchIndexableResources.class.getName()
-                    + " but these are not: \n";
-
-    private final List<String> notImplementingIndexableGrandfatherList;
-    private final List<String> notImplementingIndexProviderGrandfatherList;
-    private final List<String> notInSearchIndexableRegistryGrandfatherList;
-    private final List<String> notSharingPrefControllersGrandfatherList;
-
-    public SearchIndexProviderCodeInspector(List<Class<?>> classes) {
-        super(classes);
-        notImplementingIndexableGrandfatherList = new ArrayList<>();
-        notImplementingIndexProviderGrandfatherList = new ArrayList<>();
-        notInSearchIndexableRegistryGrandfatherList = new ArrayList<>();
-        notSharingPrefControllersGrandfatherList = new ArrayList<>();
-        initializeGrandfatherList(notImplementingIndexableGrandfatherList,
-                "grandfather_not_implementing_indexable");
-        initializeGrandfatherList(notImplementingIndexProviderGrandfatherList,
-                "grandfather_not_implementing_index_provider");
-        initializeGrandfatherList(notInSearchIndexableRegistryGrandfatherList,
-                "grandfather_not_in_search_index_provider_registry");
-        initializeGrandfatherList(notSharingPrefControllersGrandfatherList,
-                "grandfather_not_sharing_pref_controllers_with_search_provider");
-    }
-
-    @Override
-    public void run() {
-        final Set<String> notImplementingIndexable = new ArraySet<>();
-        final Set<String> notImplementingIndexProvider = new ArraySet<>();
-        final Set<String> notInSearchProviderRegistry = new ArraySet<>();
-        final Set<String> notSharingPreferenceControllers = new ArraySet<>();
-
-        for (Class clazz : mClasses) {
-            if (!isConcreteSettingsClass(clazz)) {
-                continue;
-            }
-            final String className = clazz.getName();
-            // Skip fragments if it's not SettingsPreferenceFragment.
-            if (!SettingsPreferenceFragment.class.isAssignableFrom(clazz)) {
-                continue;
-            }
-            // If it's a SettingsPreferenceFragment, it must also be Indexable.
-            final boolean implementsIndexable = Indexable.class.isAssignableFrom(clazz);
-            if (!implementsIndexable) {
-                if (!notImplementingIndexableGrandfatherList.remove(className)) {
-                    notImplementingIndexable.add(className);
-                }
-                continue;
-            }
-            final boolean hasSearchIndexProvider = hasSearchIndexProvider(clazz);
-            // If it implements Indexable, it must also implement the index provider field.
-            if (!hasSearchIndexProvider) {
-                if (!notImplementingIndexProviderGrandfatherList.remove(className)) {
-                    notImplementingIndexProvider.add(className);
-                }
-                continue;
-            }
-            // If it implements index provider field AND it's a DashboardFragment, its fragment and
-            // search provider must share the same set of PreferenceControllers.
-            final boolean isSharingPrefControllers = DashboardFragmentSearchIndexProviderInspector
-                    .isSharingPreferenceControllers(clazz);
-            if (!isSharingPrefControllers) {
-                if (!notSharingPrefControllersGrandfatherList.remove(className)) {
-                    notSharingPreferenceControllers.add(className);
-                }
-                continue;
-            }
-            // Must be in SearchProviderRegistry
-            if (SearchIndexableResources.getResourceByName(className) == null) {
-                if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
-                    notInSearchProviderRegistry.add(className);
-                }
-                continue;
-            }
-        }
-
-        // Build error messages
-        final String indexableError = buildErrorMessage(NOT_IMPLEMENTING_INDEXABLE_ERROR,
-                notImplementingIndexable);
-        final String indexProviderError = buildErrorMessage(NOT_CONTAINING_PROVIDER_OBJECT_ERROR,
-                notImplementingIndexProvider);
-        final String notSharingPrefControllerError = buildErrorMessage(
-                NOT_SHARING_PREF_CONTROLLERS_BETWEEN_FRAG_AND_PROVIDER,
-                notSharingPreferenceControllers);
-        final String notInProviderRegistryError =
-                buildErrorMessage(NOT_IN_INDEXABLE_PROVIDER_REGISTRY, notInSearchProviderRegistry);
-        assertWithMessage(indexableError)
-                .that(notImplementingIndexable)
-                .isEmpty();
-        assertWithMessage(indexProviderError)
-                .that(notImplementingIndexProvider)
-                .isEmpty();
-        assertWithMessage(notSharingPrefControllerError)
-                .that(notSharingPreferenceControllers)
-                .isEmpty();
-        assertWithMessage(notInProviderRegistryError)
-                .that(notInSearchProviderRegistry)
-                .isEmpty();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_indexable",
-                notImplementingIndexableGrandfatherList);
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_index_provider",
-                notImplementingIndexProviderGrandfatherList);
-        assertNoObsoleteInGrandfatherList("grandfather_not_in_search_index_provider_registry",
-                notInSearchIndexableRegistryGrandfatherList);
-        assertNoObsoleteInGrandfatherList(
-                "grandfather_not_sharing_pref_controllers_with_search_provider",
-                notSharingPrefControllersGrandfatherList);
-    }
-
-    private boolean hasSearchIndexProvider(Class clazz) {
-        try {
-            final Field f = clazz.getField(
-                    DatabaseIndexingManager.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER);
-            return f != null;
-        } catch (NoClassDefFoundError e) {
-            // Cannot find class def, ignore
-            return true;
-        } catch (NoSuchFieldException e) {
-            Log.e(TAG, "error fetching search provider from class " + clazz.getName());
-            return false;
-        }
-    }
-
-    private String buildErrorMessage(String errorSummary, Set<String> errorClasses) {
-        final StringBuilder error = new StringBuilder(errorSummary);
-        for (String c : errorClasses) {
-            error.append(c).append("\n");
-        }
-        return error.toString();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
deleted file mode 100644
index 1ddff90f70cd10f960630315462a1c485c9fdfdf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
-import static com.android.settings.search.SearchIndexableResources.NO_DATA_RES_ID;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-
-import android.annotation.DrawableRes;
-import android.annotation.XmlRes;
-import android.database.Cursor;
-import android.provider.SearchIndexableResource;
-
-import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.wifi.WifiSettings;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchIndexableResourcesTest {
-
-    @XmlRes
-    private static final int XML_RES_ID = R.xml.physical_keyboard_settings;
-    @DrawableRes
-    private static final int ICON_RES_ID = R.drawable.ic_settings_language;
-
-    Map<String, SearchIndexableResource> sResMapCopy;
-
-    @Before
-    public void setUp() {
-        sResMapCopy = new HashMap<>(SearchIndexableResources.sResMap);
-    }
-
-    @After
-    public void cleanUp() {
-        SearchIndexableResources.sResMap.clear();
-        for (String key : sResMapCopy.keySet()) {
-            SearchIndexableResources.sResMap.put(key, sResMapCopy.get(key));
-        }
-    }
-
-    @Test
-    public void testAddIndex() {
-        // Confirms that String.class isn't contained in SearchIndexableResources.
-        assertThat(SearchIndexableResources.getResourceByName("java.lang.String")).isNull();
-        final int beforeCount = SearchIndexableResources.values().size();
-
-        SearchIndexableResources.addIndex(java.lang.String.class, XML_RES_ID, ICON_RES_ID);
-        final SearchIndexableResource index = SearchIndexableResources
-                .getResourceByName("java.lang.String");
-
-        assertThat(index).isNotNull();
-        assertThat(index.className).isEqualTo("java.lang.String");
-        assertThat(index.xmlResId).isEqualTo(XML_RES_ID);
-        assertThat(index.iconResId).isEqualTo(ICON_RES_ID);
-        final int afterCount = SearchIndexableResources.values().size();
-        assertThat(afterCount).isEqualTo(beforeCount + 1);
-    }
-
-    @Test
-    public void testIndexHasWifiSettings() {
-        final SearchIndexableResource index = SearchIndexableResources
-                .getResourceByName(WifiSettings.class.getName());
-
-        assertThat(index).isNotNull();
-        assertThat(index.className).isEqualTo(WifiSettings.class.getName());
-        assertThat(index.xmlResId).isEqualTo(NO_DATA_RES_ID);
-        assertThat(index.iconResId).isEqualTo(R.drawable.ic_settings_wireless);
-    }
-
-    @Test
-    public void testNonIndexableKeys_GetsKeyFromProvider() {
-        SearchIndexableResources.sResMap.clear();
-        SearchIndexableResources.addIndex(FakeIndexProvider.class, 0, 0);
-
-        SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());
-
-        Cursor cursor = provider.queryNonIndexableKeys(null);
-        boolean hasTestKey = false;
-        while(cursor.moveToNext()) {
-            String key = cursor.getString(COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE);
-            if (TextUtils.equals(key, FakeIndexProvider.KEY)) {
-                hasTestKey = true;
-                break;
-            }
-        }
-
-        assertThat(hasTestKey).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
deleted file mode 100644
index cd77b25753c6622fe326066084d7c63f07d5d7b1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchResult.Builder;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchResultBuilderTest {
-
-    private static final String TITLE = "title";
-    private static final String SUMMARY = "summary";
-
-    private Builder mBuilder;
-    private ArrayList<String> mBreadcrumbs;
-    private int mRank;
-    private ResultPayload mResultPayload;
-    private Drawable mIcon;
-
-    @Before
-    public void setUp() {
-        mBuilder = new Builder();
-        mBreadcrumbs = new ArrayList<>();
-        mRank = 3;
-        mResultPayload = new ResultPayload(new Intent());
-
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
-    }
-
-    @Test
-    public void testAllInfo_BuildSearchResult() {
-        mBuilder.setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setRank(mRank)
-                .addBreadcrumbs(mBreadcrumbs)
-                .setIcon(mIcon)
-                .setPayload(mResultPayload)
-                .setStableId(1);
-        SearchResult result = mBuilder.build();
-
-        assertThat(result).isNotNull();
-        assertThat(result.title).isEqualTo(TITLE);
-        assertThat(result.summary).isEqualTo(SUMMARY);
-        assertThat(result.rank).isEqualTo(mRank);
-        assertThat(result.breadcrumbs).isEqualTo(mBreadcrumbs);
-        assertThat(result.icon).isEqualTo(mIcon);
-        assertThat(result.payload).isEqualTo(mResultPayload);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testNoStableId_BuildSearchResultException() {
-        mBuilder.setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setRank(mRank)
-                .addBreadcrumbs(mBreadcrumbs)
-                .setIcon(mIcon)
-                .setPayload(mResultPayload);
-
-        mBuilder.build();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testNoTitle_BuildSearchResultException() {
-        mBuilder.setSummary(SUMMARY)
-                .setRank(mRank)
-                .addBreadcrumbs(mBreadcrumbs)
-                .setIcon(mIcon)
-                .setPayload(mResultPayload)
-                .setStableId(1);
-
-        mBuilder.build();
-    }
-
-    @Test
-    public void testNoRank_BuildSearchResult_pass() {
-        mBuilder.setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .addBreadcrumbs(mBreadcrumbs)
-                .setIcon(mIcon)
-                .setPayload(mResultPayload)
-                .setStableId(1);
-
-        assertThat(mBuilder.build()).isNotNull();
-    }
-
-    @Test
-    public void testNoIcon_BuildSearchResult_pass() {
-        mBuilder.setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setRank(mRank)
-                .addBreadcrumbs(mBreadcrumbs)
-                .setPayload(mResultPayload)
-                .setStableId(1);
-
-        assertThat(mBuilder.build()).isNotNull();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testNoPayload_BuildSearchResultException() {
-        mBuilder.setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setRank(mRank)
-                .addBreadcrumbs(mBreadcrumbs)
-                .setIcon(mIcon)
-                .setStableId(1);
-
-        mBuilder.build();
-    }
-}
-
-
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
deleted file mode 100644
index a2afb3570c6503b405300e69cf5ca625e349cb16..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.util.Pair;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchResult.Builder;
-import com.android.settings.search.ranking.SearchResultsRankerCallback;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowLooper;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchResultsAdapterTest {
-
-    @Mock
-    private SearchFragment mFragment;
-    @Mock
-    private SearchFeatureProvider mSearchFeatureProvider;
-    @Mock
-    private Context mMockContext;
-    @Captor
-    private ArgumentCaptor<Integer> mSearchResultsCountCaptor =
-            ArgumentCaptor.forClass(Integer.class);
-    private SearchResultsAdapter mAdapter;
-    private Context mContext;
-    private String mLoaderClassName;
-
-    private String[] TITLES = {"alpha", "bravo", "charlie", "appAlpha", "appBravo", "appCharlie"};
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = Robolectric.buildActivity(Activity.class).get();
-        mLoaderClassName = DatabaseResultLoader.class.getName();
-        when(mFragment.getContext()).thenReturn(mMockContext);
-        when(mMockContext.getApplicationContext()).thenReturn(mContext);
-        when(mSearchFeatureProvider.smartSearchRankingTimeoutMs(any(Context.class)))
-                .thenReturn(300L);
-        mAdapter = new SearchResultsAdapter(mFragment, mSearchFeatureProvider);
-    }
-
-    @Test
-    public void testNoResultsAdded_emptyListReturned() {
-        List<SearchResult> updatedResults = mAdapter.getSearchResults();
-        assertThat(updatedResults).isEmpty();
-    }
-
-    @Test
-    public void testSingleSourceMerge_exactCopyReturned() {
-        Set<SearchResult> intentResults = getIntentSampleResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(intentResults, mLoaderClassName);
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> updatedResults = mAdapter.getSearchResults();
-        assertThat(updatedResults).containsAllIn(intentResults);
-    }
-
-    @Test
-    public void testCreateViewHolder_returnsIntentResult() {
-        ViewGroup group = new FrameLayout(mContext);
-        SearchViewHolder view = mAdapter.onCreateViewHolder(group,
-                ResultPayload.PayloadType.INTENT);
-        assertThat(view).isInstanceOf(IntentSearchViewHolder.class);
-    }
-
-    @Test
-    public void testCreateViewHolder_returnsIntentSwitchResult() {
-        // TODO (b/62807132) test for InlineResult
-        ViewGroup group = new FrameLayout(mContext);
-        SearchViewHolder view = mAdapter.onCreateViewHolder(group,
-                ResultPayload.PayloadType.INLINE_SWITCH);
-        assertThat(view).isInstanceOf(IntentSearchViewHolder.class);
-    }
-
-    @Test
-    public void testEndToEndSearch_properResultsMerged_correctOrder() {
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(new HashSet<>(getDummyAppResults()),
-                InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(new HashSet<>(getDummyDbResults()),
-                DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
-        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
-        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
-    }
-
-    @Test
-    public void testEndToEndSearch_addResults_resultsAddedInOrder() {
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        // Add two individual items
-        mAdapter.addSearchResults(new HashSet<>(appResults.subList(0, 1)),
-                InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(new HashSet<>(dbResults.subList(0, 1)),
-                DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        // Add super-set of items
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
-        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
-        verify(mFragment, times(2)).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getAllValues().toArray())
-                .isEqualTo(new Integer[] {2, 6});
-    }
-
-    @Test
-    public void testEndToEndSearch_removeResults_resultsAdded() {
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        // Add list of items
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(new HashSet<>(appResults),
-                InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(new HashSet<>(dbResults),
-                DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        // Add subset of items
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(new HashSet<>(appResults.subList(0, 1)),
-                InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(new HashSet<>(dbResults.subList(0, 1)),
-                DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[0]);
-        assertThat(results.get(1).title).isEqualTo(TITLES[3]);
-        verify(mFragment, times(2)).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getAllValues().toArray())
-                .isEqualTo(new Integer[] {6, 2});
-    }
-    @Test
-    public void testEndToEndSearch_smartSearchRankingEnabledAndSucceededAfterResultsLoaded() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
-        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
-        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.SUCCEEDED);
-    }
-
-    @Test
-    public void testEndToEndSearch_smartSearchRankingEnabledAndSucceededBeforeResultsLoaded() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
-        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
-        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.SUCCEEDED);
-    }
-
-    @Test
-    public void testEndToEndSearch_smartSearchRankingEnabledAndFailedAfterResultsLoaded() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        mAdapter.onRankingFailed();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
-        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
-        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.FAILED);
-    }
-
-    @Test
-    public void testEndToEndSearch_smartSearchRankingEnabledAndFailedBeforeResultsLoaded() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.onRankingFailed();
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
-        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
-        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.FAILED);
-    }
-
-    @Test
-    public void testEndToEndSearch_smartSearchRankingEnabledAndTimedoutAfterResultsLoaded() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-
-        waitUntilRankingTimesOut();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
-        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
-        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.TIMED_OUT);
-    }
-
-    @Test
-    public void testEndToEndSearch_smartSearchRankingEnabledAndTimedoutBeforeResultsLoaded() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-
-        waitUntilRankingTimesOut();
-
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> results = mAdapter.getSearchResults();
-        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
-        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
-        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
-        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.TIMED_OUT);
-    }
-
-    @Test
-    public void testDoSmartRanking_shouldRankAppResultsAfterDbResults() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
-        List<SearchResult> results = mAdapter.doAsyncRanking();
-        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
-        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
-    }
-
-    @Test
-    public void testDoSmartRanking_shouldRankResultsWithMissingScoresAfterScoredResults() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        List<Pair<String, Float>> rankingScores = getDummyRankingScores();
-        rankingScores.remove(1); // no ranking score for alpha
-        mAdapter.onRankingScoresAvailable(rankingScores);
-        List<SearchResult> results = mAdapter.doAsyncRanking();
-        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
-        assertThat(results.get(1).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(results.get(2).title).isEqualTo(TITLES[0]); // alpha
-        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
-    }
-
-    @Test
-    public void testGetUnsortedLoadedResults () {
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        Set<CharSequence> expectedDbTitles = new HashSet<>(
-                Arrays.asList("alpha", "bravo", "charlie"));
-        Set<CharSequence> expectedAppTitles = new HashSet<>(
-                Arrays.asList("appAlpha", "appBravo", "appCharlie"));
-        Set<CharSequence> actualDbTitles = new HashSet<>();
-        Set<CharSequence> actualAppTitles = new HashSet<>();
-        for (SearchResult result : mAdapter.getUnsortedLoadedResults(SearchResultsAdapter
-                .DB_RESULTS_LOADER_KEY)) {
-            actualDbTitles.add(result.title);
-        }
-        for (SearchResult result : mAdapter.getUnsortedLoadedResults(SearchResultsAdapter
-                .APP_RESULTS_LOADER_KEY)) {
-            actualAppTitles.add(result.title);
-        }
-        assertThat(actualDbTitles).isEqualTo(expectedDbTitles);
-        assertThat(actualAppTitles).isEqualTo(expectedAppTitles);
-    }
-
-    @Test
-    public void testGetSortedLoadedResults() {
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(
-                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(
-                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
-        List<? extends SearchResult> actualDbResults =
-                mAdapter.getSortedLoadedResults(SearchResultsAdapter.DB_RESULTS_LOADER_KEY);
-        List<? extends SearchResult> actualAppResults =
-                mAdapter.getSortedLoadedResults(SearchResultsAdapter.APP_RESULTS_LOADER_KEY);
-        assertThat(actualDbResults.get(0).title).isEqualTo(TITLES[0]); // charlie
-        assertThat(actualDbResults.get(1).title).isEqualTo(TITLES[1]); // bravo
-        assertThat(actualDbResults.get(2).title).isEqualTo(TITLES[2]); // alpha
-        assertThat(actualAppResults.get(0).title).isEqualTo(TITLES[3]); // appAlpha
-        assertThat(actualAppResults.get(1).title).isEqualTo(TITLES[4]); // appBravo
-        assertThat(actualAppResults.get(2).title).isEqualTo(TITLES[5]); // appCharlie
-    }
-
-    @Test
-    public void testInitializeSearch_shouldNotRunSmartRankingIfDisabled() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(false);
-        mAdapter.initializeSearch("");
-        mAdapter.notifyResultsLoaded();
-        verify(mSearchFeatureProvider, never()).querySearchResults(
-                any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.DISABLED);
-    }
-
-    @Test
-    public void testInitialSearch_shouldRunSmartRankingIfEnabled() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-        mAdapter.initializeSearch("");
-        mAdapter.notifyResultsLoaded();
-        verify(mSearchFeatureProvider, times(1)).querySearchResults(
-                any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
-        assertThat(mAdapter.getAsyncRankingState())
-                .isEqualTo(SearchResultsAdapter.PENDING_RESULTS);
-    }
-
-    @Test
-    public void testGetRankingScoreByStableId() {
-        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
-
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
-        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(0).stableId))
-                .isWithin(1e-10f).of(0.8f);
-        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(1).stableId))
-                .isWithin(1e-10f).of(0.2f);
-        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(2).stableId))
-                .isWithin(1e-10f).of(0.9f);
-        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(0).stableId))
-                .isEqualTo(-Float.MAX_VALUE);
-        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(1).stableId))
-                .isEqualTo(-Float.MAX_VALUE);
-        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(2).stableId))
-                .isEqualTo(-Float.MAX_VALUE);
-    }
-
-    private void waitUntilRankingTimesOut() {
-        while (mAdapter.getHandler().hasMessages(mAdapter.MSG_RANKING_TIMED_OUT)) {
-            try {
-                ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                // Do nothing
-            }
-        }
-    }
-
-    private List<SearchResult> getDummyDbResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(TITLES[0])
-                .setRank(1)
-                .setStableId(Objects.hash(TITLES[0], "db"));
-        results.add(builder.build());
-
-        builder.setTitle(TITLES[1])
-                .setRank(3)
-                .setStableId(Objects.hash(TITLES[1], "db"));
-        results.add(builder.build());
-
-        builder.setTitle(TITLES[2])
-                .setRank(6)
-                .setStableId(Objects.hash(TITLES[2], "db"));
-        results.add(builder.build());
-
-        return results;
-    }
-
-    private List<SearchResult> getDummyAppResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(TITLES[3])
-                .setRank(1)
-                .setStableId(Objects.hash(TITLES[3], "app"));
-        results.add(builder.build());
-
-        builder.setTitle(TITLES[4])
-                .setRank(2)
-                .setStableId(Objects.hash(TITLES[4], "app"));
-        results.add(builder.build());
-
-        builder.setTitle(TITLES[5])
-                .setRank(4)
-                .setStableId(Objects.hash(TITLES[5], "app"));
-        results.add(builder.build());
-
-        return results;
-    }
-
-    private Set<SearchResult> getIntentSampleResults() {
-        Set<SearchResult> sampleResults = new HashSet<>();
-        ArrayList<String> breadcrumbs = new ArrayList<>();
-        final Drawable icon = mContext.getDrawable(R.drawable.ic_search_24dp);
-        final ResultPayload payload = new ResultPayload(null);
-        final SearchResult.Builder builder = new Builder();
-        builder.setTitle("title")
-                .setSummary("summary")
-                .setRank(1)
-                .addBreadcrumbs(breadcrumbs)
-                .setIcon(icon)
-                .setPayload(payload)
-                .setStableId(Objects.hash("title", "summary", 1));
-        sampleResults.add(builder.build());
-
-        builder.setRank(2)
-                .setStableId(Objects.hash("title", "summary", 2));
-        sampleResults.add(builder.build());
-
-        builder.setRank(3)
-                .setStableId(Objects.hash("title", "summary", 3));
-        sampleResults.add(builder.build());
-        return sampleResults;
-    }
-
-    private List<Pair<String, Float>> getDummyRankingScores() {
-        List<SearchResult> results = getDummyDbResults();
-        List<Pair<String, Float>> scores = new ArrayList<>();
-        scores.add(new Pair<>(Long.toString(results.get(2).stableId), 0.9f)); // charlie
-        scores.add(new Pair<>(Long.toString(results.get(0).stableId), 0.8f)); // alpha
-        scores.add(new Pair<>(Long.toString(results.get(1).stableId), 0.2f)); // bravo
-        return scores;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
deleted file mode 100644
index b441b66dc4177cc0e234cbd51ec778137dac6151..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexDatabaseHelper.SiteMapColumns;
-import com.android.settings.system.SystemDashboardFragment;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SiteMapManagerTest {
-
-    private static final int STATIC_DB_DEPTH = 4;
-    private static final String CLASS_PREFIX = "class_";
-    private static final String TITLE_PREFIX = "title_";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    private Context mContext;
-    private SQLiteDatabase mDb;
-    private SiteMapManager mSiteMapManager;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mMockContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-
-        mContext = RuntimeEnvironment.application;
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        buildDb();
-        mSiteMapManager = new SiteMapManager();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void buildBreadCrumb_onlyFromSiteMapDb_breadcrumbShouldLinkUp() {
-        List<String> breadcrumb = mSiteMapManager.buildBreadCrumb(mContext,
-                CLASS_PREFIX + 0, TITLE_PREFIX + 0);
-        assertThat(breadcrumb.size()).isEqualTo(STATIC_DB_DEPTH + 1);
-        for (int i = 0; i < STATIC_DB_DEPTH; i++) {
-            assertThat(breadcrumb.get(i)).isEqualTo(TITLE_PREFIX + (STATIC_DB_DEPTH - i));
-        }
-    }
-
-    @Test
-    public void buildBreadCrumb_fromSiteMapDbAndDashboardProvider_breadcrumbShouldLinkUp() {
-        final String iaClass = SystemDashboardFragment.class.getName();
-        final String iaTitle = "ia_title";
-
-        ContentValues index = new ContentValues();
-        index.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, iaClass);
-        index.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, iaTitle);
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, index);
-
-        final DashboardCategory category = new DashboardCategory();
-        category.key = CategoryKey.CATEGORY_SYSTEM;
-        category.tiles.add(new Tile());
-        category.tiles.get(0).title = TITLE_PREFIX + STATIC_DB_DEPTH;
-        category.tiles.get(0).metaData = new Bundle();
-        category.tiles.get(0).metaData.putString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS,
-                CLASS_PREFIX + STATIC_DB_DEPTH);
-        when(mFeatureFactory.dashboardFeatureProvider.getAllCategories())
-                .thenReturn(Arrays.asList(category));
-
-        final List<String> breadcrumb = mSiteMapManager.buildBreadCrumb(mContext,
-                CLASS_PREFIX + 0, TITLE_PREFIX + 0);
-
-        assertThat(breadcrumb.size()).isEqualTo(STATIC_DB_DEPTH + 2);
-        assertThat(breadcrumb.get(0))
-                .isEqualTo(iaTitle);
-    }
-
-    @Test
-    public void buildBreadCrumb_classNotIndexed_shouldNotHaveBreadCrumb() {
-        final String title = "wrong_title";
-
-        final List<String> breadcrumb = mSiteMapManager.buildBreadCrumb(mContext,
-                "wrong_class", title);
-
-        assertThat(breadcrumb.size()).isEqualTo(1);
-        assertThat(breadcrumb.get(0)).isEqualTo(title);
-    }
-
-    private void buildDb() {
-        for (int i = 0; i < STATIC_DB_DEPTH; i++) {
-            final ContentValues siteMapPair = new ContentValues();
-            siteMapPair.put(SiteMapColumns.DOCID, i);
-            siteMapPair.put(SiteMapColumns.PARENT_CLASS, CLASS_PREFIX + (i + 1));
-            siteMapPair.put(SiteMapColumns.PARENT_TITLE, TITLE_PREFIX + (i + 1));
-            siteMapPair.put(SiteMapColumns.CHILD_CLASS, CLASS_PREFIX + i);
-            siteMapPair.put(SiteMapColumns.CHILD_TITLE, TITLE_PREFIX + i);
-            mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_SITE_MAP, null, siteMapPair);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
deleted file mode 100644
index 5d2a9776febf53758c541c2cc5af79f017516ea4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.res.XmlResourceParser;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.util.Xml;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.xmlpull.v1.XmlPullParser;
-
-import static com.google.common.truth.Truth.assertThat;
-
-/**
- * These tests use a series of preferences that have specific attributes which are sometimes
- * uncommon (such as summaryOn).
- *
- * If changing a preference file breaks a test in this test file, please replace its reference
- * with another preference with a matchin replacement attribute.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class XmlParserUtilTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-    }
-
-    @Test
-    public void testDataTitleValid_ReturnsPreferenceTitle() {
-        XmlResourceParser parser = getChildByType(R.xml.display_settings,
-                "com.android.settings.TimeoutListPreference");
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String title = XmlParserUtils.getDataTitle(mContext, attrs);
-        String expTitle = mContext.getString(R.string.screen_timeout);
-        assertThat(title).isEqualTo(expTitle);
-    }
-
-    @Test
-    public void testDataKeywordsValid_ReturnsPreferenceKeywords() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.display_settings);
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String keywords = XmlParserUtils.getDataKeywords(mContext, attrs);
-        String expKeywords = mContext.getString(R.string.keywords_display);
-        assertThat(keywords).isEqualTo(expKeywords);
-    }
-
-    @Test
-    public void testDataKeyValid_ReturnsPreferenceKey() {
-        XmlResourceParser parser = getChildByType(R.xml.display_settings,
-                "com.android.settings.TimeoutListPreference");
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String key = XmlParserUtils.getDataKey(mContext, attrs);
-        String expKey = "screen_timeout";
-        assertThat(key).isEqualTo(expKey);
-    }
-
-    @Test
-    public void testDataSummaryValid_ReturnsPreferenceSummary() {
-        XmlResourceParser parser = getChildByType(R.xml.display_settings,
-                "com.android.settings.TimeoutListPreference");
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String summary = XmlParserUtils.getDataSummary(mContext, attrs);
-        String expSummary = mContext.getString(R.string.summary_placeholder);
-        assertThat(summary).isEqualTo(expSummary);
-
-    }
-
-    @Test
-    public void testDataSummaryOnValid_ReturnsPreferenceSummaryOn() {
-        XmlResourceParser parser = getChildByType(R.xml.application_settings, "CheckBoxPreference");
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String summary = XmlParserUtils.getDataSummaryOn(mContext, attrs);
-        String expSummary = mContext.getString(R.string.advanced_settings_summary);
-        assertThat(summary).isEqualTo(expSummary);
-    }
-
-    @Test
-    public void testDataSummaryOffValid_ReturnsPreferenceSummaryOff() {
-        XmlResourceParser parser = getChildByType(R.xml.application_settings, "CheckBoxPreference");
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String summary = XmlParserUtils.getDataSummaryOff(mContext, attrs);
-        String expSummary = mContext.getString(R.string.advanced_settings_summary);
-        assertThat(summary).isEqualTo(expSummary);
-    }
-
-    @Test
-    public void testDataEntriesValid_ReturnsPreferenceEntries() {
-        XmlResourceParser parser = getChildByType(R.xml.application_settings, "ListPreference");
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String entries = XmlParserUtils.getDataEntries(mContext, attrs);
-        String[] expEntries = mContext.getResources()
-                .getStringArray(R.array.app_install_location_entries);
-        for (int i = 0; i < expEntries.length; i++) {
-            assertThat(entries).contains(expEntries[i]);
-        }
-    }
-
-    // Null checks
-
-    @Test
-    public void testDataKeyInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.display_settings);
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String key = XmlParserUtils.getDataKey(mContext, attrs);
-        assertThat(key).isNull();
-    }
-
-    @Test
-    public void testDataSummaryInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.display_settings);
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String summary = XmlParserUtils.getDataSummary(mContext, attrs);
-        assertThat(summary).isNull();
-    }
-
-    @Test
-    public void testDataSummaryOffInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.display_settings);
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String summaryOff = XmlParserUtils.getDataSummaryOff(mContext, attrs);
-        assertThat(summaryOff).isNull();
-    }
-
-    @Test
-    public void testDataEntriesInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.display_settings);
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String entries = XmlParserUtils.getDataEntries(mContext, attrs);
-        assertThat(entries).isNull();
-    }
-
-    /**
-     * @param resId the ID for the XML preference
-     * @return an XML resource parser that points to the start tag
-     */
-    private XmlResourceParser getParentPrimedParser(int resId) {
-        XmlResourceParser parser = null;
-        try {
-            parser = mContext.getResources().getXml(resId);
-
-            int type;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-            }
-        } catch (Exception e) {
-
-        }
-        return parser;
-    }
-
-    private XmlResourceParser getChildByType(int resId, String xmlType) {
-        XmlResourceParser parser = null;
-        try {
-            parser = mContext.getResources().getXml(resId);
-
-            int type;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-            }
-            while(parser.getName() != xmlType) {
-                parser.next();
-            }
-        } catch (Exception e) {
-
-        }
-        return parser;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
deleted file mode 100644
index 1809e880d09f773c329da24f30cf66a3f73ded2e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-
-import android.content.DialogInterface;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.FragmentController;
-
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = ShadowEventLogWriter.class
-)
-public class ConfigureKeyGuardDialogTest {
-
-    @Test
-    public void displayDialog_clickPositiveButton_launchSetNewPassword() {
-        final FragmentController<ConfigureKeyGuardDialog> fragmentController =
-                Robolectric.buildFragment(ConfigureKeyGuardDialog.class);
-        final ConfigureKeyGuardDialog fragment = spy(fragmentController.get());
-        doNothing().when(fragment).startPasswordSetup();
-        fragmentController.attach().create().start().resume();
-        fragment.onClick(null /* dialog */, DialogInterface.BUTTON_POSITIVE);
-        fragment.onDismiss(null /* dialog */);
-
-        verify(fragment).startPasswordSetup();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
deleted file mode 100644
index b6487f1c9c948a1016e27f9d89aa4177f24f365e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.XmlTestUtils;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LockscreenDashboardFragmentTest {
-
-    private LockscreenDashboardFragment mFragment;
-
-    @Test
-    public void containsNotificationSettingsForPrimaryUserAndWorkProfile() {
-        mFragment = new LockscreenDashboardFragment();
-
-        List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application,
-                mFragment.getPreferenceScreenResId());
-
-        assertThat(keys).containsAllOf(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
-                LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE,
-                LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
deleted file mode 100644
index 8406d9089b1859cf773603b68b6c77d21a7c2ee1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.security;
-
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.PreferenceFragment;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.OwnerInfoSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class OwnerInfoPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceFragment mFragment;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-    @Mock
-    private RestrictedPreference mPreference;
-    @Mock
-    private LockPatternUtils mLockPatternUtils;
-
-    private Context mContext;
-    private OwnerInfoPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = spy(shadowContext.getApplicationContext());
-
-        when(mFragment.isAdded()).thenReturn(true);
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
-        when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
-        when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
-
-        mController = spy(new OwnerInfoPreferenceController(mContext, mFragment, null));
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils);
-    }
-
-    @Test
-    public void isAvailable_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void onResume_shouldUpdateEnableState() {
-        mController.onResume();
-
-        verify(mController).updateEnableState();
-    }
-
-    @Test
-    public void onResume_shouldUpdateSummary() {
-        mController.onResume();
-
-        verify(mController).updateSummary();
-    }
-
-    @Test
-    public void updateSummary_deviceOwnerInfoEnabled_shouldSetDeviceOwnerInfoSummary() {
-        final String deviceOwnerInfo = "Test Device Owner Info";
-        doReturn(true).when(mController).isDeviceOwnerInfoEnabled();
-        doReturn(deviceOwnerInfo).when(mController).getDeviceOwnerInfo();
-        mController.displayPreference(mScreen);
-
-        mController.updateSummary();
-
-        verify(mPreference).setSummary(deviceOwnerInfo);
-    }
-
-    @Test
-    public void updateSummary_ownerInfoEnabled_shouldSetOwnerInfoSummary() {
-        final String ownerInfo = "Test Owner Info";
-        doReturn(false).when(mController).isDeviceOwnerInfoEnabled();
-        doReturn(true).when(mController).isOwnerInfoEnabled();
-        doReturn(ownerInfo).when(mController).getOwnerInfo();
-        mController.displayPreference(mScreen);
-
-        mController.updateSummary();
-
-        verify(mPreference).setSummary(ownerInfo);
-    }
-
-    @Test
-    public void updateSummary_ownerInfoDisabled_shouldSetDefaultSummary() {
-        doReturn(false).when(mController).isDeviceOwnerInfoEnabled();
-        doReturn(false).when(mController).isOwnerInfoEnabled();
-        mController.displayPreference(mScreen);
-
-        mController.updateSummary();
-
-        verify(mPreference).setSummary(mContext.getString(
-            com.android.settings.R.string.owner_info_settings_summary));
-    }
-
-    @Test
-    public void updateEnableState_deviceOwnerInfoEnabled_shouldSetDisabledByAdmin() {
-        doReturn(true).when(mController).isDeviceOwnerInfoEnabled();
-        doReturn(mock(EnforcedAdmin.class)).when(mController).getDeviceOwner();
-        mController.displayPreference(mScreen);
-
-        mController.updateEnableState();
-
-        verify(mPreference).setDisabledByAdmin(any(EnforcedAdmin.class));
-    }
-
-    @Test
-    public void updateEnableState_lockScreenDisabled_shouldDisablePreference() {
-        doReturn(false).when(mController).isDeviceOwnerInfoEnabled();
-        doReturn(true).when(mLockPatternUtils).isLockScreenDisabled(anyInt());
-        mController.displayPreference(mScreen);
-
-        mController.updateEnableState();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void updateEnableState_lockScreenEnabled_shouldEnablePreference() {
-        doReturn(false).when(mController).isDeviceOwnerInfoEnabled();
-        doReturn(false).when(mLockPatternUtils).isLockScreenDisabled(anyInt());
-        mController.displayPreference(mScreen);
-
-        mController.updateEnableState();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
-    public void performClick_shouldLaunchOwnerInfoSettings() {
-        final ShadowApplication application = ShadowApplication.getInstance();
-        final RestrictedPreference preference =
-            new RestrictedPreference(application.getApplicationContext());
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
-        doReturn(false).when(mController).isDeviceOwnerInfoEnabled();
-        doReturn(false).when(mLockPatternUtils).isLockScreenDisabled(anyInt());
-        mController.displayPreference(mScreen);
-        mController.updateEnableState();
-
-        preference.performClick();
-
-        verify(mFragment).getFragmentManager();
-        verify(mFragment.getFragmentManager().beginTransaction())
-            .add(any(OwnerInfoSettings.class), anyString());
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
deleted file mode 100644
index 8c5e8e5975634663033201c2978e95043118faf1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import android.content.Context;
-import android.content.IContentProvider;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Pair;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.drawer.TileUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowLooper;
-
-import java.util.Map;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SecurityFeatureProviderImplTest {
-
-    private static final String MOCK_KEY = "key";
-    private static final String MOCK_SUMMARY = "summary";
-    private static final String URI_GET_SUMMARY = "content://package/text/summary";
-    private static final String URI_GET_ICON = "content://package/icon/my_icon";
-
-    @Mock
-    private Drawable mMockDrawable;
-    @Mock
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private Resources mResources;
-
-    private SecurityFeatureProviderImpl mImpl;
-
-    @Implements(com.android.settingslib.drawer.TileUtils.class)
-    public static class ShadowTileUtils {
-        @Implementation
-        public static Pair getIconFromUri(Context context, String packageName, String uriString,
-                Map<String, IContentProvider> providerMap) {
-            return Pair.create("package", 161803);
-        }
-
-        @Implementation
-        public static String getTextFromUri(Context context, String uriString,
-                Map<String, IContentProvider> providerMap, String key) {
-            return MOCK_SUMMARY;
-        }
-    }
-
-    @Before
-    public void setUp() throws PackageManager.NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mImpl = new SecurityFeatureProviderImpl();
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getResourcesForApplication(anyString())).thenReturn(mResources);
-        when(mResources.getDrawable(anyInt(), any())).thenReturn(mMockDrawable);
-    }
-
-    @Test
-    public void updateTilesData_shouldNotProcessEmptyScreenOrTiles() {
-        mImpl.updatePreferencesToRunOnWorkerThread(mContext, null, null);
-        ShadowLooper.runUiThreadTasks();
-        mImpl.updatePreferencesToRunOnWorkerThread(
-                mContext, new PreferenceScreen(mContext, null), null);
-        ShadowLooper.runUiThreadTasks();
-        verifyNoMoreInteractions(mPackageManager);
-    }
-
-    @Test
-    public void updateTilesData_shouldNotProcessNonMatchingPreference() {
-        DashboardCategory dashboardCategory = new DashboardCategory();
-        dashboardCategory.addTile(new Tile());
-        mImpl.updatePreferencesToRunOnWorkerThread(
-                mContext, getPreferenceScreen(), dashboardCategory);
-        ShadowLooper.runUiThreadTasks();
-        verifyNoMoreInteractions(mPackageManager);
-    }
-
-    @Test
-    public void updateTilesData_shouldNotProcessMatchingPreferenceWithNoData() {
-        mImpl.updatePreferencesToRunOnWorkerThread(
-                mContext, getPreferenceScreen(), getDashboardCategory());
-        ShadowLooper.runUiThreadTasks();
-        verifyNoMoreInteractions(mPackageManager);
-    }
-
-    @Test
-    @Config(shadows = {
-            ShadowTileUtils.class,
-    })
-    public void updateTilesData_shouldUpdateMatchingPreference() {
-        Bundle bundle = new Bundle();
-        bundle.putString(TileUtils.META_DATA_PREFERENCE_ICON_URI, URI_GET_ICON);
-        bundle.putString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI, URI_GET_SUMMARY);
-
-        PreferenceScreen screen = getPreferenceScreen();
-        DashboardCategory dashboardCategory = getDashboardCategory();
-        dashboardCategory.getTile(0).intent = new Intent().setPackage("package");
-        dashboardCategory.getTile(0).metaData = bundle;
-
-        mImpl.updatePreferencesToRunOnWorkerThread(mContext, screen, dashboardCategory);
-        ShadowLooper.runUiThreadTasks();
-        verify(screen.findPreference(MOCK_KEY)).setIcon(mMockDrawable);
-        verify(screen.findPreference(MOCK_KEY)).setSummary(MOCK_SUMMARY);
-    }
-
-    @Test
-    @Config(shadows = {
-            ShadowTileUtils.class,
-    })
-    public void updateTilesData_shouldNotUpdateAlreadyUpdatedPreference() {
-        Bundle bundle = new Bundle();
-        bundle.putString(TileUtils.META_DATA_PREFERENCE_ICON_URI, URI_GET_ICON);
-        bundle.putString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI, URI_GET_SUMMARY);
-
-        PreferenceScreen screen = getPreferenceScreen();
-        when(screen.findPreference(MOCK_KEY).getSummary()).thenReturn(MOCK_SUMMARY);
-        when(screen.findPreference(MOCK_KEY).getIcon()).thenReturn(mMockDrawable);
-
-        DashboardCategory dashboardCategory = getDashboardCategory();
-        dashboardCategory.getTile(0).intent = new Intent().setPackage("package");
-        dashboardCategory.getTile(0).metaData = bundle;
-
-        mImpl.updatePreferencesToRunOnWorkerThread(mContext, screen, dashboardCategory);
-        ShadowLooper.runUiThreadTasks();
-        verify(screen.findPreference(MOCK_KEY), never()).setSummary(anyString());
-    }
-
-    @Test
-    public void initPreferences_shouldLoadDefaults() {
-        PreferenceScreen screen = getPreferenceScreen();
-        DashboardCategory dashboardCategory = getDashboardCategory();
-        dashboardCategory.getTile(0).metaData = new Bundle();
-
-        mImpl.initPreferences(mContext, screen, dashboardCategory);
-        verify(screen.findPreference(MOCK_KEY)).setIcon(SecurityFeatureProviderImpl.DEFAULT_ICON);
-        verify(screen.findPreference(MOCK_KEY))
-                .setSummary(mContext.getString(R.string.summary_placeholder));
-    }
-
-    @Test
-    @Config(shadows = {
-            ShadowTileUtils.class,
-    })
-    public void initPreferences_shouldLoadCached() {
-        Bundle bundle = new Bundle();
-        bundle.putString(TileUtils.META_DATA_PREFERENCE_ICON_URI, URI_GET_ICON);
-        bundle.putString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI, URI_GET_SUMMARY);
-
-        PreferenceScreen screen = getPreferenceScreen();
-        DashboardCategory dashboardCategory = getDashboardCategory();
-        dashboardCategory.getTile(0).metaData = bundle;
-
-        SecurityFeatureProviderImpl.sIconCache.put(
-                URI_GET_ICON,
-                ShadowTileUtils.getIconFromUri(null, null, null, null));
-        SecurityFeatureProviderImpl.sSummaryCache.put(
-                URI_GET_SUMMARY,
-                MOCK_SUMMARY);
-
-        mImpl.initPreferences(mContext, screen, dashboardCategory);
-        verify(screen.findPreference(MOCK_KEY)).setIcon(mMockDrawable);
-        verify(screen.findPreference(MOCK_KEY)).setSummary(MOCK_SUMMARY);
-    }
-
-    private PreferenceScreen getPreferenceScreen() {
-        final PreferenceScreen screen = mock(PreferenceScreen.class);
-        final Preference pref = mock(Preference.class);
-        when(screen.findPreference(MOCK_KEY)).thenReturn(pref);
-        when(pref.getKey()).thenReturn(MOCK_KEY);
-        return screen;
-    }
-
-    private static DashboardCategory getDashboardCategory() {
-        DashboardCategory dashboardCategory = new DashboardCategory();
-        Tile tile = new Tile();
-        tile.key = MOCK_KEY;
-        dashboardCategory.addTile(tile);
-        return dashboardCategory;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
deleted file mode 100644
index a7a9706638f03e7ac0f74a9b4d1ddfef8ee7d589..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.suggestions;
-
-import static com.android.settings.TestConfig.MANIFEST_PATH;
-import static com.google.common.truth.Truth.assertThat;
-
-import android.annotation.StringRes;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.fingerprint.FingerprintSuggestionActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.manifest.ActivityData;
-import org.robolectric.manifest.AndroidManifest;
-import org.robolectric.manifest.IntentFilterData;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SettingsSuggestionsTest {
-
-    private static final String CATEGORY_FIRST_IMPRESSION =
-            "com.android.settings.suggested.category.FIRST_IMPRESSION";
-
-    private static final String CATEGORY_SETTINGS_ONLY =
-            "com.android.settings.suggested.category.SETTINGS_ONLY";
-
-    @Test
-    public void wallpaperSuggestion_isValid() {
-        assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
-                CATEGORY_FIRST_IMPRESSION,
-                R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
-    }
-
-    @Test
-    public void fingerprintSuggestion_isValid() {
-        assertSuggestionEquals(
-                FingerprintSuggestionActivity.class.getName(),
-                CATEGORY_FIRST_IMPRESSION,
-                R.string.suggestion_additional_fingerprints,
-                R.string.suggestion_additional_fingerprints_summary);
-    }
-
-    @Test
-    public void wifiCallingSuggestion_isValid() {
-        assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
-                CATEGORY_FIRST_IMPRESSION,
-                R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
-    }
-
-    @Test
-    public void nightDisplaySuggestion_isValid() {
-        assertSuggestionEquals("Settings$NightDisplaySuggestionActivity",
-            CATEGORY_FIRST_IMPRESSION,
-            R.string.night_display_suggestion_title, R.string.night_display_suggestion_summary);
-    }
-
-    private void assertSuggestionEquals(String activityName, String category, @StringRes int title,
-            @StringRes int summary) {
-        final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
-        final ActivityData activityData = androidManifest.getActivityData(activityName);
-        final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
-        final Context context = RuntimeEnvironment.application;
-        final String expectedTitle = context.getString(title);
-        final String expectedSummary = context.getString(summary);
-
-        final String pName = context.getPackageName();
-        final String actualTitle = context.getString(context.getResources().getIdentifier(
-                ((String) metaData.get("com.android.settings.title")).substring(8), "string",
-                pName));
-        final String actualSummary = context.getString(context.getResources().getIdentifier(
-                ((String) metaData.get("com.android.settings.summary")).substring(8), "string",
-                pName));
-        assertThat(actualTitle).isEqualTo(expectedTitle);
-        assertThat(actualSummary).isEqualTo(expectedSummary);
-
-        final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
-        final List<String> categories = new ArrayList<>();
-        for (IntentFilterData intentFilter : intentFilters) {
-            categories.addAll(intentFilter.getCategories());
-        }
-
-        assertThat(categories).contains(category);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
deleted file mode 100644
index 75551e54ab4700de96d05e633b58ec0acd3a23df..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.support;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ResolveInfo;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.res.builder.RobolectricPackageManager;
-
-import static com.android.settings.support.NewDeviceIntroSuggestionActivity
-        .PERMANENT_DISMISS_THRESHOLD;
-import static com.android.settings.support.NewDeviceIntroSuggestionActivity
-        .PREF_KEY_SUGGGESTION_COMPLETE;
-import static com.android.settings.support.NewDeviceIntroSuggestionActivity
-        .PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME;
-import static com.android.settings.support.NewDeviceIntroSuggestionActivity.isSuggestionComplete;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NewDeviceIntroSuggestionActivityTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private Context mContext;
-    private RobolectricPackageManager mRobolectricPackageManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest(mMockContext);
-        mContext = RuntimeEnvironment.application;
-        mRobolectricPackageManager = RuntimeEnvironment.getRobolectricPackageManager();
-
-        when(mFeatureFactory.suggestionsFeatureProvider.getSharedPrefs(any(Context.class)))
-                .thenReturn(getSharedPreferences());
-    }
-
-    @Test
-    public void isSuggestionComplete_notSupported_shouldReturnTrue() {
-        when(mMockContext.getResources()
-                .getBoolean(R.bool.config_new_device_intro_suggestion_supported))
-                .thenReturn(false);
-
-        assertThat(isSuggestionComplete(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void isSuggestionComplete_suggestionExpired_shouldReturnTrue() {
-        final long currentTime = System.currentTimeMillis();
-
-        getSharedPreferences().edit().putLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME,
-                currentTime - 2 * PERMANENT_DISMISS_THRESHOLD);
-        assertThat(isSuggestionComplete(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void isSuggestionComplete_noUrl_shouldReturnTrue() {
-        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
-                .thenReturn(null);
-        assertThat(isSuggestionComplete(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void isSuggestionComplete_alreadyLaunchedBefore_shouldReturnTrue() {
-        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
-                .thenReturn("https://com.android.settings");
-
-        getSharedPreferences().edit().putBoolean(PREF_KEY_SUGGGESTION_COMPLETE, true).commit();
-
-        assertThat(isSuggestionComplete(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void isSuggestionComplete_notExpiredAndCanOpenUrlInBrowser_shouldReturnFalse() {
-        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
-                .thenReturn("https://com.android.settings");
-
-        final Intent intent = NewDeviceIntroSuggestionActivity.getLaunchIntent(mContext);
-        mRobolectricPackageManager.addResolveInfoForIntent(intent, new ResolveInfo());
-        assertThat(isSuggestionComplete(mContext)).isFalse();
-    }
-
-    private SharedPreferences getSharedPreferences() {
-        return mContext.getSharedPreferences("test_new_device_sugg", Context.MODE_PRIVATE);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
deleted file mode 100644
index 28b0a9df1d00f34ab83c0c33f43e656e40d594d1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.support;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SupportConfigTest {
-
-    @Test
-    public void getConfigForSupportFeature_shouldBeDisabled() {
-        final boolean supportEnabled = RuntimeEnvironment.application.getResources()
-                .getBoolean(R.bool.config_support_enabled);
-        assertThat(supportEnabled).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
deleted file mode 100644
index 2c59ba79376ba22e6e4706fc47cebe769a0b4811..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.support;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchIndexableRaw;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SupportDashboardActivityTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void shouldIndexSearchActivityForSearch() {
-        final List<SearchIndexableRaw> indexables =
-                SupportDashboardActivity.SEARCH_INDEX_DATA_PROVIDER
-                        .getRawDataToIndex(mContext, true /* enabled */);
-
-        assertThat(indexables).hasSize(1);
-
-        final SearchIndexableRaw value = indexables.get(0);
-
-        assertThat(value.title).isEqualTo(mContext.getString(R.string.page_tab_title_support));
-        assertThat(value.screenTitle).isEqualTo(mContext.getString(R.string.settings_label));
-        assertThat(value.intentTargetPackage).isEqualTo(mContext.getPackageName());
-        assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName());
-        assertThat(value.intentAction).isEqualTo(Intent.ACTION_MAIN);
-    }
-
-    @Test
-    public void shouldHandleIntentAction() {
-        RuntimeEnvironment.getRobolectricPackageManager().setQueryIntentImplicitly(true);
-        // Intent action used by setup wizard to start support settings
-        Intent intent = new Intent("com.android.settings.action.SUPPORT_SETTINGS");
-        ResolveInfo resolveInfo = RuntimeEnvironment.getPackageManager().resolveActivity(
-                intent,
-                PackageManager.MATCH_DEFAULT_ONLY);
-        assertThat(resolveInfo).isNotNull();
-        assertThat(resolveInfo.activityInfo.targetActivity)
-                .isEqualTo(SupportDashboardActivity.class.getName());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
deleted file mode 100644
index 8cc05e07a91a9837ae2849bae217e82d55c28ad2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.android.settings.support;
-
-import android.accounts.Account;
-import android.annotation.NonNull;
-import android.annotation.StringRes;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.text.Spannable;
-import android.text.style.URLSpan;
-import android.widget.CheckBox;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.SupportFeatureProvider;
-import com.android.settings.overlay.SupportFeatureProvider.SupportType;
-import com.android.settings.support.SupportDisclaimerDialogFragmentTest.SupportDisclaimerShadowResources;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.util.FragmentTestUtil;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.internal.Shadow.directlyOn;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {SupportDisclaimerShadowResources.class})
-public class SupportDisclaimerDialogFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    Context mContext;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-    private SupportFeatureProvider mSupportFeatureProvider;
-
-    private final Account mFakeAccount = new Account("user1", "fake_type");
-
-    private static final int FAKE_RES_ID = -1000;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        mSupportFeatureProvider = mFakeFeatureFactory.getSupportFeatureProvider(mContext);
-        when(mSupportFeatureProvider.getDisclaimerStringResId())
-                .thenReturn(FAKE_RES_ID);
-    }
-
-    @Test
-    public void onClick_DoNotShowCheckedLogsAction() {
-        SupportDisclaimerDialogFragment fragment =
-                SupportDisclaimerDialogFragment.newInstance(mFakeAccount, SupportType.CHAT);
-        FragmentTestUtil.startFragment(fragment);
-
-        // pretend the user selected to skip the dialog in the future
-        CheckBox doNotShow = (CheckBox) fragment.getDialog()
-                .findViewById(R.id.support_disclaimer_do_not_show_again);
-        doNotShow.setChecked(true);
-
-        // verify we logged the action
-        fragment.onClick(fragment.getDialog(), Dialog.BUTTON_POSITIVE);
-        verify(mMetricsFeatureProvider, times(1)).action(any(),
-                eq(MetricsProto.MetricsEvent.ACTION_SKIP_DISCLAIMER_SELECTED));
-    }
-
-    @Test
-    public void onClick_DoNotShowUncheckedDoesNotLogAction() {
-        SupportDisclaimerDialogFragment fragment =
-                SupportDisclaimerDialogFragment.newInstance(mFakeAccount, SupportType.CHAT);
-        FragmentTestUtil.startFragment(fragment);
-
-        // pretend the user selected to skip the dialog in the future
-        CheckBox doNotShow = (CheckBox) fragment.getDialog()
-                .findViewById(R.id.support_disclaimer_do_not_show_again);
-        doNotShow.setChecked(false);
-
-        // verify we logged the action
-        fragment.onClick(fragment.getDialog(), Dialog.BUTTON_POSITIVE);
-        verify(mMetricsFeatureProvider, never()).action(any(),
-                eq(MetricsProto.MetricsEvent.ACTION_SKIP_DISCLAIMER_SELECTED));
-    }
-
-    @Implements(Resources.class)
-    public static class SupportDisclaimerShadowResources extends SettingsShadowResources {
-
-        @Implementation
-        @NonNull public CharSequence getText(@StringRes int id) throws NotFoundException {
-            if (id == FAKE_RES_ID) {
-                Spannable text = Spannable.Factory.getInstance()
-                        .newSpannable("string with url");
-                text.setSpan(new URLSpan("https://google.com"), 0, 1,
-                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                return text;
-            }
-            return directlyOn(realResources, Resources.class).getText(id);
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
deleted file mode 100644
index 116b63ca58fe7c8871346a551ab6a57cce1f898a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.android.settings.survey;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.support.v4.content.LocalBroadcastManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.overlay.SurveyFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SurveyMixinTest {
-
-    private static final String FAKE_KEY = "fake_key";
-    private static final String FAKE_SURVEY_ID = "fake_id";
-
-    private FakeFeatureFactory mFactory;
-    private Context mContext;
-    private SurveyFeatureProvider mProvider;
-    @Mock
-    private BroadcastReceiver mReceiver;
-    @Mock
-    private InstrumentedPreferenceFragment mFragment;
-
-    @Before
-    public void setUp() {
-        // set up the fakefeature factory to mock out the survey provider
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mProvider = mFactory.getSurveyFeatureProvider(mContext);
-        when(mProvider.getSurveyId(any(), eq(FAKE_KEY))).thenReturn(FAKE_SURVEY_ID);
-    }
-
-    @Test
-    public void onResume_triesRegisteringReceiverAndDownloadingWhenNoSurveyDetected() {
-        // Pretend there is no survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
-
-        // Pretend we are an activity that is starting up
-        Activity temp = Robolectric.setupActivity(Activity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onResume();
-
-        // Verify that a download was attempted
-        verify(mProvider, times(1)).downloadSurvey(any(), any(), any());
-        // Verify that we registered a receiver for download completion broadcasts
-        verify(mProvider, times(1)).createAndRegisterReceiver(any());
-        // Verify we did not try to show a survey
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
-    }
-
-    @Test
-    public void onResume_triesShowingSurveyWhenOneIsPresent() {
-        // Pretend there is a survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(0L);
-
-        // Pretend we are an activity that is starting up
-        Activity temp = Robolectric.setupActivity(Activity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onResume();
-
-        // Verify that a download was not attempted
-        verify(mProvider, never()).downloadSurvey(any(), any(), any());
-        // Verify that we did not register a receiver
-        verify(mProvider, never()).createAndRegisterReceiver(any());
-        // Verify we tried to show a survey
-        verify(mProvider, times(1)).showSurveyIfAvailable(any(), any());
-    }
-
-    @Test
-    public void onResume_doesNothingWhenActivityIsNull() {
-        // Pretend the activity died somewhere in the process
-        when(mFragment.getActivity()).thenReturn(null);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onResume();
-
-        // Verify we don't try showing or downloading a survey
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
-        verify(mProvider, never()).downloadSurvey(any(), any(), any());
-    }
-
-    @Test
-    public void onPause_removesReceiverIfPreviouslySet() {
-        // Pretend there is a survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
-
-        // Pretend we are an activity that starts and stops
-        Activity temp = Robolectric.setupActivity(Activity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        when(mProvider.createAndRegisterReceiver(any())).thenReturn(mReceiver);
-        LocalBroadcastManager manager = LocalBroadcastManager.getInstance(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onResume();
-        manager.registerReceiver(mReceiver, new IntentFilter());
-        mixin.onPause();
-
-        // Verify we remove the receiver
-        HashMap<BroadcastReceiver, ArrayList<IntentFilter>> map =
-                ReflectionHelpers.getField(manager, "mReceivers");
-        assertThat(map.containsKey(mReceiver)).isFalse();
-    }
-
-    @Test
-    public void onPause_doesNothingWhenActivityOrReceiverNull() {
-        // Pretend there is a survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
-
-        // Pretend we are an activity that fails to create a receiver properly
-        Activity temp = Robolectric.setupActivity(Activity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onPause();
-
-        // Verify we do nothing;
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
-
-        // pretend the activity died before onPause
-        when(mFragment.getActivity()).thenReturn(null);
-        mixin.onPause();
-
-        // Verify we do nothing
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
deleted file mode 100644
index b986e4f7f5483dce63b001d63a7c1811b71c5fe5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.system;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.when;
-
-import android.accounts.AccountManager;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settings.testutils.shadow.ShadowUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {ShadowSecureSettings.class, ShadowUtils.class}
-)
-public class FactoryResetPreferenceControllerTest {
-
-    private static final String FACTORY_RESET_KEY = "factory_reset";
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private AccountManager mAccountManager;
-
-    private FactoryResetPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
-        mController = new FactoryResetPreferenceController(mContext);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowUtils.reset();
-    }
-
-    @Test
-    public void isAvailable_systemUser() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_nonSystemUser() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-        ShadowUtils.setIsDemoUser(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_demoUser() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-        ShadowUtils.setIsDemoUser(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(FACTORY_RESET_KEY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
deleted file mode 100644
index cd2595300ce01e79056795923bae8c781462498a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.system;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowUserManager.class,
-                SettingsShadowResources.class,
-        })
-public class SystemDashboardFragmentTest {
-
-    @Before
-    public void setup() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_supportSystemNavigationKeys, true);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = spy(RuntimeEnvironment.application);
-        UserManager manager = mock(UserManager.class);
-        when(manager.isAdminUser()).thenReturn(false);
-        doReturn(manager).when(context).getSystemService(Context.USER_SERVICE);
-        final List<String> niks = SystemDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final int xmlId = (new SystemDashboardFragment()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/ApplicationTestUtils.java b/tests/robotests/src/com/android/settings/testutils/ApplicationTestUtils.java
deleted file mode 100644
index 352d128f34d024770e5aafe50c88eaf56278e805..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/ApplicationTestUtils.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.testutils;
-
-import android.content.pm.ApplicationInfo;
-
-/**
- * Helper for mocking installed applications.
- */
-public class ApplicationTestUtils {
-    /**
-     * Create and populate an {@link android.content.pm.ApplicationInfo} object that describes an
-     * installed app.
-     *
-     * @param uid The app's uid
-     * @param packageName The app's package name.
-     * @param flags Flags describing the app. See {@link android.content.pm.ApplicationInfo#flags}
-     *         for possible values.
-     * @param targetSdkVersion The app's target SDK version
-     *
-     * @see android.content.pm.ApplicationInfo
-     */
-    public static ApplicationInfo buildInfo(int uid, String packageName, int flags,
-            int targetSdkVersion) {
-        final ApplicationInfo info = new ApplicationInfo();
-        info.uid = uid;
-        info.packageName = packageName;
-        info.flags = flags;
-        info.targetSdkVersion = targetSdkVersion;
-        return info;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
deleted file mode 100644
index 2bdab279f6a381967bf82d1a8ab4b11fdfb03d36..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils;
-
-import android.content.Intent;
-import android.os.BatteryManager;
-
-public class BatteryTestUtils {
-
-    public static Intent getChargingIntent() {
-        return getCustomBatteryIntent(
-                BatteryManager.BATTERY_PLUGGED_AC,
-                50 /* level */,
-                100 /* scale */,
-                BatteryManager.BATTERY_STATUS_CHARGING);
-    }
-
-    public static Intent getDischargingIntent() {
-        return getCustomBatteryIntent(
-                0 /* plugged */,
-                10 /* level */,
-                100 /* scale */,
-                BatteryManager.BATTERY_STATUS_DISCHARGING);
-    }
-
-    public static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) {
-        Intent intent = new Intent();
-        intent.putExtra(BatteryManager.EXTRA_PLUGGED, plugged);
-        intent.putExtra(BatteryManager.EXTRA_LEVEL, level);
-        intent.putExtra(BatteryManager.EXTRA_SCALE, scale);
-        intent.putExtra(BatteryManager.EXTRA_STATUS, status);
-
-        return intent;
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
deleted file mode 100644
index 7472996e0360cbdd93d61780a3d9e0d5ab122949..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils;
-
-import android.content.Context;
-
-import com.android.settings.search.IndexDatabaseHelper;
-
-import java.lang.reflect.Field;
-
-public class DatabaseTestUtils {
-
-    public static void clearDb(Context context) {
-        IndexDatabaseHelper helper = IndexDatabaseHelper.getInstance(context);
-        helper.close();
-
-        Field instance;
-        Class clazz = IndexDatabaseHelper.class;
-        try {
-            instance = clazz.getDeclaredField("sSingleton");
-            instance.setAccessible(true);
-            instance.set(null, null);
-        } catch (Exception e) {
-            throw new RuntimeException();
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
deleted file mode 100644
index 6da7a6655c53c6a5a3c11dd83cc38a23988bcdc7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.testutils;
-
-import android.content.Context;
-
-import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.bluetooth.BluetoothFeatureProvider;
-import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.dashboard.DashboardFeatureProvider;
-import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
-import com.android.settings.datausage.DataPlanFeatureProvider;
-import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
-import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
-import com.android.settings.gestures.AssistGestureFeatureProvider;
-import com.android.settings.localepicker.LocaleFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.overlay.SupportFeatureProvider;
-import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.search.SearchFeatureProvider;
-import com.android.settings.overlay.SurveyFeatureProvider;
-import com.android.settings.users.UserFeatureProvider;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Test util to provide fake FeatureFactory. To use this factory, call {@code setupForTest} in
- * {@code @Before} method of the test class.
- */
-public class FakeFeatureFactory extends FeatureFactory {
-
-    public final SupportFeatureProvider supportFeatureProvider;
-    public final MetricsFeatureProvider metricsFeatureProvider;
-    public final PowerUsageFeatureProvider powerUsageFeatureProvider;
-    public final DashboardFeatureProvider dashboardFeatureProvider;
-    public final LocaleFeatureProvider localeFeatureProvider;
-    public final ApplicationFeatureProvider applicationFeatureProvider;
-    public final EnterprisePrivacyFeatureProvider enterprisePrivacyFeatureProvider;
-    public final SearchFeatureProvider searchFeatureProvider;
-    public final SurveyFeatureProvider surveyFeatureProvider;
-    public final SecurityFeatureProvider securityFeatureProvider;
-    public final SuggestionFeatureProvider suggestionsFeatureProvider;
-    public final UserFeatureProvider userFeatureProvider;
-    public final AssistGestureFeatureProvider assistGestureFeatureProvider;
-    public final BluetoothFeatureProvider bluetoothFeatureProvider;
-    public final DataPlanFeatureProvider dataPlanFeatureProvider;
-    public final SmsMirroringFeatureProvider smsMirroringFeatureProvider;
-
-    /**
-     * Call this in {@code @Before} method of the test class to use fake factory.
-     *
-     * @param context The context must be a deep mock.
-     */
-    public static FakeFeatureFactory setupForTest(Context context) {
-        sFactory = null;
-        when(context.getString(com.android.settings.R.string.config_featureFactory))
-                .thenReturn(FakeFeatureFactory.class.getName());
-        try {
-            Class c = FakeFeatureFactory.class;
-            when(context.getClassLoader().loadClass(anyString())).thenReturn(c);
-        } catch (ClassNotFoundException e) {
-            // Ignore.
-        }
-        return (FakeFeatureFactory) FakeFeatureFactory.getFactory(context);
-    }
-
-    /**
-     * Used by reflection. Do not call directly.
-     */
-    public FakeFeatureFactory() {
-        supportFeatureProvider = mock(SupportFeatureProvider.class);
-        metricsFeatureProvider = mock(MetricsFeatureProvider.class);
-        powerUsageFeatureProvider = mock(PowerUsageFeatureProvider.class);
-        dashboardFeatureProvider = mock(DashboardFeatureProvider.class);
-        localeFeatureProvider = mock(LocaleFeatureProvider.class);
-        applicationFeatureProvider = mock(ApplicationFeatureProvider.class);
-        enterprisePrivacyFeatureProvider = mock(EnterprisePrivacyFeatureProvider.class);
-        searchFeatureProvider = mock(SearchFeatureProvider.class);
-        surveyFeatureProvider = mock(SurveyFeatureProvider.class);
-        securityFeatureProvider = mock(SecurityFeatureProvider.class);
-        suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);
-        userFeatureProvider = mock(UserFeatureProvider.class);
-        assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
-        bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
-        dataPlanFeatureProvider = mock(DataPlanFeatureProvider.class);
-        smsMirroringFeatureProvider = mock(SmsMirroringFeatureProvider.class);
-    }
-
-    @Override
-    public SuggestionFeatureProvider getSuggestionFeatureProvider(Context context) {
-        return suggestionsFeatureProvider;
-    }
-
-    @Override
-    public SupportFeatureProvider getSupportFeatureProvider(Context context) {
-        return supportFeatureProvider;
-    }
-
-    @Override
-    public MetricsFeatureProvider getMetricsFeatureProvider() {
-        return metricsFeatureProvider;
-    }
-
-    @Override
-    public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
-        return powerUsageFeatureProvider;
-    }
-
-    @Override
-    public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
-        return dashboardFeatureProvider;
-    }
-
-    @Override
-    public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
-        return applicationFeatureProvider;
-    }
-
-    @Override
-    public LocaleFeatureProvider getLocaleFeatureProvider() {
-        return localeFeatureProvider;
-    }
-
-    @Override
-    public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
-        return enterprisePrivacyFeatureProvider;
-    }
-
-    @Override
-    public SearchFeatureProvider getSearchFeatureProvider() {
-        return searchFeatureProvider;
-    }
-
-    @Override
-    public SurveyFeatureProvider getSurveyFeatureProvider(Context context) {
-        return surveyFeatureProvider;
-    }
-
-    @Override
-    public SecurityFeatureProvider getSecurityFeatureProvider() {
-        return securityFeatureProvider;
-    }
-
-    @Override
-    public UserFeatureProvider getUserFeatureProvider(Context context) {
-        return userFeatureProvider;
-    }
-
-    @Override
-    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
-        return bluetoothFeatureProvider;
-    }
-
-    @Override
-    public DataPlanFeatureProvider getDataPlanFeatureProvider() {
-        return dataPlanFeatureProvider;
-    }
-
-    @Override
-    public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
-        return assistGestureFeatureProvider;
-    }
-
-    @Override
-    public SmsMirroringFeatureProvider getSmsMirroringFeatureProvider() {
-        return smsMirroringFeatureProvider;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java
deleted file mode 100644
index 2305edbe24e2d02e5eba552f36ec71612d09d0be..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils;
-
-import static com.google.common.truth.Truth.assertAbout;
-
-import static org.robolectric.RuntimeEnvironment.application;
-
-import android.support.annotation.Nullable;
-
-import com.google.common.truth.ComparableSubject;
-import com.google.common.truth.FailureStrategy;
-import com.google.common.truth.SubjectFactory;
-
-/**
- * Custom subject for use with {@link com.google.common.truth.Truth}, to provide a more readable
- * error message, so that instead of "Not true that 2130706432 equals to 17170444", it will say
- * "Not true that color/my_color equals to android:color/black".
- *
- * <p>Usage:
- * <pre>{@code
- *     ResIdSubject.assertResId(activity.getThemeResId()).isEqualTo(android.R.style.Theme_Material)
- * }</pre>
- */
-public class ResIdSubject extends ComparableSubject<ResIdSubject, Integer> {
-
-    public static final SubjectFactory<ResIdSubject, Integer> FACTORY =
-            new SubjectFactory<ResIdSubject, Integer>() {
-                @Override
-                public ResIdSubject getSubject(
-                        FailureStrategy failureStrategy, Integer integer) {
-                    return new ResIdSubject(failureStrategy, integer);
-                }
-            };
-
-    public static ResIdSubject assertResId(int resId) {
-        return assertAbout(ResIdSubject.FACTORY).that(resId);
-    }
-
-    public ResIdSubject(
-            FailureStrategy failureStrategy,
-            @Nullable Integer integer) {
-        super(failureStrategy, integer);
-    }
-
-    public void isEqualTo(int other) {
-        Integer subject = getSubject();
-        if (subject == null || subject != other) {
-            fail("equals to", resIdToString(other));
-        }
-    }
-
-    @Override
-    protected String getDisplaySubject() {
-        String resourceName = "<" + resIdToString(getSubject()) + ">";
-        String customName = internalCustomName();
-        if (customName != null) {
-            return customName + " " + resourceName;
-        } else {
-            return resourceName;
-        }
-    }
-
-    private static String resIdToString(int resId) {
-        return application.getResources().getResourceName(resId);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
deleted file mode 100644
index 91bfff28c7baa5344a6e41ef0f8a96c8862258ce..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.testutils;
-
-import android.app.Fragment;
-import android.content.Intent;
-
-import org.junit.runners.model.InitializationError;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.manifest.AndroidManifest;
-import org.robolectric.res.Fs;
-import org.robolectric.res.ResourcePath;
-import org.robolectric.util.ActivityController;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
-import static org.robolectric.Robolectric.getShadowsAdapter;
-
-import com.android.settings.SettingsActivity;
-
-/**
- * Custom test runner for the testing of BluetoothPairingDialogs. This is needed because the
- * default behavior for robolectric is just to grab the resource directory in the target package.
- * We want to override this to add several spanning different projects.
- */
-public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
-
-    /**
-     * We don't actually want to change this behavior, so we just call super.
-     */
-    public SettingsRobolectricTestRunner(Class<?> testClass) throws InitializationError {
-        super(testClass);
-    }
-
-    /**
-     * We are going to create our own custom manifest so that we can add multiple resource
-     * paths to it. This lets us access resources in both Settings and SettingsLib in our tests.
-     */
-    @Override
-    protected AndroidManifest getAppManifest(Config config) {
-        // Using the manifest file's relative path, we can figure out the application directory.
-        final String appRoot = "packages/apps/Settings";
-        final String manifestPath = appRoot + "/AndroidManifest.xml";
-        final String resDir = appRoot + "/tests/robotests/res";
-        final String assetsDir = appRoot + config.assetDir();
-
-        // By adding any resources from libraries we need the AndroidManifest, we can access
-        // them from within the parallel universe's resource loader.
-        final AndroidManifest manifest = new AndroidManifest(Fs.fileFromPath(manifestPath),
-                Fs.fileFromPath(resDir), Fs.fileFromPath(assetsDir)) {
-            @Override
-            public List<ResourcePath> getIncludedResourcePaths() {
-                List<ResourcePath> paths = super.getIncludedResourcePaths();
-                SettingsRobolectricTestRunner.getIncludedResourcePaths(getPackageName(), paths);
-                return paths;
-            }
-        };
-
-        // Set the package name to the renamed one
-        manifest.setPackageName("com.android.settings");
-        return manifest;
-    }
-
-    public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) {
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./packages/apps/Settings/res"),
-                null));
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
-                null));
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./frameworks/base/core/res/res"),
-                null));
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
-                null));
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"),
-                null));
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"),
-                null));
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
-                null));
-        paths.add(new ResourcePath(
-                packageName,
-                Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
-                null));
-    }
-
-    // A simple utility class to start a Settings fragment with an intent. The code here is almost
-    // the same as FragmentTestUtil.startFragment except that it starts an activity with an intent.
-    public static void startSettingsFragment(
-            Fragment fragment, Class<? extends SettingsActivity> activityClass) {
-        Intent intent = new Intent().putExtra(EXTRA_SHOW_FRAGMENT, fragment.getClass().getName());
-        SettingsActivity activity = ActivityController.of(
-                getShadowsAdapter(), ReflectionHelpers.callConstructor(activityClass), intent)
-                .setup().get();
-        activity.getFragmentManager().beginTransaction().add(fragment, null).commit();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
deleted file mode 100644
index 4f5600226fbff9932b46a3a593c11232cdad16f5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.android.settings.testutils;
-
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.Xml;
-import com.android.settings.search.XmlParserUtils;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Util class for parsing XML
- */
-public class XmlTestUtils {
-
-    /**
-     * Parses a preference screen's xml, collects and returns all keys used by preferences
-     * on the screen.
-     *
-     * @param context of the preference screen.
-     * @param xmlId of the Preference Xml to be parsed.
-     * @return List of all keys in the preference Xml
-     */
-    public static List<String> getKeysFromPreferenceXml(Context context, int xmlId) {
-        final XmlResourceParser parser = context.getResources().getXml(xmlId);
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        final List<String> keys = new ArrayList<>();
-        String key;
-        try {
-            while (parser.next() != XmlPullParser.END_DOCUMENT) {
-                try {
-                    key = XmlParserUtils.getDataKey(context, attrs);
-                    if (!TextUtils.isEmpty(key)) {
-                        keys.add(key);
-                    }
-                } catch (NullPointerException e) {
-                    continue;
-                } catch (Resources.NotFoundException e) {
-                    continue;
-                }
-            }
-        } catch (java.io.IOException e) {
-            return null;
-        } catch (XmlPullParserException e) {
-            return null;
-        }
-
-        return keys;
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java
deleted file mode 100644
index 00aa9ec8244fc605301b05384c438f4bc1b13ca2..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.bluetooth.BluetoothDevice;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import org.robolectric.shadows.ShadowBluetoothDevice;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(BluetoothDevice.class)
-public class SettingsShadowBluetoothDevice {
-    private String mAddress;
-
-    public void __constructor__(String address) {
-        mAddress = address;
-    }
-
-    @Implementation
-    public String getAddress() {
-        return mAddress;
-    }
-
-    @Implementation
-    public int hashCode() {
-        return mAddress.hashCode();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
deleted file mode 100644
index c56438fcedf3ae454c5d4f40bbfbe681d25beef0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import static android.util.TypedValue.TYPE_REFERENCE;
-
-import static org.robolectric.RuntimeEnvironment.application;
-import static org.robolectric.Shadows.shadowOf;
-import static org.robolectric.internal.Shadow.directlyOn;
-
-import android.annotation.DimenRes;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.content.res.Resources.Theme;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.ColorRes;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.util.SparseArray;
-import android.util.TypedValue;
-
-import com.android.settings.R;
-
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.RealObject;
-import org.robolectric.internal.Shadow;
-import org.robolectric.res.StyleData;
-import org.robolectric.res.StyleResolver;
-import org.robolectric.res.builder.XmlResourceParserImpl;
-import org.robolectric.shadows.ShadowAssetManager;
-import org.robolectric.shadows.ShadowResources;
-import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.util.ReflectionHelpers.ClassParameter;
-import org.w3c.dom.Node;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot
- * handle because they are too new or private.
- */
-@Implements(Resources.class)
-public class SettingsShadowResources extends ShadowResources {
-
-    @RealObject
-    public Resources realResources;
-
-    private static SparseArray<Object> sResourceOverrides = new SparseArray<>();
-
-    public static void overrideResource(int id, Object value) {
-        sResourceOverrides.put(id, value);
-    }
-
-    public static void overrideResource(String name, Object value) {
-        final Resources res = application.getResources();
-        final int resId = res.getIdentifier(name, null, null);
-        if (resId == 0) {
-            throw new Resources.NotFoundException("Cannot override \"" + name + "\"");
-        }
-        overrideResource(resId, value);
-    }
-
-    public static void reset() {
-        sResourceOverrides.clear();
-    }
-
-    @Implementation
-    public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException {
-        // Handle requests for private dimension resources,
-        // TODO: Consider making a set of private dimension resource ids if this happens repeatedly.
-        if (id == com.android.internal.R.dimen.preference_fragment_padding_bottom) {
-            return 0;
-        }
-        return directlyOn(realResources, Resources.class).getDimensionPixelSize(id);
-    }
-
-    @Implementation
-    public int getColor(@ColorRes int id, @Nullable Theme theme) throws NotFoundException {
-        if (id == R.color.battery_icon_color_error) {
-            return Color.WHITE;
-        }
-        return directlyOn(realResources, Resources.class).getColor(id, theme);
-    }
-
-    @Implementation
-    public ColorStateList getColorStateList(@ColorRes int id, @Nullable Theme theme)
-            throws NotFoundException {
-        if (id == com.android.internal.R.color.text_color_primary) {
-            return ColorStateList.valueOf(Color.WHITE);
-        }
-        return directlyOn(realResources, Resources.class).getColorStateList(id, theme);
-    }
-
-    @Implementation
-    public Drawable loadDrawable(TypedValue value, int id, Theme theme)
-            throws NotFoundException {
-        // The drawable item in switchbar_background.xml refers to a very recent color attribute
-        // that Robolectric isn't yet aware of.
-        // TODO: Remove this once Robolectric is updated.
-        if (id == R.drawable.switchbar_background) {
-            return new ColorDrawable();
-        } else if (id == R.drawable.ic_launcher_settings) {
-            // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric,
-            // change it to a normal drawable.
-            id = R.drawable.ic_settings_wireless;
-        } else if (id == R.drawable.app_filter_spinner_background) {
-            id = R.drawable.ic_expand_more_inverse;
-        } else if (id == R.drawable.selectable_card_grey) {
-            id = R.drawable.ic_expand_more_inverse;
-        }
-        return super.loadDrawable(value, id, theme);
-    }
-
-    @Implementation
-    public int[] getIntArray(@ArrayRes int id) throws NotFoundException {
-        // The Robolectric isn't aware of resources in settingslib, so we need to stub it here
-        if (id == com.android.settings.R.array.batterymeter_bolt_points
-                || id == com.android.settings.R.array.batterymeter_plus_points) {
-            return new int[2];
-        }
-        return directlyOn(realResources, Resources.class).getIntArray(id);
-    }
-
-    @Implementation
-    public String getString(int id) {
-        final Object override = sResourceOverrides.get(id);
-        if (override instanceof String) {
-            return (String) override;
-        }
-        return Shadow.directlyOn(
-                realResources, Resources.class, "getString", ClassParameter.from(int.class, id));
-    }
-
-    @Implementation
-    public int getInteger(int id) {
-        final Object override = sResourceOverrides.get(id);
-        if (override instanceof Integer) {
-            return (Integer) override;
-        }
-        return Shadow.directlyOn(
-                realResources, Resources.class, "getInteger", ClassParameter.from(int.class, id));
-    }
-
-    @Implementation
-    public boolean getBoolean(int id) {
-        final Object override = sResourceOverrides.get(id);
-        if (override instanceof Boolean) {
-            return (boolean) override;
-        }
-        return Shadow.directlyOn(realResources, Resources.class, "getBoolean",
-                ClassParameter.from(int.class, id));
-    }
-
-    @Implements(Theme.class)
-    public static class SettingsShadowTheme extends ShadowTheme {
-
-        @RealObject
-        Theme realTheme;
-
-        @Implementation
-        public TypedArray obtainStyledAttributes(
-                AttributeSet set, int[] attrs, int defStyleAttr, int defStyleRes) {
-            // Replace all private string references with a placeholder.
-            if (set != null) {
-                for (int i = 0; i < set.getAttributeCount(); ++i) {
-                    String attributeValue = set.getAttributeValue(i);
-                    Node node = ReflectionHelpers.callInstanceMethod(
-                            XmlResourceParserImpl.class, set, "getAttributeAt",
-                            ReflectionHelpers.ClassParameter.from(int.class, i));
-                    if (attributeValue.contains("attr/fingerprint_layout_theme")) {
-                        // Workaround for https://github.com/robolectric/robolectric/issues/2641
-                        node.setNodeValue("@style/FingerprintLayoutTheme");
-                    } else if (attributeValue.startsWith("@*android:string")) {
-                        node.setNodeValue("PLACEHOLDER");
-                    }
-                }
-            }
-
-            // Track down all styles and remove all inheritance from private styles.
-            ShadowAssetManager assetManager = shadowOf(RuntimeEnvironment.application.getAssets());
-            // The Object's below are actually ShadowAssetManager.OverlayedStyle. We can't use it
-            // here because it's package private.
-            Map<Long, List<Object>> appliedStylesList =
-                    ReflectionHelpers.getField(assetManager, "appliedStyles");
-            for (Long idx : appliedStylesList.keySet()) {
-                List<Object> appliedStyles = appliedStylesList.get(idx);
-                for (Object appliedStyle : appliedStyles) {
-                    StyleResolver styleResolver = ReflectionHelpers.getField(appliedStyle, "style");
-                    List<StyleData> styleDatas =
-                            ReflectionHelpers.getField(styleResolver, "styles");
-                    for (StyleData styleData : styleDatas) {
-                        if (styleData.getParent() != null &&
-                                styleData.getParent().startsWith("@*android:style")) {
-                            ReflectionHelpers.setField(StyleData.class, styleData, "parent", null);
-                        }
-                    }
-                }
-
-            }
-            return super.obtainStyledAttributes(set, attrs, defStyleAttr, defStyleRes);
-        }
-
-        @Implementation
-        public boolean resolveAttribute(int resid, TypedValue outValue, boolean resolveRefs) {
-            // The real Resources instance in Robolectric tests somehow fails to find the
-            // preferenceTheme attribute in the layout. Let's do it ourselves.
-            if (getResources().getResourceName(resid)
-                    .equals("com.android.settings:attr/preferenceTheme")) {
-                int preferenceThemeResId =
-                        getResources().getIdentifier(
-                                "PreferenceTheme", "style", "com.android.settings");
-                outValue.type = TYPE_REFERENCE;
-                outValue.data = preferenceThemeResId;
-                outValue.resourceId = preferenceThemeResId;
-                return true;
-            }
-            return directlyOn(realTheme, Theme.class)
-                    .resolveAttribute(resid, outValue, resolveRefs);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java
deleted file mode 100644
index 45eb4328b12ea0de0d6e6b0aceb1b50849e9fd91..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.os.SystemProperties;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowSystemProperties;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class provides write capability to ShadowSystemProperties.
- */
-@Implements(SystemProperties.class)
-public class SettingsShadowSystemProperties extends ShadowSystemProperties {
-
-    private static final Map<String, String> sValues = new HashMap<>();
-
-    @Implementation
-    public static synchronized boolean getBoolean(String key, boolean def) {
-        if (sValues.containsKey(key)) {
-            String val = sValues.get(key);
-            return "y".equals(val) || "yes".equals(val) || "1".equals(val) || "true".equals(val)
-                || "on".equals(val);
-        }
-        return ShadowSystemProperties.getBoolean(key, def);
-    }
-
-    @Implementation
-    public static synchronized String get(String key) {
-        if (sValues.containsKey(key)) {
-            return sValues.get(key);
-        }
-        return ShadowSystemProperties.get(key);
-    }
-
-    public static synchronized void set(String key, String val) {
-        sValues.put(key, val);
-    }
-
-    @Implementation
-    public static String get(String key, String def) {
-        String value = sValues.get(key);
-        return value == null ? def : value;
-    }
-
-    public static synchronized void clear() {
-        sValues.clear();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
deleted file mode 100644
index 7e21f1238dff89db6e195444e1b1e4a22179394f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.ComponentName;
-import android.view.accessibility.AccessibilityManager;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Implements(AccessibilityManager.class)
-public class ShadowAccessibilityManager {
-    private static final List<AccessibilityServiceInfo> mInstalledAccessibilityList =
-            new ArrayList<>();
-
-    public static void addAccessibilityService(String serviceName) {
-        AccessibilityServiceInfo serviceInfo = new AccessibilityServiceInfo();
-        serviceInfo.setComponentName(ComponentName.unflattenFromString(serviceName));
-        mInstalledAccessibilityList.add(serviceInfo);
-    }
-
-    @Implementation
-    public List<AccessibilityServiceInfo> getInstalledAccessibilityServiceList() {
-        return mInstalledAccessibilityList;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
deleted file mode 100644
index 95d5de5e5b97e039d37ad9d53dd27990b23f12cf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import com.android.settings.applications.AccessibilityManagerWrapperImpl;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-/**
- * This class provides shadow for API that is not supported in current roboletric
- */
-@Implements(AccessibilityManagerWrapperImpl.class)
-public class ShadowAccessibilityManagerWrapperImpl {
-
-    @Implementation
-    public static boolean isAccessibilityButtonSupported() {
-        return true;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java
deleted file mode 100644
index a6cb5d07bd693c70a99a4e14581ea8a1ea9266d1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.ComponentName;
-
-import com.android.settings.applications.AccessibilityServiceInfoWrapperImpl;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-@Implements(AccessibilityServiceInfoWrapperImpl.class)
-public class ShadowAccessibilityServiceInfoWrapperImpl {
-    private static ComponentName sComponentName;
-
-    public static void setComponentName(String componentName) {
-        sComponentName = ComponentName.unflattenFromString(componentName);;
-    }
-
-    @Implementation
-    public ComponentName getComponentName() {
-        return sComponentName;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java
deleted file mode 100644
index 2bccccc74d3af81a2f068ca4f34efc5c11d9ee3e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(AccountManager.class)
-public class ShadowAccountManager {
-    @Implementation
-    public AuthenticatorDescription[] getAuthenticatorTypesAsUser(int userId) {
-        return null;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java
deleted file mode 100644
index 0125b77fe29f5d4e039c758a2b9b51287f0f75bc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.app.Activity;
-import android.app.LoaderManager;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowActivity;
-
-/*
- * Shadow for {@link Activity} that has LoadManager accessors.
- */
-@Implements(Activity.class)
-public class ShadowActivityWithLoadManager extends ShadowActivity {
-
-    private LoaderManager mLoaderManager;
-
-    @Implementation
-    public LoaderManager getLoaderManager() {
-        return mLoaderManager;
-    }
-
-    // Non-Android setter.
-    public void setLoaderManager(LoaderManager loaderManager) {
-        mLoaderManager = loaderManager;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java
deleted file mode 100644
index 12173c8f1deab4fa7ec829df3add5d4c59bd2742..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.testutils.shadow;
-
-import com.android.settings.applications.AppInfoBase;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(AppInfoBase.class)
-public class ShadowAppInfoBase {
-
-    @Implementation
-    public void onResume() {
-        // No-op.
-    }
-
-    @Implementation
-    public void onPause() {
-        // No-op.
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java
deleted file mode 100644
index 886f94157ea0e804f0e44de5ee5c8df04e87068c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.os.UserHandle;
-import android.os.UserManager;
-import com.android.settings.notification.AudioHelper;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(AudioHelper.class)
-public class ShadowAudioHelper {
-
-    @Implementation
-    public boolean isSingleVolume() {
-        return true;
-    }
-
-    @Implementation
-    public int getManagedProfileId(UserManager um) {
-        return UserHandle.USER_CURRENT;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
deleted file mode 100644
index 4c056654bcb38cf2fe6f770ae3c1cc85694dda47..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.net.ConnectivityManager;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(ConnectivityManager.class)
-public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowConnectivityManager {
-
-    private static boolean mIsNetworkSupported;
-
-    @Implementation
-    public boolean isNetworkSupported(int networkType) {
-        return mIsNetworkSupported;
-    }
-
-    public static void setIsNetworkSupported(boolean isNetworkSupported) {
-        mIsNetworkSupported = isNetworkSupported;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
deleted file mode 100644
index 2e346a2e8493cc37c5b4270f886b39871c888f42..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.accounts.Account;
-import android.content.ContentResolver;
-import android.content.SyncAdapterType;
-
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.provider.SearchIndexablesContract;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Implements(ContentResolver.class)
-public class ShadowContentResolver {
-
-    private static SyncAdapterType[] sSyncAdapterTypes = new SyncAdapterType[0];
-    private static Map<String, Integer> sSyncable = new HashMap<>();
-    private static Map<String, Boolean> sSyncAutomatically = new HashMap<>();
-    private static Map<Integer, Boolean> sMasterSyncAutomatically = new HashMap<>();
-
-    @Implementation
-    public static SyncAdapterType[] getSyncAdapterTypesAsUser(int userId) {
-        return sSyncAdapterTypes;
-    }
-
-    @Implementation
-    public final Cursor query(Uri uri, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder) {
-        MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
-        MatrixCursor.RowBuilder builder = cursor.newRow()
-                .add(SearchIndexablesContract.NonIndexableKey.COLUMN_KEY_VALUE, "");
-        return cursor;
-    }
-
-    @Implementation
-    public static int getIsSyncableAsUser(Account account, String authority, int userId) {
-        return sSyncable.containsKey(authority) ? sSyncable.get(authority) : 1;
-    }
-
-    @Implementation
-    public static boolean getSyncAutomaticallyAsUser(Account account, String authority,
-            int userId) {
-        return sSyncAutomatically.containsKey(authority) ? sSyncAutomatically.get(authority) : true;
-    }
-
-    @Implementation
-    public static boolean getMasterSyncAutomaticallyAsUser(int userId) {
-        return sMasterSyncAutomatically.containsKey(userId)
-                ? sMasterSyncAutomatically.get(userId) : true;
-    }
-
-    public static void setSyncAdapterTypes(SyncAdapterType[] syncAdapterTypes) {
-        sSyncAdapterTypes = syncAdapterTypes;
-    }
-
-    public static void setSyncable(String authority, int syncable) {
-        sSyncable.put(authority, syncable);
-    }
-
-    public static void setSyncAutomatically(String authority, boolean syncAutomatically) {
-        sSyncAutomatically.put(authority, syncAutomatically);
-    }
-
-    public static void setMasterSyncAutomatically(int userId, boolean syncAutomatically) {
-        sMasterSyncAutomatically.put(userId, syncAutomatically);
-    }
-
-    public static void reset() {
-        sSyncable.clear();
-        sSyncAutomatically.clear();
-        sMasterSyncAutomatically.clear();
-        sSyncAdapterTypes = new SyncAdapterType[0];
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java
deleted file mode 100644
index c1f82933b9322cbb2ec4fc76e5a8e7a1e1af72ee..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Handler;
-import android.os.UserHandle;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowContextImpl;
-
-/*
- * Shadow for {@link ContextImpl} that has registerReceiverAsUser method.
- */
-@Implements(className = ShadowContextImpl.CLASS_NAME)
-public class ShadowContextImplWithRegisterReceiver extends ShadowContextImpl {
-
-    @Implementation
-    public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
-            IntentFilter filter, String broadcastPermission, Handler scheduler) {
-        return super.registerReceiver(receiver, filter, broadcastPermission, scheduler);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java
deleted file mode 100644
index 34908ca39a8b945689c4d1398acbbd570167c48a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import com.android.settings.datausage.DataSaverBackend;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(DataSaverBackend.class)
-public class ShadowDataSaverBackend {
-
-    private static boolean isEnabled = true;
-
-    @Implementation
-    public boolean isDataSaverEnabled() {
-        return isEnabled;
-    }
-
-    @Implementation
-    public void setDataSaverEnabled(boolean enabled) {
-        isEnabled = enabled;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
deleted file mode 100644
index fecceb6b90af170ce61bf50e8b8f4cb26f7488a1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-
-import com.android.settings.datausage.DataUsageUtils;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(DataUsageUtils.class)
-public class ShadowDataUsageUtils {
-
-    public static boolean IS_MOBILE_DATA_SUPPORTED = true;
-    public static boolean IS_WIFI_SUPPORTED = true;
-
-    @Implementation
-    public static boolean hasMobileData(Context context) {
-        return IS_MOBILE_DATA_SUPPORTED;
-    }
-
-    @Implementation
-    public static boolean hasWifiRadio(Context context) {
-        return IS_WIFI_SUPPORTED;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
deleted file mode 100644
index f8242970130d7de3db45129b38a5505b03551db7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import android.content.pm.ResolveInfo;
-import com.android.settings.search.DatabaseIndexingUtils;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-/**
- * Shadow of {@link DatabaseIndexingUtils}
- */
-@Implements(DatabaseIndexingUtils.class)
-public class ShadowDatabaseIndexingUtils {
-    @Implementation
-    public static boolean isWellKnownProvider(ResolveInfo info, Context context) {
-        return true;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java
deleted file mode 100644
index 2f37ec8370e7ee94a997470f25a182bdcbdcfa22..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.gestures.DoubleTwistPreferenceController;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(DoubleTwistPreferenceController.class)
-public class ShadowDoubleTwistPreferenceController {
-    private static int sManagedProfileId = UserHandle.USER_NULL;
-    @Implementation
-    public static boolean isGestureAvailable(Context context) {
-        return true;
-    }
-
-    @Implementation
-    public static int getManagedProfileId(UserManager userManager) {
-        return sManagedProfileId;
-    }
-
-    public static void setManagedProfileId(int managedProfileId) {
-        sManagedProfileId = managedProfileId;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
deleted file mode 100644
index 4ec48d35dd23fb97f930bcbd01c6001ef2065c60..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.view.View;
-
-import com.android.settings.widget.EntityHeaderController;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-
-@Implements(value = EntityHeaderController.class, callThroughByDefault = false)
-public class ShadowEntityHeaderController {
-
-    private static EntityHeaderController sMockController;
-
-    public static void setUseMock(EntityHeaderController mockController) {
-        sMockController = mockController;
-    }
-
-    @Resetter
-    public static void reset() {
-        sMockController = null;
-    }
-
-    @Implementation
-    public static EntityHeaderController newInstance(Activity activity, Fragment fragment,
-            View header) {
-        return sMockController;
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java
deleted file mode 100644
index dcced4e40d0765c6b2a9fe73508f74a289831b7a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-
-import android.content.Context;
-
-import com.android.settings.core.instrumentation.EventLogWriter;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(value = EventLogWriter.class, callThroughByDefault = false)
-public class ShadowEventLogWriter {
-    @Implementation
-    public void visible(Context context, int source, int category) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
deleted file mode 100644
index b84cf42ed144022fcaa1e829ff6bfa5b0f223cda..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import android.hardware.fingerprint.Fingerprint;
-import android.hardware.fingerprint.FingerprintManager;
-import android.support.annotation.NonNull;
-
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-import org.robolectric.internal.ShadowExtractor;
-import org.robolectric.shadows.ShadowContextImpl;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-@Implements(FingerprintManager.class)
-public class ShadowFingerprintManager {
-
-    private static Map<String, String> getSystemServiceMap() {
-        return ReflectionHelpers.getStaticField(ShadowContextImpl.class, "SYSTEM_SERVICE_MAP");
-    }
-
-    /**
-     * Call this in @Before of a test to add FingerprintManager to Robolectric's system service
-     * map. Otherwise getSystemService(FINGERPRINT_SERVICE) will return null.
-     */
-    public static void addToServiceMap() {
-        getSystemServiceMap().put(Context.FINGERPRINT_SERVICE, FingerprintManager.class.getName());
-    }
-
-    @Resetter
-    public static void reset() {
-        getSystemServiceMap().remove(Context.FINGERPRINT_SERVICE);
-    }
-
-    public boolean hardwareDetected = true;
-
-    @NonNull
-    private List<Fingerprint> mFingerprints = Collections.emptyList();
-
-    @Implementation
-    public boolean isHardwareDetected() {
-        return hardwareDetected;
-    }
-
-    @Implementation
-    public boolean hasEnrolledFingerprints() {
-        return !mFingerprints.isEmpty();
-    }
-
-    @Implementation
-    public List<Fingerprint> getEnrolledFingerprints() {
-        return mFingerprints;
-    }
-
-    @Implementation
-    public List<Fingerprint> getEnrolledFingerprints(int userId) {
-        return mFingerprints;
-    }
-
-    public void setEnrolledFingerprints(Fingerprint... fingerprints) {
-        mFingerprints = Arrays.asList(fingerprints);
-    }
-
-    public void setDefaultFingerprints(int num) {
-        setEnrolledFingerprints(
-                IntStream.range(0, num)
-                        .mapToObj(i -> new Fingerprint(
-                                "Fingerprint " + i,
-                                0, /* groupId */
-                                i, /* fingerId */
-                                0 /* deviceId */))
-                        .toArray(Fingerprint[]::new));
-    }
-
-    public static ShadowFingerprintManager get() {
-        return (ShadowFingerprintManager) ShadowExtractor.extract(
-                RuntimeEnvironment.application.getSystemService(FingerprintManager.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java
deleted file mode 100644
index 9873502204508604fd7c8c18aac3ba35c23a263b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.settings.SettingsActivity;
-import com.android.settingslib.HelpUtils;
-
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-
-@Implements(HelpUtils.class)
-public class ShadowHelpUtils {
-
-    private static boolean mGetHelpIntentCalled;
-
-    public static boolean isGetHelpIntentCalled() {
-        return mGetHelpIntentCalled;
-    }
-
-    @Resetter
-    public static void reset() {
-        mGetHelpIntentCalled = false;
-    }
-
-    @Implementation
-    public static Intent getHelpIntent(Context context, String helpUriString,
-            String backupContext) {
-        mGetHelpIntentCalled = true;
-        return new Intent().setClassName(
-                RuntimeEnvironment.application.getPackageName(), SettingsActivity.class.getName());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java
deleted file mode 100644
index ecb1b71e67820e6842e27fe5fa07d91c0638bc52..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.view.InputDevice;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Implements(InputDevice.class)
-public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice {
-
-    public static int[] sDeviceIds;
-
-    private static Map<Integer, InputDevice> sDeviceMap = new HashMap<>();
-
-    @Implementation
-    public static int[] getDeviceIds() {
-        return sDeviceIds;
-    }
-
-    @Implementation
-    public static InputDevice getDevice(int id) {
-        return sDeviceMap.get(id);
-    }
-
-    public static void addDevice(int id, InputDevice device) {
-        sDeviceMap.put(id, device);
-    }
-
-    @Resetter
-    public static void reset() {
-        sDeviceIds = null;
-        sDeviceMap.clear();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java
deleted file mode 100644
index 5b09645ac9986f85decf1dbf5651dcf2e8de23a5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.testutils.shadow;
-
-import static org.robolectric.util.ReflectionHelpers.ClassParameter.from;
-
-import android.hardware.input.IInputManager;
-import android.hardware.input.InputManager;
-import android.os.Handler;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/*
- * Shadow for {@ InputManager} that has assessors for registered {@link InputDeviceListener}s.
- */
-@Implements(value = InputManager.class, callThroughByDefault = false)
-public class ShadowInputManager {
-
-    private ArrayList<InputManager.InputDeviceListener> mInputDeviceListeners;
-
-    @Implementation
-    public void __constructor__(IInputManager service) {
-        mInputDeviceListeners = new ArrayList<>();
-    }
-
-    @Implementation
-    public static InputManager getInstance() {
-        return ReflectionHelpers.callConstructor(
-                InputManager.class,
-                from(IInputManager.class, null));
-    }
-
-    @Implementation
-    public void registerInputDeviceListener(InputManager.InputDeviceListener listener,
-            Handler handler) {
-        // TODO: Use handler.
-        if (!mInputDeviceListeners.contains(listener)) {
-            mInputDeviceListeners.add(listener);
-        }
-    }
-
-    @Implementation
-    public void unregisterInputDeviceListener(InputManager.InputDeviceListener listener) {
-        if (mInputDeviceListeners.contains(listener)) {
-            mInputDeviceListeners.remove(listener);
-        }
-    }
-
-    // Non-Android accessor.
-    public List<InputManager.InputDeviceListener> getRegisteredInputDeviceListeners() {
-        return Collections.unmodifiableList(mInputDeviceListeners);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java
deleted file mode 100644
index 0e59fec30ce6c1a04062eca641d87454373d21de..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowInputMethodManager;
-
-import java.util.Collections;
-import java.util.List;
-
-/*
- * Shadow for {@link InputMethodManager} that has accessors for installed input methods.
- */
-@Implements(InputMethodManager.class)
-public class ShadowInputMethodManagerWithMethodList extends ShadowInputMethodManager {
-
-    private List<InputMethodInfo> mInputMethodInfos = Collections.emptyList();
-
-    @Implementation
-    public static InputMethodManager getInstance() {
-        return ShadowInputMethodManager.peekInstance();
-    }
-
-    @Implementation
-    public List<InputMethodInfo> getInputMethodList() {
-        return mInputMethodInfos;
-    }
-
-    // Non-Android setter.
-    public void setInputMethodList(List<InputMethodInfo> inputMethodInfos) {
-        mInputMethodInfos = inputMethodInfos;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
deleted file mode 100644
index 0af9c304942195aaafa4418dedf4a068e31abb97..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import com.android.settings.fuelgauge.anomaly.KeyValueListParserWrapperImpl;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-/**
- * Shadow for {@link KeyValueListParserWrapperImpl} so we could implement
- * {@link #getBoolean(String, boolean)} that doesn't support in the current
- * robolectric
- */
-@Implements(KeyValueListParserWrapperImpl.class)
-public class ShadowKeyValueListParserWrapperImpl {
-
-    @Implementation
-    public boolean getBoolean(String key, boolean defaultValue) {
-        return defaultValue;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLibcoreTimeZoneNames.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLibcoreTimeZoneNames.java
deleted file mode 100644
index 7292234a8bc8cb75df9045c81d20c5e5ad362d7a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLibcoreTimeZoneNames.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import libcore.icu.TimeZoneNames;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.RealObject;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * System.logI used by ZoneStringsCache.create is a method new in API 24 and not available in
- * Robolectric's 6.0 jar. Create a shadow which removes that log call.
- */
-@Implements(value = TimeZoneNames.class, isInAndroidSdk = false)
-public class ShadowLibcoreTimeZoneNames {
-
-    private static final String[] availableTimeZoneIds = TimeZone.getAvailableIDs();
-
-    @Implements(value = TimeZoneNames.ZoneStringsCache.class, isInAndroidSdk = false)
-    public static class ShadowZoneStringsCache {
-
-        @RealObject
-        private TimeZoneNames.ZoneStringsCache mRealObject;
-
-        @Implementation
-        public String[][] create(Locale locale) {
-            // Set up the 2D array used to hold the names. The first column contains the Olson ids.
-            String[][] result = new String[availableTimeZoneIds.length][5];
-            for (int i = 0; i < availableTimeZoneIds.length; ++i) {
-                result[i][0] = availableTimeZoneIds[i];
-            }
-
-            ReflectionHelpers.callInstanceMethod(TimeZoneNames.class,
-                    mRealObject, "fillZoneStrings",
-                    ReflectionHelpers.ClassParameter.from(String.class, locale.toLanguageTag()),
-                    ReflectionHelpers.ClassParameter.from(String[][].class, result));
-
-            return result;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
deleted file mode 100644
index 3182a935d5de9cfe3420fb4192444b373bce78fc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.app.admin.DevicePolicyManager;
-
-import com.android.internal.widget.LockPatternUtils;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(LockPatternUtils.class)
-public class ShadowLockPatternUtils {
-
-    private int mPasswordQuality = 1;
-    @Implementation
-    public boolean isSecure(int id) {
-        return true;
-    }
-
-    @Implementation
-    public int getActivePasswordQuality(int userId) {
-        return DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-    }
-
-    @Implementation
-    public int getKeyguardStoredPasswordQuality(int userHandle) {
-        return mPasswordQuality;
-    }
-
-    // Non-Android accessor.
-    public int getPasswordQuality() {
-        return mPasswordQuality;
-    }
-
-    // Non-Android accessor.
-    public void setPasswordQuality(int passwordQuality) {
-        mPasswordQuality = passwordQuality;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java
deleted file mode 100644
index 8d7606335d2dc169f5d3683eb3cfa9b3a25013da..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import com.android.settings.network.MobileNetworkPreferenceController;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(MobileNetworkPreferenceController.class)
-public class ShadowMobileNetworkPreferenceController {
-    private static boolean mIsRestricted = false;
-
-    public void __constructor__(Context context) {
-    }
-
-    @Implementation
-    public boolean isAvailable() {
-        return mIsRestricted ? false : true;
-    }
-
-    @Implementation
-    public boolean isUserRestricted() {
-        return mIsRestricted;
-    }
-
-    public static void setRestricted(boolean restricted) {
-        mIsRestricted = restricted;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
deleted file mode 100644
index e4421eee813c40c2c4e699884af8c79f8e36ada5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.app.Activity;
-import android.content.Context;
-import android.nfc.NfcAdapter;
-import android.os.Bundle;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.util.ReflectionHelpers.ClassParameter;
-
-/**
- * Shadow of {@link NfcAdapter}.
- */
-@Implements(NfcAdapter.class)
-public class ShadowNfcAdapter {
-    private static boolean sReaderModeEnabled;
-
-    @Implementation
-    public void enableReaderMode(Activity activity, NfcAdapter.ReaderCallback callback, int flags,
-            Bundle extras) {
-        sReaderModeEnabled = true;
-    }
-
-    @Implementation
-    public static NfcAdapter getDefaultAdapter(Context context) {
-        return ReflectionHelpers.callConstructor(
-                NfcAdapter.class, ClassParameter.from(Context.class, context));
-    }
-
-    public static boolean isReaderModeEnabled() {
-        return sReaderModeEnabled;
-    }
-
-    @Resetter
-    public static void reset() {
-        sReaderModeEnabled = false;
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java
deleted file mode 100644
index b93b035ccf3675b53d23658c3ce5018f6a04c945..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.testutils.shadow;
-
-import static org.robolectric.util.ReflectionHelpers.ClassParameter.from;
-
-import android.content.Context;
-import android.os.Looper;
-import android.os.UserHandle;
-
-import com.android.internal.content.PackageMonitor;
-import com.android.internal.os.BackgroundThread;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.RealObject;
-import org.robolectric.internal.Shadow;
-import org.robolectric.internal.ShadowExtractor;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowMessageQueue;
-
-/*
- * Shadow for hidden {@link PackageMonitor}.
- */
-@Implements(value = PackageMonitor.class, isInAndroidSdk = false)
-public class ShadowPackageMonitor {
-
-    @RealObject
-    private PackageMonitor mPackageMonitor;
-
-    @Implementation
-    public void register(Context context, Looper thread, UserHandle user, boolean externalStorage) {
-        // Call through to @RealObject's method.
-        Shadow.directlyOn(mPackageMonitor, PackageMonitor.class, "register",
-                from(Context.class, context), from(Looper.class, thread),
-                from(UserHandle.class, user), from(Boolean.TYPE, externalStorage));
-        // When <code>thread</code> is null, the {@link BackgroundThread} is used. Here we have to
-        // setup background Robolectric scheduler for it.
-        if (thread == null) {
-            setupBackgroundThreadScheduler();
-        }
-    }
-
-    private static void setupBackgroundThreadScheduler() {
-        ShadowMessageQueue shadowMessageQueue = ((ShadowMessageQueue) ShadowExtractor.extract(
-                BackgroundThread.getHandler().getLooper().getQueue()));
-        shadowMessageQueue.setScheduler(
-                ShadowApplication.getInstance().getBackgroundThreadScheduler());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
deleted file mode 100644
index 4f156426b4758bb788232e2e49422d1c6c6d1161..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
-import android.support.v4.content.PermissionChecker;
-import android.text.TextUtils;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * This class provides shadow for API that is not supported in current roboletric
- */
-@Implements(PermissionChecker.class)
-public class ShadowPermissionChecker {
-
-    private static Map<PermissionInfo, Integer> sPermissions = new HashMap<>();
-
-    public static void clear() {
-        sPermissions.clear();
-    }
-
-    public static void addPermission(String permission, int pid, int uid, String packageName,
-            int permissionValue) {
-        sPermissions.put(new PermissionInfo(permission, pid, uid, packageName), permissionValue);
-    }
-
-    @Implementation
-    public static int checkPermission(@NonNull Context context, @NonNull String permission,
-            int pid, int uid, String packageName) {
-        return sPermissions.getOrDefault(new PermissionInfo(permission, pid, uid, packageName),
-                PackageManager.PERMISSION_DENIED);
-    }
-
-    private static class PermissionInfo {
-        private final int mPid;
-        private final int mUid;
-        private final String mPackageName;
-        private final String mPermission;
-
-        public PermissionInfo(String permission, int pid, int uid, String packageName) {
-            mPid = pid;
-            mUid = uid;
-            mPackageName = packageName;
-            mPermission = permission;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof PermissionInfo)) {
-                return false;
-            }
-
-            final PermissionInfo other = (PermissionInfo) obj;
-            return mPid == other.mPid
-                    && mUid == other.mUid
-                    && TextUtils.equals(mPackageName, other.mPackageName)
-                    && TextUtils.equals(mPermission, other.mPermission);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(mPid, mUid, mPackageName, mPermission);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
deleted file mode 100644
index 7aa28fae00be42ea5f899687144b61c860cbe903..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.testutils.shadow;
-
-import com.android.settings.display.PowerManagerWrapper;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(PowerManagerWrapper.class)
-public class ShadowPowerManagerWrapper {
-
-    @Implementation
-    public int getMinimumScreenBrightnessSetting() {
-        return 0;
-    }
-
-    @Implementation
-    public int getMaximumScreenBrightnessSetting() {
-        return 0;
-    }
-
-    @Implementation
-    public int getMinimumScreenBrightnessForVrSetting() {
-        return 0;
-    }
-
-    @Implementation
-    public int getMaximumScreenBrightnessForVrSetting() {
-        return 0;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
deleted file mode 100644
index 0e0adce7bffcda07f8467bbd4a3fe051f628201f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import com.android.settings.network.RestrictedLockUtilsWrapper;
-import org.robolectric.annotation.Implements;
-
-/**
- * Shadow for the wrapper around RestrictedLockUtils. Should be removed/updated once robolectric is
- * updated to allow usage of new UserManager API's. see
- * {@link com.android.settingslib.RestrictedLockUtils} and
- * {@link com.android.settings.network.RestrictedLockUtilsWrapper}
- */
-@Implements(RestrictedLockUtilsWrapper.class)
-public class ShadowRestrictedLockUtilsWrapper {
-
-    private boolean isRestricted;
-
-    public boolean hasBaseUserRestriction(Context context, String userRestriction, int userId) {
-        return isRestricted;
-    }
-
-    public void setRestricted(boolean restricted) {
-        isRestricted = restricted;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java
deleted file mode 100644
index f39f10f327be0e8163321acc15ca7332633a1df4..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import com.android.settings.bluetooth.RestrictionUtils;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(RestrictionUtils.class)
-public class ShadowRestrictionUtils {
-    private static boolean isRestricted = false;
-
-    @Implementation
-    public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) {
-        if (isRestricted) {
-            return new EnforcedAdmin();
-        }
-        return null;
-    }
-
-    public static void setRestricted(boolean restricted) {
-        isRestricted = restricted;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java
deleted file mode 100644
index 5a71b58ec7ab0ebb084083c3073c45aac1e8760f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.os.AsyncTask;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowAsyncTask;
-
-import java.util.concurrent.Executor;
-
-/**
- * Shadow async task to handle runnables in roboletric
- */
-@Implements(AsyncTask.class)
-public class ShadowRunnableAsyncTask<Params, Progress, Result> extends
-        ShadowAsyncTask<Params, Progress, Result> {
-
-    @Implementation
-    public AsyncTask<Params, Progress, Result> executeOnExecutor(Executor executor,
-            Params... params) {
-        return super.execute(params);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
deleted file mode 100644
index 8b2a27bd1fa6fc9f299acbab32772c4b1dddfb08..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.ContentResolver;
-import android.provider.Settings;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Table;
-import java.util.Map;
-import java.util.WeakHashMap;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(Settings.Secure.class)
-public class ShadowSecureSettings {
-
-    private static final Map<ContentResolver, Table<Integer, String, Object>> sUserDataMap =
-        new WeakHashMap<>();
-
-    @Implementation
-    public static boolean putStringForUser(ContentResolver resolver, String name, String value,
-        int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            if (value != null) {
-                userTable.put(userHandle, name, value);
-            } else {
-                userTable.remove(userHandle, name);
-            }
-            return true;
-        }
-    }
-
-    @Implementation
-    public static String getStringForUser(ContentResolver resolver, String name, int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            return (String) userTable.get(userHandle, name);
-        }
-    }
-
-    @Implementation
-    public static boolean putIntForUser(ContentResolver resolver, String name, int value,
-        int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            userTable.put(userHandle, name, value);
-            return true;
-        }
-    }
-
-    @Implementation
-    public static int getIntForUser(ContentResolver resolver, String name, int def,
-        int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            final Object object = userTable.get(userHandle, name);
-            return object instanceof Integer ? (Integer) object : def;
-        }
-    }
-
-    @Implementation
-    public static boolean putLongForUser(ContentResolver resolver, String name, long value,
-        int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            userTable.put(userHandle, name, value);
-            return true;
-        }
-    }
-
-    @Implementation
-    public static long getLongForUser(ContentResolver resolver, String name, long def,
-        int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            final Object object = userTable.get(userHandle, name);
-            return object instanceof Long ? (Long) object : def;
-        }
-    }
-
-    @Implementation
-    public static boolean putFloatForUser(
-            ContentResolver resolver, String name, float value, int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            userTable.put(userHandle, name, value);
-            return true;
-        }
-    }
-
-    @Implementation
-    public static float getFloatForUser(
-            ContentResolver resolver, String name, float def, int userHandle) {
-        final Table<Integer, String, Object> userTable = getUserTable(resolver);
-        synchronized (userTable) {
-            final Object object = userTable.get(userHandle, name);
-            return object instanceof Float ? (Float) object : def;
-        }
-    }
-
-    public static void clear() {
-        synchronized (sUserDataMap) {
-            sUserDataMap.clear();
-        }
-    }
-
-    private static Table<Integer, String, Object> getUserTable(ContentResolver contentResolver) {
-        synchronized (sUserDataMap) {
-            Table<Integer, String, Object> table = sUserDataMap.get(contentResolver);
-            if (table == null) {
-                table = HashBasedTable.create();
-                sUserDataMap.put(contentResolver, table);
-            }
-            return table;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java
deleted file mode 100644
index e50a7692f474ae3701f9a6de3103f69cc4fc45a1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-
-import android.content.ContentResolver;
-import android.provider.Settings;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Implements(Settings.System.class)
-public class ShadowSystemSettings {
-
-    private static final Map<String, Object> sValueMap = new HashMap<>();
-
-    @Implementation
-    public static boolean putInt(ContentResolver resolver, String name, int value) {
-        sValueMap.put(name, value);
-        return true;
-    }
-
-    @Implementation
-    public static boolean putString(ContentResolver resolver, String name, String value) {
-        sValueMap.put(name, value);
-        return true;
-    }
-
-    @Implementation
-    public static String getString(ContentResolver resolver, String name) {
-        return (String) sValueMap.get(name);
-    }
-
-    @Implementation
-    public static String getStringForUser(ContentResolver resolver, String name, int userHandle) {
-        return getString(resolver, name);
-    }
-
-    @Implementation
-    public static boolean putIntForUser(ContentResolver cr, String name, int value,
-            int userHandle) {
-        return putInt(cr, name, value);
-    }
-
-    @Implementation
-    public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) {
-        return getInt(cr, name, def);
-    }
-
-    @Implementation
-    public static int getInt(ContentResolver resolver, String name, int defaultValue) {
-        Integer value = (Integer) sValueMap.get(name);
-        return value == null ? defaultValue : value;
-    }
-
-    public static void reset() {
-        sValueMap.clear();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java
deleted file mode 100644
index 03991e64e3ea267b143cec03fb266c708291ee5f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.icu.util.ULocale;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.view.View;
-import java.util.Locale;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-/**
- * Important: The current robolectric doesn't support API 24, so I copy the code
- * from API 24 here to make it compatible. Once robolectric is upgraded to 24,
- * We can delete this shadow class.
- **/
-@Implements(TextUtils.class)
-public class ShadowTextUtils {
-
-    @Implementation
-    public static int getLayoutDirectionFromLocale(Locale locale) {
-        return ((locale != null && !locale.equals(Locale.ROOT)
-                && ULocale.forLocale(locale).isRightToLeft())
-                // If forcing into RTL layout mode, return RTL as default
-                || SystemProperties.getBoolean(Settings.Global.DEVELOPMENT_FORCE_RTL, false))
-                ? View.LAYOUT_DIRECTION_RTL
-                : View.LAYOUT_DIRECTION_LTR;
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java
deleted file mode 100644
index 2270ff338348789aa99cbd95c3f2538659469b08..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import android.content.Intent;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.RealObject;
-import org.robolectric.shadows.ShadowService;
-
-/**
- * Shadow for {@link TileService}.
- */
-@Implements(TileService.class)
-public class ShadowTileService extends ShadowService {
-
-    @RealObject TileService realService;
-
-    private Tile mTile;
-
-    public void __constructor__() { }
-
-    @Implementation
-    public final Tile getQsTile() {
-        return mTile;
-    }
-
-    @Implementation
-    public final void startActivityAndCollapse(Intent intent) {
-        realService.startActivity(intent);
-    }
-
-    // Non-Android setter.
-    public void setTile(Tile tile) {
-        mTile = tile;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java
deleted file mode 100644
index 2bcc92a28ad3e53c8d2ad8f89ad3ec8f6cda85a1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.icu.text.TimeZoneNames;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-/**
- * TimeZoneNames.getDisplayName tries to access files which doesn't exist for Robolectric. Stub it
- * out for a naive implementation.
- */
-@Implements(TimeZoneNames.class)
-public class ShadowTimeZoneNames {
-
-    @Implementation
-    public String getDisplayName(String tzID, TimeZoneNames.NameType type, long date) {
-        return "[DisplayName]" + tzID;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
deleted file mode 100644
index 860ee112a39b5f0fc5dd1b4c1dd097c84d949005..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.annotation.UserIdInt;
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-import android.util.SparseArray;
-
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.internal.ShadowExtractor;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * This class provides the API 24 implementation of UserManager.get(Context).
- */
-@Implements(UserManager.class)
-public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager {
-
-    private SparseArray<UserInfo> mUserInfos = new SparseArray<>();
-
-    public void setUserInfo(int userHandle, UserInfo userInfo) {
-        mUserInfos.put(userHandle, userInfo);
-    }
-
-    @Implementation
-    public UserInfo getUserInfo(int userHandle) {
-        return mUserInfos.get(userHandle);
-    }
-
-    @Implementation
-    public List<UserInfo> getProfiles(@UserIdInt int userHandle) {
-        return Collections.emptyList();
-    }
-
-    @Implementation
-    public int getCredentialOwnerProfile(@UserIdInt int userHandle) {
-        return userHandle;
-    }
-
-    @Implementation
-    public static UserManager get(Context context) {
-        return (UserManager) context.getSystemService(Context.USER_SERVICE);
-    }
-
-    public static ShadowUserManager getShadow() {
-        return (ShadowUserManager) ShadowExtractor.extract(
-                RuntimeEnvironment.application.getSystemService(UserManager.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
deleted file mode 100644
index 271ffa8e8e3818c760ce3b56eab5dd43417a3c16..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.Utils;
-import com.android.settings.password.IFingerprintManager;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(Utils.class)
-public class ShadowUtils {
-
-    private static IFingerprintManager sFingerprintManager = null;
-    private static boolean sIsUserAMonkey;
-    private static boolean sIsDemoUser;
-    private static ComponentName sDeviceOwnerComponentName;
-
-    @Implementation
-    public static int enforceSameOwner(Context context, int userId) {
-        return userId;
-    }
-
-    @Implementation
-    public static IFingerprintManager getFingerprintManagerWrapperOrNull(Context context) {
-        return sFingerprintManager;
-    }
-
-    public static void setFingerprintManager(IFingerprintManager fingerprintManager) {
-        sFingerprintManager = fingerprintManager;
-    }
-
-    public static void reset() {
-        sFingerprintManager = null;
-        sIsUserAMonkey = false;
-        sIsDemoUser = false;
-    }
-
-    @Implementation
-    public static boolean isWifiOnly(Context context) {
-        return true;
-    }
-
-    public static void setIsDemoUser(boolean isDemoUser) {
-        sIsDemoUser = isDemoUser;
-    }
-
-    @Implementation
-    public static boolean isDemoUser(Context context) {
-        return sIsDemoUser;
-    }
-
-    public static void setIsUserAMonkey(boolean isUserAMonkey) {
-        sIsUserAMonkey = isUserAMonkey;
-    }
-
-    /**
-     * Returns true if Monkey is running.
-     */
-    @Implementation
-    public static boolean isMonkeyRunning() {
-        return sIsUserAMonkey;
-    }
-
-    public static void setDeviceOwnerComponent(ComponentName componentName) {
-        sDeviceOwnerComponentName = componentName;
-    }
-
-    @Implementation
-    public static ComponentName getDeviceOwnerComponent(Context context) {
-        return sDeviceOwnerComponentName;
-    }
-
-    @Implementation
-    public static int getManagedProfileId(UserManager um, int parentUserId) {
-        return UserHandle.USER_NULL;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java
deleted file mode 100644
index 655acf14798099114f1add78ed38fd006deb5ad7..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-
-import com.android.settingslib.datetime.ZoneGetter;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
-@Implements(ZoneGetter.class)
-public class ShadowZoneGetter {
-
-    @Implementation
-    public static List<Map<String, Object>> getZonesList(Context context) {
-        List<Map<String, Object>> zones = new ArrayList<>();
-        zones.add(createDisplayEntry(TimeZone.getDefault(), "gmt-1:00", "FakePlace", 10000));
-        return zones;
-    }
-
-    private static Map<String, Object> createDisplayEntry(
-            TimeZone tz, CharSequence gmtOffsetText, CharSequence displayName, int offsetMillis) {
-        Map<String, Object> map = new HashMap<>();
-        map.put(ZoneGetter.KEY_ID, tz.getID());
-        map.put(ZoneGetter.KEY_DISPLAYNAME, displayName.toString());
-        map.put(ZoneGetter.KEY_DISPLAY_LABEL, displayName);
-        map.put(ZoneGetter.KEY_GMT, gmtOffsetText.toString());
-        map.put(ZoneGetter.KEY_OFFSET_LABEL, gmtOffsetText);
-        map.put(ZoneGetter.KEY_OFFSET, offsetMillis);
-        return map;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
deleted file mode 100644
index b1812539794d13c9a4480adf6590ee1a4bc75e05..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.trustagent;
-
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.pm.PackageManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TrustAgentFeatureProviderImplTest {
-
-    private static final String CANNED_PACKAGE_NAME = "com.test.package";
-
-    @Mock
-    private PackageManager mPackageManager;
-
-    private TrustAgentManagerImpl mImpl;
-
-    @Before
-    public void setUp() throws PackageManager.NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-        mImpl = new TrustAgentManagerImpl();
-    }
-
-    @Test
-    public void shouldProvideTrust_doesProvideTrustWithPermission() {
-        when(mPackageManager.checkPermission(TrustAgentManager.PERMISSION_PROVIDE_AGENT,
-            CANNED_PACKAGE_NAME)).thenReturn(PackageManager.PERMISSION_GRANTED);
-
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.packageName = CANNED_PACKAGE_NAME;
-        ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.serviceInfo = serviceInfo;
-
-        assertTrue(mImpl.shouldProvideTrust(resolveInfo, mPackageManager));
-    }
-
-    @Test
-    public void shouldProvideTrust_doesNotProvideTrustWithoutPermission() {
-        when(mPackageManager.checkPermission(TrustAgentManager.PERMISSION_PROVIDE_AGENT,
-            CANNED_PACKAGE_NAME)).thenReturn(PackageManager.PERMISSION_DENIED);
-
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.packageName = CANNED_PACKAGE_NAME;
-        ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.serviceInfo = serviceInfo;
-
-        assertFalse(mImpl.shouldProvideTrust(resolveInfo, mPackageManager));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
deleted file mode 100644
index e1bc157784553bff87276bf887d41283c298371a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.users;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserFeatureProviderImplTest {
-    public static final int FIRST_USER_ID = 0;
-    public static final int SECOND_USER_ID = 4;
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-
-    private UserFeatureProviderImpl mFeatureProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mFeatureProvider = new UserFeatureProviderImpl(mContext);
-    }
-
-    @Test
-    public void getUserProfiles() {
-        final List<UserHandle> expected =
-                Arrays.asList(new UserHandle(FIRST_USER_ID), new UserHandle(SECOND_USER_ID));
-        when(mUserManager.getUserProfiles()).thenReturn(expected);
-        final List<UserHandle> userProfiles = mFeatureProvider.getUserProfiles();
-        assertThat(userProfiles).isEqualTo(expected);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
deleted file mode 100644
index 5b31a82f228cfae40377c02c80db3e2bf0c82ed8..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.view.View;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.RestrictedPreferenceHelper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserPreferenceTest {
-
-    @Mock
-    private RestrictedPreferenceHelper mRestrictedPreferenceHelper;
-    private Context mContext;
-    private UserPreference mUserPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mUserPreference = new UserPreference(mContext, null /* attrs */, UserHandle.USER_CURRENT,
-                null /* settingsListener */, null /* deleteListener */);
-        ReflectionHelpers.setField(mUserPreference, "mHelper", mRestrictedPreferenceHelper);
-    }
-
-    @Test
-    public void testShouldHideSecondTarget_noListener_shouldHide() {
-        assertThat(mUserPreference.shouldHideSecondTarget()).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSecondTarget_disabledByAdmin_shouldHide() {
-        when(mRestrictedPreferenceHelper.isDisabledByAdmin()).thenReturn(true);
-
-        assertThat(mUserPreference.shouldHideSecondTarget()).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSecondTarget_hasSettingListener_shouldNotHide() {
-        ReflectionHelpers.setField(mUserPreference, "mSettingsClickListener",
-                mock(View.OnClickListener.class));
-
-        assertThat(mUserPreference.shouldHideSecondTarget()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
deleted file mode 100644
index a5783647ca6ef899e3a86003753845e7707ecaa3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import android.app.Activity;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.Robolectric;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserSettingsTest {
-
-    @Mock private UserManager mUserManager;
-    @Mock private SummaryLoader mSummaryLoader;
-    private Activity mActivity;
-    private SummaryLoader.SummaryProvider mSummaryProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = spy(Robolectric.buildActivity(Activity.class).get());
-        when((Object) mActivity.getSystemService(UserManager.class)).thenReturn(mUserManager);
-
-        mSummaryProvider = UserSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
-            mActivity, mSummaryLoader);
-    }
-
-    @Test
-    public void setListening_shouldSetSummaryWithUserName() {
-        final String name = "John";
-        final UserInfo userInfo = new UserInfo();
-        userInfo.name = name;
-        when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mSummaryLoader).setSummary(mSummaryProvider,
-            mActivity.getString(R.string.users_summary, name));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
deleted file mode 100644
index 690c2924ea62cfbbafa4e27bf163fe06e8059bcc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.utils;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LocalClassLoaderContextThemeWrapperTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mBaseContext;
-    private LocalClassLoaderContextThemeWrapper mContextThemeWrapper;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void getClassLoader_shouldUseLocalClassLoader() {
-        mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(
-                LocalClassLoaderContextThemeWrapperTest.class, mBaseContext, 0);
-
-        assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(
-                LocalClassLoaderContextThemeWrapperTest.class.getClassLoader());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
deleted file mode 100644
index 4b4f3fba202d57aad2789f11a4d64fd7b358ab66..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-import android.app.Fragment;
-import android.content.pm.PackageInfo;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppDialogFragmentTest {
-
-    @Mock
-    private Fragment mParent;
-
-    private PackageInfo mPackageInfo;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPackageInfo = new PackageInfo();
-    }
-
-    @Test
-    public void notManagingOrConnected_shouldNotShow() {
-        AppDialogFragment.show(mParent, mPackageInfo, "label", false /* manage */,
-                false /* connected */);
-
-        verify(mParent, never()).isAdded();
-    }
-
-    @Test
-    public void notManagingAndConnected_showShow() {
-        AppDialogFragment.show(mParent, mPackageInfo, "label", false /* manage */,
-                true /* connected */);
-
-        verify(mParent).isAdded();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
deleted file mode 100644
index 29267274505e774925c536d3e16cd9cf51b0c48e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link VpnUtils}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class VpnUtilsTest {
-    @Test
-    public void testIsAlwaysOnVpnSet() {
-        final ConnectivityManagerWrapper cm = mock(ConnectivityManagerWrapper.class);
-        when(cm.getAlwaysOnVpnPackageForUser(0)).thenReturn("com.example.vpn");
-        assertThat(VpnUtils.isAlwaysOnVpnSet(cm, 0)).isTrue();
-
-        when(cm.getAlwaysOnVpnPackageForUser(0)).thenReturn(null);
-        assertThat(VpnUtils.isAlwaysOnVpnSet(cm, 0)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
deleted file mode 100644
index dd93938debd2fc1802dfaed5ba23ee4f2953e546..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wallpaper;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.util.ActivityController;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WallpaperSuggestionActivityTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    private ActivityController<WallpaperSuggestionActivity> mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        mController = Robolectric.buildActivity(WallpaperSuggestionActivity.class);
-    }
-
-    @Test
-    public void launch_primarySuggestionActivityDoesNotExist_shouldFallback() {
-        ShadowActivity activity = shadowOf(mController.setup().get());
-        final Intent intent = activity.getNextStartedActivity();
-
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
deleted file mode 100644
index e5354456edbbb6df1384386d7e4d6988c159a312..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.webview;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageItemInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Arrays;
-
-import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WebViewAppPickerTest {
-    private Context mContext = RuntimeEnvironment.application;
-
-    private final static UserInfo FIRST_USER = new UserInfo(0, "FIRST_USER", 0);
-    private final static UserInfo SECOND_USER = new UserInfo(0, "SECOND_USER", 0);
-
-    private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PackageManagerWrapper mPackageManager;
-
-    private WebViewAppPicker mPicker;
-    private WebViewUpdateServiceWrapper mWvusWrapper;
-
-    private static ApplicationInfo createApplicationInfo(String packageName) {
-        ApplicationInfo ai = new ApplicationInfo();
-        ai.packageName = packageName;
-        return ai;
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mPicker = new WebViewAppPicker();
-        mPicker = spy(mPicker);
-        doNothing().when(mPicker).updateCandidates();
-        doNothing().when(mPicker).updateCheckedState(any());
-        doReturn(mActivity).when(mPicker).getActivity();
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-        ReflectionHelpers.setField(mPicker, "mMetricsFeatureProvider",
-                mock(MetricsFeatureProvider.class));
-        mWvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        mPicker.setWebViewUpdateServiceWrapper(mWvusWrapper);
-    }
-
-    @Test
-    public void testClickingItemChangesProvider() {
-        testSuccessfulClickChangesProvider();
-    }
-
-    @Test
-    public void testFailingClick() {
-        testFailingClickUpdatesSetting();
-    }
-
-    @Test
-    public void testClickingItemInActivityModeChangesProviderAndFinishes() {
-        useWebViewSettingIntent();
-        testSuccessfulClickChangesProvider();
-        verify(mActivity, times(1)).finish();
-    }
-
-    @Test
-    public void testFailingClickInActivityMode() {
-        useWebViewSettingIntent();
-        testFailingClick();
-    }
-
-    private void useWebViewSettingIntent() {
-        Intent intent = new Intent(ACTION_WEBVIEW_SETTINGS);
-        when(mActivity.getIntent()).thenReturn(intent);
-    }
-
-    private void testSuccessfulClickChangesProvider() {
-        when(mWvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
-                Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
-        when(mWvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(true);
-
-        RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class);
-        when(defaultPackagePref.getKey()).thenReturn(DEFAULT_PACKAGE_NAME);
-        mPicker.onRadioButtonClicked(defaultPackagePref);
-
-        verify(mWvusWrapper, times(1)).setWebViewProvider(eq(DEFAULT_PACKAGE_NAME));
-        verify(mPicker, times(1)).updateCheckedState(DEFAULT_PACKAGE_NAME);
-        verify(mWvusWrapper, never()).showInvalidChoiceToast(any());
-    }
-
-    private void testFailingClickUpdatesSetting() {
-        when(mWvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
-                Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
-        when(mWvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(false);
-
-        RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class);
-        when(defaultPackagePref.getKey()).thenReturn(DEFAULT_PACKAGE_NAME);
-        mPicker.onRadioButtonClicked(defaultPackagePref);
-
-        verify(mWvusWrapper, times(1)).setWebViewProvider(eq(DEFAULT_PACKAGE_NAME));
-        // Ensure we update the list of packages when we click a non-valid package - the list must
-        // have changed, otherwise this click wouldn't fail.
-        verify(mPicker, times(1)).updateCandidates();
-        verify(mWvusWrapper, times(1)).showInvalidChoiceToast(any());
-    }
-
-    @Test
-    public void testDisabledPackageShownAsDisabled() {
-        String disabledReason = "disabled";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
-                createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
-
-        RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
-        mPicker.bindPreference(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
-        mPicker.bindPreferenceExtra(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
-        verify(mockPreference, times(1)).setEnabled(eq(false));
-        verify(mockPreference, never()).setEnabled(eq(true));
-    }
-
-    @Test
-    public void testEnabledPackageShownAsEnabled() {
-        String disabledReason = "";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
-                createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
-
-        RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
-        mPicker.bindPreference(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
-        mPicker.bindPreferenceExtra(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
-        verify(mockPreference, times(1)).setEnabled(eq(true));
-        verify(mockPreference, never()).setEnabled(eq(false));
-    }
-
-    @Test
-    public void testDisabledPackageShowsDisabledReasonSummary() {
-        String disabledReason = "disabled";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
-                createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
-
-        RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
-        mPicker.bindPreference(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
-        mPicker.bindPreferenceExtra(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
-        verify(mockPreference, times(1)).setSummary(eq(disabledReason));
-        // Ensure we haven't called setSummary several times.
-        verify(mockPreference, times(1)).setSummary(any());
-    }
-
-    @Test
-    public void testEnabledPackageShowsEmptySummary() {
-        String disabledReason = null;
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
-                createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
-
-        RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
-        mPicker.bindPreference(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
-        mPicker.bindPreferenceExtra(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
-        verify(mockPreference, never()).setSummary(any());
-    }
-
-    @Test
-    public void testFinishIfNotAdmin() {
-        doReturn(false).when(mUserManager).isAdminUser();
-        mPicker.onAttach((Context) mActivity);
-        verify(mActivity, times(1)).finish();
-    }
-
-    @Test
-    public void testNotFinishedIfAdmin() {
-        doReturn(true).when(mUserManager).isAdminUser();
-        mPicker.onAttach((Context) mActivity);
-        verify(mActivity, never()).finish();
-    }
-
-    @Test
-    public void testDisabledReasonNullIfPackagesOk() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-
-        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
-        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
-        when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(
-                any(), eq(DEFAULT_PACKAGE_NAME))).thenReturn(
-                Arrays.asList(packageForFirstUser, packageForSecondUser));
-
-        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isNull();
-    }
-
-    @Test
-    public void testDisabledReasonForSingleUserDisabledPackage() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
-                .thenReturn(Arrays.asList(packageForFirstUser));
-
-        final String EXPECTED_DISABLED_REASON = String.format(
-                "(disabled for user %s)", FIRST_USER.name);
-        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
-                DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
-    }
-
-    @Test
-    public void testDisabledReasonForSingleUserUninstalledPackage() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
-                .thenReturn(Arrays.asList(packageForFirstUser));
-
-        final String EXPECTED_DISABLED_REASON = String.format(
-                "(uninstalled for user %s)", FIRST_USER.name);
-        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
-                DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
-    }
-
-    @Test
-    public void testDisabledReasonSeveralUsers() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
-        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
-        when(packageForSecondUser.isInstalledPackage()).thenReturn(false);
-        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
-                .thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
-
-        final String EXPECTED_DISABLED_REASON = String.format(
-                "(disabled for user %s)", FIRST_USER.name);
-        assertThat(mPicker.getDisabledReason(
-                wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
-    }
-
-    /**
-     * Ensure we only proclaim a package as uninstalled for a certain user if it's both uninstalled
-     * and disabled.
-     */
-    @Test
-    public void testDisabledReasonUninstalledAndDisabled() {
-        UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
-        when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
-        when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
-
-        UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
-        when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
-        when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
-        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
-
-        WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
-        when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
-                .thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
-
-        final String EXPECTED_DISABLED_REASON = String.format(
-                "(uninstalled for user %s)", FIRST_USER.name);
-        assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
-                DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
-    }
-
-    /**
-     * Ensure that the version name of a WebView package is displayed after its name in the
-     * preference title.
-     */
-    @Test
-    public void testWebViewVersionAddedAfterLabel() throws PackageManager.NameNotFoundException {
-        PackageItemInfo mockPackageItemInfo = mock(PackageItemInfo.class);
-        mockPackageItemInfo.packageName = DEFAULT_PACKAGE_NAME;
-        when(mockPackageItemInfo.loadLabel(any())).thenReturn("myPackage");
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
-                mockPackageItemInfo, "" /* disabledReason */);
-
-        PackageInfo packageInfo = new PackageInfo();
-        packageInfo.versionName = "myVersionName";
-        PackageManager pm = mock(PackageManager.class);
-        when(pm.getPackageInfo(eq(DEFAULT_PACKAGE_NAME), anyInt())).thenReturn(packageInfo);
-        when(mPackageManager.getPackageManager()).thenReturn(pm);
-
-        RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
-        mPicker.bindPreference(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
-        mPicker.bindPreferenceExtra(mockPreference,
-                DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
-        verify(mockPreference, times(1)).setTitle(eq("myPackage myVersionName"));
-        verify(mockPreference, times(1)).setTitle(any());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
deleted file mode 100644
index 5ce21e80ba91db61080ff8081cea962d63b44af0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.webview;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WebViewAppPreferenceControllerTest {
-    @Mock
-    private Context mContext;
-
-    private WebViewAppPreferenceController mController;
-
-    private static final String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new WebViewAppPreferenceController(mContext);
-    }
-
-    @Test
-    public void testIsAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testNeverHandlesClick() {
-        assertThat(mController.handlePreferenceTreeClick(mock(Preference.class))).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
deleted file mode 100644
index df45ad58e61733f93bab9218fd417ecf20a3fe86..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wfd;
-
-import android.app.Activity;
-import android.content.Context;
-import android.hardware.display.DisplayManager;
-import android.media.MediaRouter;
-import android.net.wifi.p2p.WifiP2pManager;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiDisplaySettingsTest {
-
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-    @Mock
-    private MediaRouter mMediaRouter;
-
-    private SummaryLoader.SummaryProvider mSummaryProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE))
-                .thenReturn(mMediaRouter);
-
-        mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
-                mActivity, mSummaryLoader);
-    }
-
-    @Test
-    public void listenToSummary_disconnected_shouldProvideDisconnectedSummary() {
-        mSummaryProvider.setListening(true);
-
-        verify(mActivity).getString(R.string.disconnected);
-        verify(mActivity, never()).getString(R.string.wifi_display_status_connected);
-    }
-
-    @Test
-    public void listenToSummary_connected_shouldProvideConnectedSummary() {
-        final MediaRouter.RouteInfo route = mock(MediaRouter.RouteInfo.class);
-        when(mMediaRouter.getRouteCount()).thenReturn(1);
-        when(mMediaRouter.getRouteAt(0)).thenReturn(route);
-        when(route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)).thenReturn(true);
-        when(route.isSelected()).thenReturn(true);
-        when(route.isConnecting()).thenReturn(false);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mActivity).getString(R.string.wifi_display_status_connected);
-    }
-
-    @Test
-    public void isAvailable_noService_shouldReturnFalse() {
-        assertThat(WifiDisplaySettings.isAvailable(mActivity))
-                .isFalse();
-
-    }
-
-    @Test
-    public void isAvailable_hasService_shouldReturnTrue() {
-        when(mActivity.getSystemService(Context.DISPLAY_SERVICE))
-                .thenReturn(mock(DisplayManager.class));
-        when(mActivity.getSystemService(Context.WIFI_P2P_SERVICE))
-                .thenReturn(mock(WifiP2pManager.class));
-
-        assertThat(WifiDisplaySettings.isAvailable(mActivity))
-                .isTrue();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
deleted file mode 100644
index 41ba1e4447c2c14422b55123acce100a1076c760..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ActionBarShadowControllerTest {
-
-    @Mock
-    private RecyclerView mRecyclerView;
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private ActionBar mActionBar;
-    private Lifecycle mLifecycle;
-    private View mView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getActionBar()).thenReturn(mActionBar);
-        mView = new View(RuntimeEnvironment.application);
-        mLifecycle = new Lifecycle();
-    }
-
-    @Test
-    public void attachToRecyclerView_shouldAddScrollWatcherAndUpdateActionBar() {
-        when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
-
-        ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
-
-        verify(mActionBar).setElevation(ActionBarShadowController.ELEVATION_LOW);
-    }
-
-    @Test
-    public void attachToRecyclerView_customViewAsActionBar_shouldUpdateElevationOnScroll() {
-        // Setup
-        mView.setElevation(50);
-        when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
-        final ActionBarShadowController controller =
-                ActionBarShadowController.attachToRecyclerView(mView, mLifecycle, mRecyclerView);
-        assertThat(mView.getElevation()).isEqualTo(ActionBarShadowController.ELEVATION_LOW);
-
-        // Scroll
-        when(mRecyclerView.canScrollVertically(-1)).thenReturn(true);
-        controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
-        assertThat(mView.getElevation()).isEqualTo(ActionBarShadowController.ELEVATION_HIGH);
-    }
-
-    @Test
-    public void attachToRecyclerView_lifecycleChange_shouldAttachDetach() {
-        ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
-
-        List<LifecycleObserver> observers = ReflectionHelpers.getField(mLifecycle, "mObservers");
-        assertThat(observers).hasSize(1);
-        verify(mRecyclerView).addOnScrollListener(any());
-
-        mLifecycle.onStop();
-        verify(mRecyclerView).removeOnScrollListener(any());
-
-        mLifecycle.onStart();
-        verify(mRecyclerView, times(2)).addOnScrollListener(any());
-    }
-
-    @Test
-    public void onScrolled_nullAnchorViewAndActivity_shouldNotCrash() {
-        final Activity activity = null;
-        final ActionBarShadowController controller =
-                ActionBarShadowController.attachToRecyclerView(activity, mLifecycle, mRecyclerView);
-
-        // Scroll
-        controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
-        // no crash
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
deleted file mode 100644
index 7fcf3289c53f204575b3ff83565c451c6eb3a305..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertEquals;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultIndicatorSeekBarTest {
-
-    private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar;
-
-    @Before
-    public void setUp() {
-        mDefaultIndicatorSeekBar = new DefaultIndicatorSeekBar(RuntimeEnvironment.application);
-        mDefaultIndicatorSeekBar.setMax(100);
-    }
-
-    @After
-    public void tearDown() {
-        mDefaultIndicatorSeekBar = null;
-    }
-
-    @Test
-    public void defaultProgress_setSucceeds() {
-        mDefaultIndicatorSeekBar.setDefaultProgress(40);
-        assertEquals(40, mDefaultIndicatorSeekBar.getDefaultProgress());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
deleted file mode 100644
index 9c6ee457c42bc280d511ad7bf6f4b024fa8040ac..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class EntityHeaderControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private Fragment mFragment;
-
-    private Context mShadowContext;
-    private LayoutInflater mLayoutInflater;
-    private PackageInfo mInfo;
-    private EntityHeaderController mController;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
-        mShadowContext = RuntimeEnvironment.application;
-        when(mActivity.getApplicationContext()).thenReturn(mShadowContext);
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mFragment.getContext()).thenReturn(mShadowContext);
-        mLayoutInflater = LayoutInflater.from(mShadowContext);
-        mInfo = new PackageInfo();
-        mInfo.versionName = "1234";
-    }
-
-    @Test
-    public void testBuildView_constructedWithoutView_shouldCreateNewView() {
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
-        View view = mController.done(mActivity);
-
-        assertThat(view).isNotNull();
-    }
-
-    @Test
-    public void testBuildView_withContext_shouldBuildPreference() {
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
-        Preference preference = mController.done(mActivity, mShadowContext);
-
-        assertThat(preference instanceof LayoutPreference).isTrue();
-    }
-
-    @Test
-    public void testBuildView_constructedWithView_shouldReturnSameView() {
-        View inputView = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
-        View view = mController.done(mActivity);
-
-        assertThat(view).isSameAs(inputView);
-    }
-
-    @Test
-    public void bindViews_shouldBindAllData() {
-        final String testString = "test";
-        final View header = mLayoutInflater.inflate(
-                R.layout.settings_entity_header, null /* root */);
-        final TextView label = header.findViewById(R.id.entity_header_title);
-        final TextView version = header.findViewById(R.id.entity_header_summary);
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
-        mController.setLabel(testString);
-        mController.setSummary(testString);
-        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
-        mController.done(mActivity);
-
-        assertThat(label.getText()).isEqualTo(testString);
-        assertThat(version.getText()).isEqualTo(testString);
-    }
-
-    @Test
-    public void bindButton_hasAppPref_shouldShowButton() {
-        final ResolveInfo info = new ResolveInfo();
-        info.activityInfo = new ActivityInfo();
-        info.activityInfo.packageName = "123";
-        info.activityInfo.name = "321";
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-        when(mActivity.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(info);
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
-        mController.setButtonActions(
-                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                EntityHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
-        assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(button1.getDrawable()).isNotNull();
-        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
-                .isEqualTo(View.GONE);
-        try {
-            appLinks.findViewById(android.R.id.button1).performClick();
-        } catch (Exception e) {
-            // Ignore exception because the launching intent is fake.
-        }
-        verify(mFeatureFactory.metricsFeatureProvider).actionWithSource(mContext,
-                MetricsProto.MetricsEvent.VIEW_UNKNOWN,
-                MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING);
-        verify(mFragment).startActivity(any(Intent.class));
-    }
-
-    @Test
-    public void bindButton_noAppPref_shouldNotShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(null);
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
-        mController.setButtonActions(
-                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                EntityHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
-        assertThat(button1.getVisibility()).isEqualTo(View.GONE);
-        assertThat(button1.getDrawable()).isNull();
-        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_noAppInfo_shouldNotAttachClickListener() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-        final Activity activity = mock(Activity.class);
-        when(mFragment.getActivity()).thenReturn(activity);
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
-        mController.setPackageName(null)
-                .setHasAppInfoLink(true)
-                .setButtonActions(
-                        EntityHeaderController.ActionType.ACTION_NONE,
-                        EntityHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
-                .isEqualTo(View.GONE);
-
-        appLinks.findViewById(R.id.entity_header_content).performClick();
-        verify(mFragment, never()).getActivity();
-        verify(activity, never()).startActivity(any(Intent.class));
-    }
-
-    @Test
-    public void bindButton_hasAppInfo_shouldAttachClickListener() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-        final Activity activity = mock(Activity.class);
-        when(mFragment.getActivity()).thenReturn(activity);
-        when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
-        mController.setPackageName("123")
-                .setUid(UserHandle.USER_SYSTEM)
-                .setHasAppInfoLink(true)
-                .setButtonActions(
-                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
-                        EntityHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        appLinks.findViewById(R.id.entity_header_content).performClick();
-        verify(activity).startActivityForResultAsUser(
-                any(Intent.class), anyInt(), any(UserHandle.class));
-    }
-
-    @Test
-    public void iconContentDescription_shouldWorkWithSetIcon() {
-        final View view = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
-        String description = "Fake Description";
-        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
-        mController.setIconContentDescription(description);
-        mController.done(mActivity);
-        assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
-                .isEqualTo(description);
-    }
-
-    @Test
-    public void iconContentDescription_shouldWorkWithoutSetIcon() {
-        final View view = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
-        String description = "Fake Description";
-        mController.setIconContentDescription(description);
-        mController.done(mActivity);
-        assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
-                .isEqualTo(description);
-    }
-
-    @Test
-    public void bindButton_hasAppNotifIntent_shouldShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
-        mController.setAppNotifPrefIntent(new Intent())
-                .setButtonActions(
-                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
-                        EntityHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    // Ensure that the instant app label does not show up when we haven't told the controller the
-    // app is instant.
-    @Test
-    public void instantApps_normalAppsDontGetLabel() {
-        final View header = mLayoutInflater.inflate(
-                R.layout.settings_entity_header, null /* root */);
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
-        mController.done(mActivity);
-
-        assertThat(header.findViewById(R.id.install_type).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    // Test that the "instant apps" label is present in the header when we have an instant app.
-    @Test
-    public void instantApps_expectedHeaderItem() {
-        final View header = mLayoutInflater.inflate(
-                R.layout.settings_entity_header, null /* root */);
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
-        mController.setIsInstantApp(true);
-        mController.done(mActivity);
-        TextView label = header.findViewById(R.id.install_type);
-
-        assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(label.getText()).isEqualTo(
-                header.getResources().getString(R.string.install_type_instant));
-        assertThat(header.findViewById(R.id.entity_header_summary).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void styleActionBar_invalidObjects_shouldNotCrash() {
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
-        mController.styleActionBar(null);
-
-        when(mActivity.getActionBar()).thenReturn(null);
-        mController.styleActionBar(mActivity);
-
-        verify(mActivity).getActionBar();
-    }
-
-    @Test
-    public void styleActionBar_setElevationAndBackground() {
-        final ActionBar actionBar = mActivity.getActionBar();
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
-        mController.styleActionBar(mActivity);
-
-        verify(actionBar).setElevation(0);
-        // Enforce a color drawable as background here, as image based drawables might not be
-        // wide enough to cover entire action bar.
-        verify(actionBar).setBackgroundDrawable(any(ColorDrawable.class));
-    }
-
-    @Test
-    public void initAppHeaderController_appHeaderNull_useFragmentContext() {
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
-
-        // Fragment.getContext() is invoked to inflate the view
-        verify(mFragment).getContext();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
deleted file mode 100644
index 0d9a77bef5805e71c3ca9eab9f11ad70b70b6f2c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FixedLineSummaryPreferenceTest {
-
-    @Mock
-    private TextView mSummary;
-
-    private Context mContext;
-    private PreferenceViewHolder mHolder;
-    private FixedLineSummaryPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mPreference = new FixedLineSummaryPreference(mContext, null);
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        final View view = inflater.inflate(mPreference.getLayoutResource(),
-                new LinearLayout(mContext), false);
-        mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));
-        when(mHolder.findViewById(android.R.id.summary)).thenReturn(mSummary);
-    }
-
-    @Test
-    public void onBindViewHolder_shouldSetSingleLine() {
-        mPreference.onBindViewHolder(mHolder);
-
-        verify(mSummary).setMinLines(1);
-        verify(mSummary).setMaxLines(1);
-    }
-
-    @Test
-    public void onBindViewHolder_TwoLineSummary_shouldSetTwoLines() {
-        mPreference.setSummaryLineCount(2);
-        mPreference.onBindViewHolder(mHolder);
-
-        verify(mSummary).setMinLines(2);
-        verify(mSummary).setMaxLines(2);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
deleted file mode 100644
index 09b52c8b83e29505b5eeb275afd798646b0b8348..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.os.Handler;
-import android.view.View;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LoadingViewControllerTest {
-
-    private Context mContext;
-    private View mLoadingView;
-    private View mContentView;
-
-    private LoadingViewController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mLoadingView = new View(mContext);
-        mContentView = new View(mContext);
-
-        mController = new LoadingViewController(mLoadingView, mContentView);
-    }
-
-    @Test
-    public void showContent_shouldSetContentVisible() {
-        mController.showContent(false /* animate */);
-
-        assertThat(mContentView.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void showLoadingViewDelayed_shouldPostRunnable() {
-        final Handler handler = mock(Handler.class);
-        ReflectionHelpers.setField(mController, "mFgHandler", handler);
-        mController.showLoadingViewDelayed();
-
-        verify(handler).postDelayed(any(Runnable.class), anyLong());
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
deleted file mode 100644
index 1c449cc818355ec7ba8293f7962ca0388e454c5a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class MasterSwitchPreferenceTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void createNewPreference_shouldSetLayout() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-
-        assertThat(preference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.preference_widget_master_switch);
-    }
-
-    @Test
-    public void setChecked_shouldUpdateButtonCheckedState() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_widget_master_switch, null));
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-        preference.onBindViewHolder(holder);
-
-        preference.setChecked(true);
-        assertThat(toggle.isChecked()).isTrue();
-
-        preference.setChecked(false);
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setSwitchEnabled_shouldUpdateButtonEnabledState() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_widget_master_switch, null));
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-        preference.onBindViewHolder(holder);
-
-        preference.setSwitchEnabled(true);
-        assertThat(toggle.isEnabled()).isTrue();
-
-        preference.setSwitchEnabled(false);
-        assertThat(toggle.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void setSwitchEnabled_shouldUpdateButtonEnabledState_beforeViewBound() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                        R.layout.preference_widget_master_switch, null));
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-
-        preference.setSwitchEnabled(false);
-        preference.onBindViewHolder(holder);
-        assertThat(toggle.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldToggleButton() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(R.layout.preference_two_target, null));
-        final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
-        inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-        preference.onBindViewHolder(holder);
-
-        widgetView.performClick();
-        assertThat(toggle.isChecked()).isTrue();
-
-        widgetView.performClick();
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotToggleButtonIfDisabled() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(R.layout.preference_two_target, null));
-        final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
-        inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-        preference.onBindViewHolder(holder);
-        toggle.setEnabled(false);
-
-        widgetView.performClick();
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotifyPreferenceChanged() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_two_target, null));
-        final View widgetView = holder.findViewById(android.R.id.widget_frame);
-        final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class);
-        preference.setOnPreferenceChangeListener(listener);
-        preference.onBindViewHolder(holder);
-
-        preference.setChecked(false);
-        widgetView.performClick();
-        verify(listener).onPreferenceChange(preference, true);
-
-        preference.setChecked(true);
-        widgetView.performClick();
-        verify(listener).onPreferenceChange(preference, false);
-    }
-
-    @Test
-    public void setDisabledByAdmin_hasEnforcedAdmin_shouldDisableButton() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext)
-                  .inflate(R.layout.preference_widget_master_switch, null));
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-        toggle.setEnabled(true);
-        preference.onBindViewHolder(holder);
-
-        preference.setDisabledByAdmin(mock(EnforcedAdmin.class));
-        assertThat(toggle.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void setDisabledByAdmin_noEnforcedAdmin_shouldEnableButton() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext)
-                  .inflate(R.layout.preference_widget_master_switch, null));
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-        toggle.setEnabled(false);
-        preference.onBindViewHolder(holder);
-
-        preference.setDisabledByAdmin(null);
-        assertThat(toggle.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void onBindViewHolder_toggleButtonShouldHaveContentDescription() {
-        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-            LayoutInflater.from(mContext)
-                .inflate(R.layout.preference_widget_master_switch, null));
-        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
-        final String label = "TestButton";
-        preference.setTitle(label);
-
-        preference.onBindViewHolder(holder);
-
-        assertThat(toggle.getContentDescription()).isEqualTo(label);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
deleted file mode 100644
index e314ef362705fb7b0ecfd678b6ca944ea699a7b5..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RadioButtonPickerFragmentTest {
-
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private UserManager mUserManager;
-
-    private TestFragment mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        mFragment = spy(new TestFragment());
-
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        doReturn(mActivity).when(mFragment).getContext();
-        doReturn(mScreen).when(mFragment).getPreferenceScreen();
-    }
-
-    @Test
-    public void onAttach_userIsInitialized() {
-        mFragment.onAttach((Context) mActivity);
-
-        verify(mActivity).getSystemService(Context.USER_SERVICE);
-    }
-
-    @Test
-    public void displaySingleOption_shouldSelectRadioButton() {
-        final RadioButtonPreference pref =
-                new RadioButtonPreference(RuntimeEnvironment.application);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(pref);
-
-        mFragment.mayCheckOnlyRadioButton();
-
-        assertThat(pref.isChecked()).isTrue();
-    }
-
-    @Test
-    public void clickPreference_shouldConfirm() {
-        final RadioButtonPreference pref =
-                new RadioButtonPreference(RuntimeEnvironment.application);
-        pref.setKey("TEST");
-
-        mFragment.onRadioButtonClicked(pref);
-
-        assertThat(mFragment.setDefaultKeyCalled).isTrue();
-    }
-
-    public static class TestFragment extends RadioButtonPickerFragment {
-
-        boolean setDefaultKeyCalled;
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-
-        @Override
-        protected List<DefaultAppInfo> getCandidates() {
-            return new ArrayList<>();
-        }
-
-        @Override
-        protected String getDefaultKey() {
-            return null;
-        }
-
-        @Override
-        protected boolean setDefaultKey(String key) {
-            setDefaultKeyCalled = true;
-            return true;
-        }
-
-        @Override
-        public Context getContext() {
-            return RuntimeEnvironment.application;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
deleted file mode 100644
index a1a2f2452c553cbdc4e54912149bc862385198eb..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.view.View.MeasureSpec;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertEquals;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class RingProgressBarTest {
-
-    private Context mContext = RuntimeEnvironment.application;
-
-    private RingProgressBar mProgressBar;
-
-    @Before
-    public void setUp() {
-        mProgressBar = new RingProgressBar(mContext);
-    }
-
-    @Test
-    public void testMeasurePortrait() {
-        mProgressBar.measure(
-                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(200, MeasureSpec.EXACTLY));
-        assertEquals(100, mProgressBar.getMeasuredHeight());
-        assertEquals(100, mProgressBar.getMeasuredWidth());
-    }
-
-    @Test
-    public void testMeasureLandscape() {
-        mProgressBar.measure(
-                MeasureSpec.makeMeasureSpec(200, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
-        assertEquals(100, mProgressBar.getMeasuredHeight());
-        assertEquals(100, mProgressBar.getMeasuredWidth());
-    }
-
-    @Test
-    public void testDefaultAttributes() {
-        assertEquals(false, mProgressBar.isIndeterminate());
-        assertEquals(0, mProgressBar.getProgress());
-        assertEquals(10000, mProgressBar.getMax());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
deleted file mode 100644
index 78afc43026c989d5500dab06a1677857730937ca..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowTextUtils;
-import java.util.Locale;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {ShadowTextUtils.class}
-)
-public class RtlCompatibleViewPagerTest {
-
-    private Locale mLocaleEn;
-    private Locale mLocaleHe;
-    private RtlCompatibleViewPager mViewPager;
-
-    @Before
-    public void setUp() {
-        mViewPager = new RtlCompatibleViewPager(
-                ShadowApplication.getInstance().getApplicationContext());
-        mViewPager.setAdapter(new ViewPagerAdapter());
-        mLocaleEn = new Locale("en");
-        mLocaleHe = new Locale("he");
-    }
-
-    @Test
-    public void testGetCurrentItem_shouldMaintainIndexDuringLocaleChange() {
-        testRtlCompatibleInner(0);
-        testRtlCompatibleInner(1);
-    }
-
-    private void testRtlCompatibleInner(int currentItem) {
-        // Set up the environment
-        Locale.setDefault(mLocaleEn);
-        mViewPager.setCurrentItem(currentItem);
-
-        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
-                .isEqualTo(View.LAYOUT_DIRECTION_LTR);
-        assertThat(mViewPager.getCurrentItem()).isEqualTo(currentItem);
-
-        // Simulate to change the language to RTL
-        Parcelable savedInstance = mViewPager.onSaveInstanceState();
-        Locale.setDefault(mLocaleHe);
-        mViewPager.onRestoreInstanceState(savedInstance);
-
-        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
-                .isEqualTo(View.LAYOUT_DIRECTION_RTL);
-        assertThat(mViewPager.getCurrentItem()).isEqualTo(currentItem);
-    }
-
-    /**
-     * Test viewpager adapter, uses 2 view to test it
-     */
-    private static final class ViewPagerAdapter extends PagerAdapter {
-
-        private static final int ITEM_COUNT = 2;
-
-        public ViewPagerAdapter() {
-        }
-
-        @Override
-        public int getCount() {
-            return ITEM_COUNT;
-        }
-
-        @Override
-        public boolean isViewFromObject(View view, Object object) {
-            return view == object;
-        }
-
-        @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-            return null;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return null;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
deleted file mode 100644
index 5755015614299243367b3a4d05385b55027b2dc0..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.robolectric.RuntimeEnvironment.application;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.graphics.Rect;
-import android.widget.FrameLayout;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowView;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ScrollToParentEditTextTest {
-
-    private static final int EDIT_TEXT_SIZE = 20;
-    private static final int PARENT_SIZE = 50;
-    private static final int SCROLL_RECT_SIZE = 30;
-
-    private ScrollToParentEditText mEditText;
-    private FrameLayout mParent;
-
-    @Before
-    public void setUp() {
-        mEditText = new ScrollToParentEditText(
-                application,
-                Robolectric.buildAttributeSet().build());
-        mEditText.layout(0, 0, EDIT_TEXT_SIZE, EDIT_TEXT_SIZE);
-
-        mParent = spy(new FrameLayout(application));
-        mParent.layout(0, 0, PARENT_SIZE, PARENT_SIZE);
-
-        doReturn(true).when(mParent).requestRectangleOnScreen(any(Rect.class), anyBoolean());
-    }
-
-    @Test
-    public void requestRectangleOnScreen_noParent_shouldScrollToItself() {
-        assertThat(mEditText.requestRectangleOnScreen(
-                new Rect(0, 0, SCROLL_RECT_SIZE, SCROLL_RECT_SIZE), true)).isFalse();
-    }
-
-    @Test
-    public void requestRectangleOnScreen_withParent_shouldScrollToParent() {
-        ShadowView shadowEditText = shadowOf(mEditText);
-        shadowEditText.setMyParent(mParent);
-
-        assertThat(mEditText.requestRectangleOnScreen(
-                new Rect(0, 0, SCROLL_RECT_SIZE, SCROLL_RECT_SIZE), true)).isTrue();
-        verify(mParent)
-                .requestRectangleOnScreen(eq(new Rect(0, 0, PARENT_SIZE, PARENT_SIZE)), eq(true));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
deleted file mode 100644
index 2f42550b6e42951e985abe2b1e89a7a09235f229..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SummaryUpdaterTest {
-
-    private Context mContext;
-
-    private SummaryUpdaterTestable mSummaryUpdater;
-    @Mock
-    private SummaryListener mListener;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application.getApplicationContext();
-        mSummaryUpdater = new SummaryUpdaterTestable(mContext, mListener);
-    }
-
-    @Test
-    public void notifyChangeIfNeeded_fistTimeInit_shouldNotifyChange() {
-        final String summary = "initialized";
-        mSummaryUpdater.setTestSummary(summary);
-        mSummaryUpdater.notifyChangeIfNeeded();
-
-        verify(mListener).onSummaryChanged(summary);
-    }
-
-    @Test
-    public void notifyChangeIfNeeded_summaryUpdated_shouldNotifyChange() {
-        final String summaryInit = "initialized";
-        mSummaryUpdater.setTestSummary(summaryInit);
-        mSummaryUpdater.notifyChangeIfNeeded();
-        final String summaryUpdate = "updated";
-
-        mSummaryUpdater.setTestSummary(summaryUpdate);
-        mSummaryUpdater.notifyChangeIfNeeded();
-
-        verify(mListener).onSummaryChanged(summaryUpdate);
-    }
-
-    @Test
-    public void notifyChangeIfNeeded_summaryNotUpdated_shouldOnlyNotifyChangeOnce() {
-        final String summaryInit = "initialized";
-        mSummaryUpdater.setTestSummary(summaryInit);
-        mSummaryUpdater.notifyChangeIfNeeded();
-        final String summaryUpdate = "updated";
-        mSummaryUpdater.setTestSummary(summaryUpdate);
-
-        mSummaryUpdater.notifyChangeIfNeeded();
-        mSummaryUpdater.notifyChangeIfNeeded();
-
-        verify(mListener, times(1)).onSummaryChanged(summaryUpdate);
-    }
-
-    private class SummaryListener implements SummaryUpdater.OnSummaryChangeListener {
-        String summary;
-
-        @Override
-        public void onSummaryChanged(String summary) {
-            this.summary = summary;
-        }
-    }
-
-    public final class SummaryUpdaterTestable extends SummaryUpdater {
-        private String mTestSummary;
-
-        SummaryUpdaterTestable(Context context, SummaryUpdater.OnSummaryChangeListener listener) {
-            super(context, listener);
-        }
-
-        @Override
-        public void register(boolean register) {
-        }
-
-        @Override
-        public void notifyChangeIfNeeded() {
-            super.notifyChangeIfNeeded();
-        }
-
-        @Override
-        public String getSummary() {
-            return mTestSummary;
-        }
-
-        public void setTestSummary(String summary) {
-            mTestSummary = summary;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
deleted file mode 100644
index e061787483dcbd7b3abc41dafb6628536dd11b2b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-
-import android.text.InputType;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.EditText;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ValidatedEditTextPreferenceTest {
-
-    @Mock
-    private View mView;
-    @Mock
-    private ValidatedEditTextPreference.Validator mValidator;
-
-    private ValidatedEditTextPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void bindDialogView_nullEditText_shouldNotCrash() {
-        when(mView.findViewById(android.R.id.edit)).thenReturn(null);
-        // should not crash trying to get the EditText text
-        mPreference.onBindDialogView(mView);
-    }
-
-    @Test
-    public void bindDialogView_emptyEditText_shouldNotSetSelection() {
-        final String testText = "";
-        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
-        editText.setText(testText);
-        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
-
-        mPreference.onBindDialogView(mView);
-
-        // no need to setSelection if text was empty
-        verify(editText, never()).setSelection(anyInt());
-    }
-
-    @Test
-    public void bindDialogView_nonemptyEditText_shouldSetSelection() {
-        final String testText = "whatever";
-        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
-        editText.setText(testText);
-        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
-
-        mPreference.onBindDialogView(mView);
-
-        // selection should be set to end of string
-        verify(editText).setSelection(testText.length());
-    }
-
-    @Test
-    public void bindDialogView_hasValidator_shouldBindToEditText() {
-        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
-        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
-
-        mPreference.setValidator(mValidator);
-        mPreference.onBindDialogView(mView);
-
-        verify(editText).addTextChangedListener(any(TextWatcher.class));
-    }
-
-    @Test
-    public void bindDialogView_isPassword_shouldSetInputType() {
-        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
-        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
-
-        mPreference.setValidator(mValidator);
-        mPreference.setIsPassword(true);
-        mPreference.onBindDialogView(mView);
-
-        assertThat(editText.getInputType()
-                & (InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT))
-                .isNotEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
deleted file mode 100644
index 415cd92bf6ffa732a8695457d72395e1edb7c2af..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CellularFallbackPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private WifiManager mWifiManager;
-
-    private CellularFallbackPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new CellularFallbackPreferenceController(mContext);
-    }
-
-    @Test
-    public void isAvailable_avoidBadWifiConfigIsFalse_shouldReturnTrue() {
-        when(mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_networkAvoidBadWifi))
-                .thenReturn(0);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_avoidBadWifiConfigIsTrue_shouldReturnFalse() {
-        when(mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_networkAvoidBadWifi))
-                .thenReturn(1);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
deleted file mode 100644
index 687287be8a49fdffc4db326e362b959681023314..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ConfigureWifiSettingsTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = spy(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-        final int xmlId = new ConfigureWifiSettings().getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-
-    @Test
-    public void testNonIndexableKeys_noConnection_blocksIP() {
-        ConnectivityManager manager = mock(ConnectivityManager.class);
-        when(manager.getActiveNetworkInfo()).thenReturn(null);
-        doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-        assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
-    }
-
-    @Test
-    public void testNonIndexableKeys_wifiConnection_blocksIP() {
-        ConnectivityManager manager = mock(ConnectivityManager.class);
-        NetworkInfo info = mock(NetworkInfo.class);
-        when(info.getType()).thenReturn(ConnectivityManager.TYPE_WIFI);
-        when(manager.getActiveNetworkInfo()).thenReturn(info);
-        doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-        assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
-    }
-
-    @Test
-    public void testNonIndexableKeys_mobileConnection_blocksIP() {
-        ConnectivityManager manager = mock(ConnectivityManager.class);
-        NetworkInfo info = mock(NetworkInfo.class);
-        when(info.getType()).thenReturn(ConnectivityManager.TYPE_MOBILE);
-        when(manager.getActiveNetworkInfo()).thenReturn(info);
-        doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-        assertThat(niks).doesNotContain(ConfigureWifiSettings.KEY_IP_ADDRESS);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
deleted file mode 100644
index 9321827864ff503a8025ccbe0309419b6510054c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.settings.LinkifyUtils;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LinkablePreferenceTest {
-
-    private static final String TITLE = "Title";
-
-    private Context mContext = RuntimeEnvironment.application;
-
-    private LinkablePreference mPreference;
-    private PreferenceViewHolder mHolder;
-    private View mView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mPreference = new LinkablePreference(mContext);
-        final CharSequence linkableDescription =
-                mContext.getResources().getText(R.string.wifi_scan_notify_text);
-        final LinkifyUtils.OnClickListener clickListener = () -> {/* Do nothing */ };
-        mPreference.setText(TITLE, linkableDescription, clickListener);
-
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mView = inflater.inflate(
-                mPreference.getLayoutResource(), new LinearLayout(mContext), false);
-        mHolder = PreferenceViewHolder.createInstanceForTests(mView);
-
-        mPreference.onBindViewHolder(mHolder);
-    }
-
-    @Test
-    public void prefWithLinkShouldHaveAccessibilityMovementMethodSet() {
-        TextView textView = mView.findViewById(android.R.id.title);
-        assertThat(textView.getMovementMethod()).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
deleted file mode 100644
index b83a3e3f62884bd5d0e4694565742f0a451f6d25..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class NotifyOpenNetworkPreferenceControllerTest {
-
-    private Context mContext;
-    private NotifyOpenNetworksPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new NotifyOpenNetworksPreferenceController(mContext, mock(Lifecycle.class));
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() {
-        final SwitchPreference pref = new SwitchPreference(mContext);
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_nonMatchingType_shouldDoNothing() {
-        final Preference pref = new Preference(mContext);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_matchingKeyAndType_shouldUpdateSetting() {
-        final SwitchPreference pref = new SwitchPreference(mContext);
-        pref.setChecked(true);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isTrue();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0))
-                .isEqualTo(1);
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedWhenSettingsAreEnabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(),
-                WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 1);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedWhenSettingsAreDisabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(),
-                WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
deleted file mode 100644
index 8a72d25fe95b53c900f3df45711c6a7fee5eddbc..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.app.Activity;
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.ActionListener;
-
-import com.android.settings.TestConfig;
-import com.android.settingslib.wifi.AccessPoint;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedAccessPointsWifiSettingsTest {
-
-  @Mock private Activity mActivity;
-  @Mock private WifiManager mockWifiManager;
-  @Mock private WifiDialog mockWifiDialog;
-  @Mock private WifiConfigController mockConfigController;
-  @Mock private WifiConfiguration mockWifiConfiguration;
-  @Mock private AccessPoint mockAccessPoint;
-
-  private Context mContext;
-
-  private SavedAccessPointsWifiSettings mFragment;
-
-  @Before
-  public void setUp() {
-    MockitoAnnotations.initMocks(this);
-    mContext = RuntimeEnvironment.application;
-    mFragment = new SavedAccessPointsWifiSettings();
-    when(mockWifiDialog.getController()).thenReturn(mockConfigController);
-    when(mockConfigController.getConfig()).thenReturn(mockWifiConfiguration);
-
-    ReflectionHelpers.setField(mFragment, "mWifiManager", mockWifiManager);
-  }
-
-  @Test
-  public void onSubmit_shouldInvokeSaveApi() {
-    mFragment.onSubmit(mockWifiDialog);
-    verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
-  }
-
-  @Test
-  public void onForget_shouldInvokeForgetApi() {
-    ReflectionHelpers.setField(mFragment, "mSelectedAccessPoint", mockAccessPoint);
-    when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
-
-    mFragment.onForget(mockWifiDialog);
-
-    verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
-  }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
deleted file mode 100644
index a76b82a1f148bbbe29846ce953b35e228d249372..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE;
-import static com.android.settings.wifi.UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.annotation.NonNull;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.net.NetworkScoreManager;
-import android.net.NetworkScorerAppData;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.network.NetworkScoreManagerWrapper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UseOpenWifiPreferenceControllerTest {
-    private static ComponentName ENABLE_ACTIVITY_COMPONENT =
-            new ComponentName("package", "activityClass");
-    private static NetworkScorerAppData APP_DATA =
-            new NetworkScorerAppData(0, null, null, ENABLE_ACTIVITY_COMPONENT, null);
-    private static NetworkScorerAppData APP_DATA_NO_ACTIVITY =
-            new NetworkScorerAppData(0, null, null, null, null);
-
-    @Mock private Lifecycle mLifecycle;
-    @Mock private Fragment mFragment;
-    @Mock private NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
-    @Captor private ArgumentCaptor<Intent> mIntentCaptor;
-    private Context mContext;
-    private UseOpenWifiPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-    }
-
-    private void createController() {
-        mController = new UseOpenWifiPreferenceController(
-                mContext, mFragment, mNetworkScoreManagerWrapper, mLifecycle);
-    }
-
-    /**
-     * Sets the scorers.
-     * @param scorers list of scorers returned by {@link NetworkScoreManager#getAllValidScorers()}.
-     *                First scorer in the list is the active scorer.
-     */
-    private void setupScorers(@NonNull List<NetworkScorerAppData> scorers) {
-        when(mNetworkScoreManagerWrapper.getActiveScorerPackage()).thenReturn(
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
-        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers);
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0));
-    }
-
-    @Test
-    public void testIsAvailable_returnsFalseWhenNoScorerSet() {
-        createController();
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_returnsFalseWhenScorersNotSupported() {
-        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
-        createController();
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_returnsTrueIfActiveScorerSupported() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
-        createController();
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testIsAvailable_returnsTrueIfNonActiveScorerSupported() {
-        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY, APP_DATA));
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA_NO_ACTIVITY);
-        createController();
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChange_nonMatchingKey_shouldDoNothing() {
-        createController();
-
-        final SwitchPreference pref = new SwitchPreference(mContext);
-
-        assertThat(mController.onPreferenceChange(pref, null)).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChange_notAvailable_shouldDoNothing() {
-        createController();
-
-        final Preference pref = new Preference(mContext);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.onPreferenceChange(pref, null)).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChange_matchingKeyAndAvailable_enableShouldStartEnableActivity() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
-        createController();
-
-        final SwitchPreference pref = new SwitchPreference(mContext);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.onPreferenceChange(pref, null)).isFalse();
-        verify(mFragment).startActivityForResult(mIntentCaptor.capture(),
-                eq(REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY));
-        Intent activityIntent = mIntentCaptor.getValue();
-        assertThat(activityIntent.getComponent()).isEqualTo(ENABLE_ACTIVITY_COMPONENT);
-        assertThat(activityIntent.getAction()).isEqualTo(NetworkScoreManager.ACTION_CUSTOM_ENABLE);
-    }
-
-    @Test
-    public void onPreferenceChange_matchingKeyAndAvailable_disableShouldUpdateSetting() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
-        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
-
-        createController();
-
-        final SwitchPreference pref = new SwitchPreference(mContext);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.onPreferenceChange(pref, null)).isTrue();
-        assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE))
-                .isEqualTo("");
-    }
-
-    @Test
-    public void onActivityResult_nonmatchingRequestCode_shouldDoNothing() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
-        createController();
-
-        assertThat(mController.onActivityResult(234 /* requestCode */ , Activity.RESULT_OK))
-                .isEqualTo(false);
-        assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE))
-                .isNull();
-    }
-
-    @Test
-    public void onActivityResult_matchingRequestCode_nonOkResult_shouldDoNothing() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
-        createController();
-
-        assertThat(mController
-                .onActivityResult(REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY, Activity.RESULT_CANCELED))
-                .isEqualTo(true);
-        assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE))
-                .isNull();
-    }
-
-    @Test
-    public void onActivityResult_matchingRequestCode_okResult_updatesSetting() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
-        createController();
-
-        assertThat(mController
-                .onActivityResult(REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY, Activity.RESULT_OK))
-                .isEqualTo(true);
-        assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE))
-                .isEqualTo(ENABLE_ACTIVITY_COMPONENT.getPackageName());
-    }
-
-    @Test
-    public void updateState_noEnableActivity_preferenceDisabled_summaryChanged() {
-        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
-        createController();
-
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-        verify(preference).setSummary(
-                R.string.use_open_wifi_automatically_summary_scorer_unsupported_disabled);
-    }
-
-    @Test
-    public void updateState_noScorer_preferenceDisabled_summaryChanged() {
-        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(new ArrayList<>());
-        createController();
-
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-        verify(preference).setSummary(
-                R.string.use_open_wifi_automatically_summary_scoring_disabled);
-    }
-
-    @Test
-    public void updateState_enableActivityExists_preferenceEnabled() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
-        createController();
-
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-        verify(preference).setSummary(R.string.use_open_wifi_automatically_summary);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
deleted file mode 100644
index e9b61463c0830f7142b67cd6cd4fcc8947143fcf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.*;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowConnectivityManager.class)
-public class WifiConfigControllerTest {
-
-    @Mock
-    private WifiConfigUiBase mConfigUiBase;
-    @Mock
-    private Context mContext;
-    @Mock
-    private View mView;
-    @Mock
-    private AccessPoint mAccessPoint;
-
-    public WifiConfigController mController;
-    private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
-            + "01abcdef";
-    // An invalid ASCII PSK pass phrase. It is 64 characters long, must not be greater than 63
-    private static final String LONG_PSK =
-            "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl";
-    // An invalid PSK pass phrase. It is 7 characters long, must be at least 8
-    private static final String SHORT_PSK = "abcdefg";
-    // Valid PSK pass phrase
-    private static final String GOOD_PSK = "abcdefghijklmnopqrstuvwxyz";
-    private static final int DHCP = 0;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        when(mConfigUiBase.getContext()).thenReturn(mContext);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-        mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
-        final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
-        ipSettingsSpinner.setSelection(DHCP);
-
-        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT);
-    }
-
-    @Test
-    public void ssidExceeds32Bytes_shouldShowSsidTooLongWarning() {
-        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
-                WifiConfigUiBase.MODE_CONNECT);
-        final TextView ssid = mView.findViewById(R.id.ssid);
-        ssid.setText("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎");
-        mController.showWarningMessagesIfAppropriate();
-
-        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
-                .isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void ssidShorterThan32Bytes_shouldNotShowSsidTooLongWarning() {
-        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
-                WifiConfigUiBase.MODE_CONNECT);
-
-        final TextView ssid = mView.findViewById(R.id.ssid);
-        ssid.setText("123456789012345678901234567890");
-        mController.showWarningMessagesIfAppropriate();
-
-        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
-                .isEqualTo(View.GONE);
-
-        ssid.setText("123");
-        mController.showWarningMessagesIfAppropriate();
-
-        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void isSubmittable_noSSID_shouldReturnFalse() {
-        final TextView ssid = mView.findViewById(R.id.ssid);
-        ssid.setText("");
-        assertThat(mController.isSubmittable()).isFalse();
-    }
-
-    @Test
-    public void isSubmittable_longPsk_shouldReturnFalse() {
-        final TextView password = mView.findViewById(R.id.password);
-        password.setText(LONG_PSK);
-        assertThat(mController.isSubmittable()).isFalse();
-
-    }
-
-    @Test
-    public void isSubmittable_shortPsk_shouldReturnFalse() {
-        final TextView password = mView.findViewById(R.id.password);
-        password.setText(SHORT_PSK);
-        assertThat(mController.isSubmittable()).isFalse();
-    }
-
-    @Test
-    public void isSubmittable_goodPsk_shouldReturnTrue() {
-        final TextView password = mView.findViewById(R.id.password);
-        password.setText(GOOD_PSK);
-        assertThat(mController.isSubmittable()).isTrue();
-
-    }
-
-    @Test
-    public void isSubmittable_hexPsk_shouldReturnTrue() {
-        final TextView password = mView.findViewById(R.id.password);
-        password.setText(HEX_PSK);
-        assertThat(mController.isSubmittable()).isTrue();
-
-    }
-
-    @Test
-    public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
-        final TextView password = mView.findViewById(R.id.password);
-        password.setText("");
-        when(mAccessPoint.isSaved()).thenReturn(true);
-        assertThat(mController.isSubmittable()).isTrue();
-    }
-
-    @Test
-    public void isSubmittable_nullAccessPoint_noException() {
-        mController = new TestWifiConfigController(mConfigUiBase, mView, null,
-                WifiConfigUiBase.MODE_CONNECT);
-        mController.isSubmittable();
-    }
-
-    @Test
-    public void getSignalString_notReachable_shouldHaveNoSignalString() {
-        when(mAccessPoint.isReachable()).thenReturn(false);
-
-        assertThat(mController.getSignalString()).isNull();
-    }
-
-    @Test
-    public void showForCarrierAp() {
-        // Setup the mock view for wifi dialog.
-        View view = mock(View.class);
-        TextView nameText = mock(TextView.class);
-        TextView valueText = mock(TextView.class);
-        when(view.findViewById(R.id.name)).thenReturn(nameText);
-        when(view.findViewById(R.id.value)).thenReturn(valueText);
-        LayoutInflater inflater = mock(LayoutInflater.class);
-        when(inflater.inflate(anyInt(), any(ViewGroup.class), anyBoolean())).thenReturn(view);
-        when(mConfigUiBase.getLayoutInflater()).thenReturn(inflater);
-
-        String carrierName = "Test Carrier";
-        when(mAccessPoint.isCarrierAp()).thenReturn(true);
-        when(mAccessPoint.getCarrierName()).thenReturn(carrierName);
-        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT);
-        // Verify the content of the text fields.
-        verify(nameText).setText(R.string.wifi_carrier_connect);
-        verify(valueText).setText(
-                String.format(mContext.getString(R.string.wifi_carrier_content), carrierName));
-        // Verify that the advance toggle is not visible.
-        assertThat(mView.findViewById(R.id.wifi_advanced_toggle).getVisibility())
-                .isEqualTo(View.GONE);
-        // Verify that the EAP method menu is not visible.
-        assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.GONE);
-    }
-
-    public class TestWifiConfigController extends WifiConfigController {
-
-        public TestWifiConfigController(WifiConfigUiBase parent, View view,
-                AccessPoint accessPoint, int mode) {
-            super(parent, view, accessPoint, mode);
-        }
-
-        @Override
-        boolean isSplitSystemUser() {
-            return false;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
deleted file mode 100644
index 00941ad16628c1ebd4fbbb0ff60bc1d97b21810c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-
-import com.android.settings.wifi.WifiDialog.WifiDialogListener;
-import com.android.settingslib.wifi.AccessPoint;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowEntityHeaderController.class)
-public class WifiDialogTest {
-    @Mock private AccessPoint mockAccessPoint;
-
-    private Context mContext = RuntimeEnvironment.application;
-
-    private WifiDialogListener mListener = new WifiDialogListener() {
-        @Override
-        public void onForget(WifiDialog dialog) {
-        }
-
-        @Override
-        public void onSubmit(WifiDialog dialog) {
-        }
-    };
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void createFullscreen_setsFullscreenTheme() {
-        WifiDialog fullscreen = WifiDialog.createFullscreen(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT);
-        assertThat(fullscreen.getContext().getThemeResId())
-                .isEqualTo(R.style.Theme_Settings_NoActionBar);
-    }
-
-    @Test
-    public void createModal_usesDefaultTheme() {
-        WifiDialog modal = WifiDialog
-                .createModal(mContext, mListener, mockAccessPoint, WifiConfigUiBase.MODE_CONNECT);
-
-        WifiDialog wifiDialog = new WifiDialog(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT, 0 /* style */, false /* hideSubmitButton */);
-        assertThat(modal.getContext().getThemeResId())
-                .isEqualTo(wifiDialog.getContext().getThemeResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
deleted file mode 100644
index c7647ba2beeadaf5f60199c21a5418df64a4a6dd..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.widget.SwitchWidgetController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiEnablerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private ConnectivityManagerWrapper mConnectivityManager;
-
-    private WifiEnabler mEnabler;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        mEnabler = new WifiEnabler(mContext, mock(SwitchWidgetController.class),
-            mock(MetricsFeatureProvider.class), mConnectivityManager);
-    }
-
-    @Test
-    public void onSwitchToggled_avoidBadWifiConfigIsFalse_shouldReturnTrue() {
-        when(mWifiManager.setWifiEnabled(true)).thenReturn(true);
-        when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED);
-
-        mEnabler.onSwitchToggled(true);
-
-        verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
deleted file mode 100644
index 1650816188807312af376a681872cb4ebfb6d865..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiInfoPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private WifiManager mWifiManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mIpPreference;
-    @Mock
-    private Preference mMacPreference;
-
-    private Lifecycle mLifecycle;
-    private WifiInfoPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mContext.getSystemService(WifiManager.class))
-                .thenReturn(mWifiManager);
-        when(mScreen.findPreference(anyString()))
-                .thenReturn(mMacPreference)
-                .thenReturn(mIpPreference);
-        mController = new WifiInfoPreferenceController(mContext, mLifecycle, mWifiManager);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void getPreferenceKey_shouldReturnNull() {
-        assertThat(mController.getPreferenceKey()).isNull();
-    }
-
-    @Test
-    public void runThroughLifecycle_shouldInstallListenerOnResume() {
-        mLifecycle.onResume();
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-
-        mLifecycle.onPause();
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-    }
-
-    @Test
-    public void onResume_shouldUpdateWifiInfo() {
-        when(mWifiManager.getCurrentNetwork()).thenReturn(null);
-
-        mController.displayPreference(mScreen);
-        mController.onResume();
-
-        verify(mMacPreference).setSummary(any());
-        verify(mIpPreference).setSummary(any());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
deleted file mode 100644
index 307cccbfd0ba14d7433f7176340c9aadef667810..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiMasterSwitchPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    Context mMockContext;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private MasterSwitchPreference mPreference;
-
-    private Context mContext;
-    private WifiMasterSwitchPreferenceController mController;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mMockContext);
-        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void onResume_shouldRegisterCallback() {
-        mController.onResume();
-
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-    }
-
-    @Test
-    public void onPause_shouldUnregisterCallback() {
-        mController.onResume();
-        mController.onPause();
-
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-    }
-
-    @Test
-    public void onStart_shouldRegisterPreferenceChangeListener() {
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        verify(mPreference).setOnPreferenceChangeListener(any(OnPreferenceChangeListener.class));
-    }
-
-    @Test
-    public void onStop_shouldRegisterPreferenceChangeListener() {
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        mController.onStop();
-
-        verify(mPreference).setOnPreferenceChangeListener(null);
-    }
-
-    @Test
-    public void onSummaryChanged_shouldUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-
-        mController.onSummaryChanged("test summary");
-
-        verify(mPreference).setSummary("test summary");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
deleted file mode 100644
index 4507e548d1c8d054470c917dcae1e4a060b5685f..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
-import com.android.settingslib.wifi.WifiStatusTracker;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiSummaryUpdaterTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private WifiManager mWifiManager;
-    @Mock
-    private SummaryListener mListener;
-
-    private Context mContext;
-    private WifiSummaryUpdater mSummaryUpdater;
-    private WifiStatusTracker mWifiTracker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mWifiTracker = new WifiStatusTracker(mWifiManager);
-
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        mSummaryUpdater = new WifiSummaryUpdater(mContext, mListener, mWifiTracker);
-    }
-
-    @Test
-    public void register_true_shouldRegisterListener() {
-        mSummaryUpdater.register(true);
-
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-    }
-
-    @Test
-    public void register_false_shouldUnregisterListener() {
-        mSummaryUpdater.register(true);
-        mSummaryUpdater.register(false);
-
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-    }
-
-    @Test
-    public void onReceive_networkStateChanged_shouldSendSummaryChange() {
-        mSummaryUpdater.register(true);
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-
-        verify(mListener).onSummaryChanged(anyString());
-    }
-
-    @Test
-    public void onReceive_rssiChanged_shouldSendSummaryChange() {
-        mSummaryUpdater.register(true);
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-
-        verify(mListener).onSummaryChanged(anyString());
-    }
-
-    @Test
-    public void getSummary_wifiDisabled_shouldReturnDisabled() {
-        mWifiTracker.enabled = false;
-
-        assertThat(mSummaryUpdater.getSummary()).isEqualTo(
-            mContext.getString(R.string.switch_off_text));
-    }
-
-    @Test
-    public void getSummary_wifiDisconnected_shouldReturnDisconnected() {
-        mWifiTracker.enabled = true;
-        mWifiTracker.connected = false;
-
-        assertThat(mSummaryUpdater.getSummary()).isEqualTo(
-            mContext.getString(R.string.disconnected));
-    }
-
-    @Test
-    public void getSummary_wifiConnected_shouldReturnSsid() {
-        mWifiTracker.enabled = true;
-        mWifiTracker.connected = true;
-        mWifiTracker.ssid = "Test Ssid";
-
-        assertThat(mSummaryUpdater.getSummary()).isEqualTo("Test Ssid");
-    }
-
-    private class SummaryListener implements OnSummaryChangeListener {
-        String summary;
-
-        @Override
-        public void onSummaryChanged(String summary) {
-            this.summary = summary;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
deleted file mode 100644
index 1ccdb1f6effb3739b9052b30466b079c507f6403..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiUtilsTest {
-
-    @Test
-    public void testSSID() {
-        assertThat(WifiUtils.isSSIDTooLong("123")).isFalse();
-        assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue();
-
-        assertThat(WifiUtils.isSSIDTooShort("123")).isFalse();
-        assertThat(WifiUtils.isSSIDTooShort("")).isTrue();
-    }
-
-    @Test
-    public void testPassword() {
-        final String longPassword = "123456789012345678901234567890"
-                + "1234567890123456789012345678901234567890";
-        assertThat(WifiUtils.isPasswordValid("123")).isFalse();
-        assertThat(WifiUtils.isPasswordValid("12345678")).isTrue();
-        assertThat(WifiUtils.isPasswordValid("1234567890")).isTrue();
-        assertThat(WifiUtils.isPasswordValid(longPassword)).isFalse();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
deleted file mode 100644
index 306b297c69fd1d965477462b218b4d44c36c3f74..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static android.provider.Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED;
-import static android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE;
-import static android.provider.Settings.Global.WIFI_WAKEUP_AVAILABLE;
-import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.network.NetworkScoreManagerWrapper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = { SettingsShadowResources.class })
-public class WifiWakeupPreferenceControllerTest {
-
-    private static final String TEST_SCORER_PACKAGE_NAME = "Test Scorer";
-
-    private Context mContext;
-    private WifiWakeupPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new WifiWakeupPreferenceController(
-                mContext, mock(Lifecycle.class));
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.integer.config_wifi_wakeup_available, 0);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void testIsAvailable_returnsFalseWhenSettingIsNotAvailable() {
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_AVAILABLE, 0);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_returnsTrueWhenSettingIsAvailable() {
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_AVAILABLE, 1);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() {
-        final SwitchPreference pref = new SwitchPreference(mContext);
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_nonMatchingType_shouldDoNothing() {
-        final Preference pref = new Preference(mContext);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_matchingKeyAndType_shouldUpdateSetting() {
-        final SwitchPreference pref = new SwitchPreference(mContext);
-        pref.setChecked(true);
-        pref.setKey(mController.getPreferenceKey());
-
-        assertThat(mController.handlePreferenceTreeClick(pref)).isTrue();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0))
-                .isEqualTo(1);
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedAndSetEnabledWhenWakeupSettingEnabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-        verify(preference).setEnabled(true);
-        verify(preference).setSummary(R.string.wifi_wakeup_summary);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedAndSetEnabledWhenWakeupSettingDisabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-        verify(preference).setEnabled(true);
-        verify(preference).setSummary(R.string.wifi_wakeup_summary);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedAndSetDisabledWhenWifiScanningDisabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-        verify(preference).setEnabled(false);
-        verify(preference).setSummary(R.string.wifi_wakeup_summary_scanning_disabled);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedAndSetDisabledWhenScoringDisabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 0);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-        verify(preference).setEnabled(false);
-        verify(preference).setSummary(R.string.wifi_wakeup_summary_scoring_disabled);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
deleted file mode 100644
index 94cc46b946ff61d57063f3318d71cf95bdc2e40b..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.FragmentManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WpsPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private WifiManager mWifiManager;
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mWpsPushPref;
-    @Mock
-    private Preference mWpsPinPref;
-
-    private Lifecycle mLifecycle;
-    private WpsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mContext.getSystemService(WifiManager.class))
-                .thenReturn(mWifiManager);
-        when(mScreen.findPreference(anyString()))
-                .thenReturn(mWpsPushPref)
-                .thenReturn(mWpsPinPref);
-        mController = new WpsPreferenceController(
-                mContext, mLifecycle, mWifiManager, mFragmentManager);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testOnResume_shouldRegisterListener() {
-        mLifecycle.onResume();
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-    }
-    @Test
-    public void testOnPause_shouldUnregisterListener() {
-        mLifecycle.onPause();
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-    }
-
-    @Test
-    public void testWifiStateChange_shouldToggleEnabledState() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-
-        //Sets the preferences.
-        mController.displayPreference(mScreen);
-        verify(mWpsPushPref).setEnabled(true);
-        verify(mWpsPinPref).setEnabled(true);
-
-        Intent dummyIntent = new Intent();
-        mController.mReceiver.onReceive(mContext, dummyIntent);
-        verify(mWpsPushPref, times(2)).setEnabled(true);
-        verify(mWpsPinPref, times(2)).setEnabled(true);
-
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.mReceiver.onReceive(mContext, dummyIntent);
-        verify(mWpsPushPref).setEnabled(false);
-        verify(mWpsPinPref).setEnabled(false);
-    }
-
-    @Test
-    public void testDisplayPreference_shouldSetPreferenceClickListenerAndToggleEnabledState() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-        mController.displayPreference(mScreen);
-        verify(mWpsPushPref).setOnPreferenceClickListener(any());
-        verify(mWpsPinPref).setOnPreferenceClickListener(any());
-        verify(mWpsPushPref).setEnabled(true);
-        verify(mWpsPinPref).setEnabled(true);
-    }
-
-    @Test
-    public void testDisplayPreference_shouldDisablePreferenceWhenWifiDisabled() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.displayPreference(mScreen);
-        verify(mWpsPushPref).setEnabled(false);
-        verify(mWpsPinPref).setEnabled(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
deleted file mode 100644
index 41b71ada45c33a9ae5c23a0d25838c35c250d0a3..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowNfcAdapter;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowNfcAdapter.class
-)
-public class WriteWifiConfigToNfcDialogTest {
-    @Mock Activity mActivity;
-    @Mock WifiManagerWrapper mWifiManager;
-
-    private WriteWifiConfigToNfcDialog mWriteWifiConfigToNfcDialog;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getApplicationContext()).thenReturn(mActivity);
-        when(mActivity.getSystemService(Context.INPUT_METHOD_SERVICE))
-                .thenReturn(ReflectionHelpers.newInstance(InputMethodManager.class));
-
-        mWriteWifiConfigToNfcDialog = new WriteWifiConfigToNfcDialog(RuntimeEnvironment.application,
-                0 /* security */, mWifiManager);
-        mWriteWifiConfigToNfcDialog.setOwnerActivity(mActivity);
-        mWriteWifiConfigToNfcDialog.onCreate(null /* savedInstanceState */);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowNfcAdapter.reset();
-    }
-
-    @Test
-    public void testOnClick_nfcConfigurationTokenDoesNotContainPasswordHex() {
-        when(mWifiManager.getCurrentNetworkWpsNfcConfigurationToken()).thenReturn("blah");
-
-        mWriteWifiConfigToNfcDialog.onClick(null);
-
-        assertThat(ShadowNfcAdapter.isReaderModeEnabled()).isFalse();
-    }
-
-    @Test
-    public void testOnClick_nfcConfigurationTokenIsNull() {
-        when(mWifiManager.getCurrentNetworkWpsNfcConfigurationToken()).thenReturn(null);
-
-        mWriteWifiConfigToNfcDialog.onClick(null);
-
-        assertThat(ShadowNfcAdapter.isReaderModeEnabled()).isFalse();
-    }
-
-    @Test
-    public void testOnClick_nfcConfigurationTokenContainsPasswordHex() {
-        // This is the corresponding passwordHex for an empty string password.
-        when(mWifiManager.getCurrentNetworkWpsNfcConfigurationToken()).thenReturn("10270000");
-
-        mWriteWifiConfigToNfcDialog.onClick(null);
-
-        assertThat(ShadowNfcAdapter.isReaderModeEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java
deleted file mode 100644
index c573d3cb65831b66aa9e44354abd546cc986a418..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.details;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiDetailActionBarObserverTest {
-
-    @Mock private Bundle mockBundle;
-    @Mock private Activity mockActivity;
-    @Mock private ActionBar mockActionBar;
-    @Mock private WifiNetworkDetailsFragment mockFragment;
-
-    private Context mContext = RuntimeEnvironment.application;
-    private Lifecycle mLifecycle;
-    private WifiDetailActionBarObserver mObserver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mLifecycle = new Lifecycle();
-
-        when(mockFragment.getActivity()).thenReturn(mockActivity);
-        when(mockActivity.getActionBar()).thenReturn(mockActionBar);
-
-        mObserver = new WifiDetailActionBarObserver(mContext, mockFragment);
-        mLifecycle.addObserver(mObserver);
-    }
-
-    @Test
-    public void actionBarIsSetToNetworkInfo() {
-        mLifecycle.onCreate(mockBundle);
-
-        verify(mockActionBar).setTitle(mContext.getString(R.string.wifi_details_title));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
deleted file mode 100644
index 90d121506cf077ccae7340d9087cdee4d46232c1..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ /dev/null
@@ -1,791 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.details;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.IpPrefix;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.Network;
-import android.net.NetworkBadging;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkRequest;
-import android.net.RouteInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Handler;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.ImageView;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settings.wifi.WifiDetailPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowEntityHeaderController.class)
-public class WifiDetailPreferenceControllerTest {
-
-    private static final int LEVEL = 1;
-    private static final int RSSI = -55;
-    private static final int LINK_SPEED = 123;
-    private static final String MAC_ADDRESS = WifiInfo.DEFAULT_MAC_ADDRESS;
-    private static final String SECURITY = "None";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mockScreen;
-
-    @Mock private AccessPoint mockAccessPoint;
-    @Mock private Activity mockActivity;
-    @Mock private ConnectivityManager mockConnectivityManager;
-    @Mock private ConnectivityManagerWrapperImpl mockConnectivityManagerWrapper;
-    @Mock private Network mockNetwork;
-    @Mock private NetworkInfo mockNetworkInfo;
-    @Mock private WifiConfiguration mockWifiConfig;
-    @Mock private WifiInfo mockWifiInfo;
-    @Mock private WifiNetworkDetailsFragment mockFragment;
-    @Mock private WifiManager mockWifiManager;
-    @Mock private MetricsFeatureProvider mockMetricsFeatureProvider;
-
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
-    private EntityHeaderController mockHeaderController;
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
-    private LayoutPreference mockHeaderLayoutPreference;
-    @Mock private ImageView mockHeaderIcon;
-
-    @Mock private LayoutPreference mockButtonsPref;
-    @Mock private Button mockSignInButton;
-    @Mock private WifiDetailPreference mockSignalStrengthPref;
-    @Mock private WifiDetailPreference mockLinkSpeedPref;
-    @Mock private WifiDetailPreference mockFrequencyPref;
-    @Mock private WifiDetailPreference mockSecurityPref;
-    @Mock private WifiDetailPreference mockMacAddressPref;
-    @Mock private WifiDetailPreference mockIpAddressPref;
-    @Mock private WifiDetailPreference mockGatewayPref;
-    @Mock private WifiDetailPreference mockSubnetPref;
-    @Mock private WifiDetailPreference mockDnsPref;
-    @Mock private Button mockForgetButton;
-    @Mock private PreferenceCategory mockIpv6Category;
-    @Mock private WifiDetailPreference mockIpv6AddressesPref;
-
-    @Captor private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
-    @Captor private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
-    @Captor private ArgumentCaptor<Preference> mIpv6AddressCaptor;
-
-    private Context mContext;
-    private Lifecycle mLifecycle;
-    private LinkProperties mLinkProperties;
-    private WifiDetailPreferenceController mController;
-
-    // This class exists so that these values can be made static final. They can't be static final
-    // members of the test class, because any attempt to call IpPrefix or RouteInfo constructors
-    // during static initialization of the test class results in NoSuchMethorError being thrown
-    // when the test is run.
-    private static class Constants {
-        static final int IPV4_PREFIXLEN = 25;
-        static final LinkAddress IPV4_ADDR;
-        static final Inet4Address IPV4_GATEWAY;
-        static final RouteInfo IPV4_DEFAULT;
-        static final RouteInfo IPV4_SUBNET;
-        static final LinkAddress IPV6_LINKLOCAL;
-        static final LinkAddress IPV6_GLOBAL1;
-        static final LinkAddress IPV6_GLOBAL2;
-        static final InetAddress IPV4_DNS1;
-        static final InetAddress IPV4_DNS2;
-        static final InetAddress IPV6_DNS;
-
-        private static LinkAddress ipv6LinkAddress(String addr) throws UnknownHostException {
-            return new LinkAddress(InetAddress.getByName(addr), 64);
-        }
-
-        private static LinkAddress ipv4LinkAddress(String addr, int prefixlen)
-                throws UnknownHostException {
-            return new LinkAddress(InetAddress.getByName(addr), prefixlen);
-        }
-
-        static {
-            try {
-                // We create our test constants in these roundabout ways because the robolectric
-                // shadows don't contain NetworkUtils.parseNumericAddress and other utility methods,
-                // so the easy ways to do things fail with NoSuchMethodError.
-                IPV4_ADDR = ipv4LinkAddress("192.0.2.2", IPV4_PREFIXLEN);
-                IPV4_GATEWAY = (Inet4Address) InetAddress.getByName("192.0.2.127");
-
-                final Inet4Address any4 = (Inet4Address) InetAddress.getByName("0.0.0.0");
-                IpPrefix subnet = new IpPrefix(IPV4_ADDR.getAddress(), IPV4_PREFIXLEN);
-                IPV4_SUBNET = new RouteInfo(subnet, any4);
-                IPV4_DEFAULT = new RouteInfo(new IpPrefix(any4, 0), IPV4_GATEWAY);
-
-                IPV6_LINKLOCAL = ipv6LinkAddress("fe80::211:25ff:fef8:7cb2%1");
-                IPV6_GLOBAL1 = ipv6LinkAddress("2001:db8:1::211:25ff:fef8:7cb2");
-                IPV6_GLOBAL2 = ipv6LinkAddress("2001:db8:1::3dfe:8902:f98f:739d");
-
-                IPV4_DNS1 = InetAddress.getByName("8.8.8.8");
-                IPV4_DNS2 = InetAddress.getByName("8.8.4.4");
-                IPV6_DNS = InetAddress.getByName("2001:4860:4860::64");
-            } catch (UnknownHostException e) {
-                throw new RuntimeException("Invalid hardcoded IP addresss: " + e);
-            }
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycle = new Lifecycle();
-
-        when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
-        when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
-        when(mockAccessPoint.getSecurityString(false)).thenReturn(SECURITY);
-
-        when(mockConnectivityManagerWrapper.getConnectivityManager())
-                .thenReturn(mockConnectivityManager);
-        when(mockConnectivityManager.getNetworkInfo(any(Network.class)))
-                .thenReturn(mockNetworkInfo);
-        doNothing().when(mockConnectivityManagerWrapper).registerNetworkCallback(
-                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
-        doNothing().when(mockForgetButton).setOnClickListener(mForgetClickListener.capture());
-
-        when(mockWifiInfo.getLinkSpeed()).thenReturn(LINK_SPEED);
-        when(mockWifiInfo.getRssi()).thenReturn(RSSI);
-        when(mockWifiInfo.getMacAddress()).thenReturn(MAC_ADDRESS);
-        when(mockWifiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-
-        when(mockWifiManager.getCurrentNetwork()).thenReturn(mockNetwork);
-        mLinkProperties = new LinkProperties();
-        when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(mLinkProperties);
-
-        when(mockFragment.getActivity()).thenReturn(mockActivity);
-
-        ShadowEntityHeaderController.setUseMock(mockHeaderController);
-        // builder pattern
-        when(mockHeaderController.setRecyclerView(mockFragment.getListView(), mLifecycle))
-                .thenReturn(mockHeaderController);
-        when(mockHeaderController.setSummary(anyString())).thenReturn(mockHeaderController);
-
-        doReturn(null).when(mContext).getSystemService(eq(Context.DEVICE_POLICY_SERVICE));
-
-        setupMockedPreferenceScreen();
-        mController = newWifiDetailPreferenceController();
-    }
-
-    private WifiDetailPreferenceController newWifiDetailPreferenceController() {
-        return new WifiDetailPreferenceController(
-                mockAccessPoint,
-                mockConnectivityManagerWrapper,
-                mContext,
-                mockFragment,
-                null,  // Handler
-                mLifecycle,
-                mockWifiManager,
-                mockMetricsFeatureProvider);
-    }
-
-    private void setupMockedPreferenceScreen() {
-        when(mockScreen.getPreferenceManager().getContext()).thenReturn(mContext);
-
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_HEADER))
-                .thenReturn(mockHeaderLayoutPreference);
-        when(mockHeaderLayoutPreference.findViewById(R.id.entity_header_icon))
-                .thenReturn(mockHeaderIcon);
-
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
-                .thenReturn(mockButtonsPref);
-        when(mockButtonsPref.findViewById(R.id.forget_button))
-                .thenReturn(mockForgetButton);
-        when(mockButtonsPref.findViewById(R.id.signin_button))
-                .thenReturn(mockSignInButton);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
-                .thenReturn(mockSignalStrengthPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_LINK_SPEED))
-                .thenReturn(mockLinkSpeedPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_FREQUENCY_PREF))
-                .thenReturn(mockFrequencyPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SECURITY_PREF))
-                .thenReturn(mockSecurityPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_MAC_ADDRESS_PREF))
-                .thenReturn(mockMacAddressPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IP_ADDRESS_PREF))
-                .thenReturn(mockIpAddressPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_GATEWAY_PREF))
-                .thenReturn(mockGatewayPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SUBNET_MASK_PREF))
-                .thenReturn(mockSubnetPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_DNS_PREF))
-                .thenReturn(mockDnsPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_CATEGORY))
-                .thenReturn(mockIpv6Category);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_ADDRESSES_PREF))
-                .thenReturn(mockIpv6AddressesPref);
-    }
-
-    private void displayAndResume() {
-        mController.displayPreference(mockScreen);
-        mController.onResume();
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        mController.displayPreference(mockScreen);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void securityPreference_stringShouldBeSet() {
-        displayAndResume();
-
-        verify(mockSecurityPref).setDetailText(SECURITY);
-    }
-
-    @Test
-    public void latestWifiInfo_shouldBeFetchedInDisplayPreference() {
-        displayAndResume();
-
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-    }
-
-    @Test
-    public void latestNetworkInfo_shouldBeFetchedInDisplayPreference() {
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-    }
-
-    @Test
-    public void networkCallback_shouldBeRegisteredOnResume() {
-        displayAndResume();
-
-        verify(mockConnectivityManagerWrapper, times(1)).registerNetworkCallback(
-                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
-    }
-
-    @Test
-    public void networkCallback_shouldBeUnregisteredOnPause() {
-        displayAndResume();
-        mController.onPause();
-
-        verify(mockConnectivityManager, times(1)).unregisterNetworkCallback(
-                mCallbackCaptor.getValue());
-    }
-
-    @Test
-    public void entityHeader_shouldHaveIconSet() {
-        Drawable expectedIcon =
-                NetworkBadging.getWifiIcon(LEVEL, NetworkBadging.BADGING_NONE, mContext.getTheme());
-
-        displayAndResume();
-
-        verify(mockHeaderController).setIcon(expectedIcon);
-    }
-
-    @Test
-    public void entityHeader_shouldHaveLabelSetToSsid() {
-        String label = "ssid";
-        when(mockAccessPoint.getSsidStr()).thenReturn(label);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setLabel(label);
-    }
-
-    @Test
-    public void entityHeader_shouldHaveSummarySet() {
-        String summary = "summary";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setSummary(summary);
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveIconSet() {
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveDetailTextSet() {
-        String expectedStrength =
-                mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setDetailText(expectedStrength);
-    }
-
-    @Test
-    public void linkSpeedPref_shouldHaveDetailTextSet() {
-        String expectedLinkSpeed = mContext.getString(R.string.link_speed, LINK_SPEED);
-
-        displayAndResume();
-
-        verify(mockLinkSpeedPref).setDetailText(expectedLinkSpeed);
-    }
-
-    @Test
-    public void linkSpeedPref_shouldNotShowIfNotSet() {
-        when(mockWifiInfo.getLinkSpeed()).thenReturn(-1);
-
-        displayAndResume();
-
-        verify(mockLinkSpeedPref).setVisible(false);
-    }
-
-    @Test
-    public void macAddressPref_shouldHaveDetailTextSet() {
-        displayAndResume();
-
-        verify(mockMacAddressPref).setDetailText(MAC_ADDRESS);
-    }
-
-    @Test
-    public void ipAddressPref_shouldHaveDetailTextSet() {
-        mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
-
-        displayAndResume();
-
-        verify(mockIpAddressPref).setDetailText(Constants.IPV4_ADDR.getAddress().getHostAddress());
-    }
-
-    @Test
-    public void gatewayAndSubnet_shouldHaveDetailTextSet() {
-        mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
-        mLinkProperties.addRoute(Constants.IPV4_DEFAULT);
-        mLinkProperties.addRoute(Constants.IPV4_SUBNET);
-
-        displayAndResume();
-
-        verify(mockSubnetPref).setDetailText("255.255.255.128");
-        verify(mockGatewayPref).setDetailText("192.0.2.127");
-    }
-
-    @Test
-    public void dnsServersPref_shouldHaveDetailTextSet() throws UnknownHostException {
-        mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,4,4}));
-        mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,8,8}));
-        mLinkProperties.addDnsServer(Constants.IPV6_DNS);
-
-        displayAndResume();
-
-        verify(mockDnsPref).setDetailText(
-                "8.8.4.4\n" +
-                "8.8.8.8\n" +
-                Constants.IPV6_DNS.getHostAddress());
-    }
-
-    @Test
-    public void noCurrentNetwork_shouldFinishActivity() {
-        // If WifiManager#getCurrentNetwork() returns null, then the network is neither connected
-        // nor connecting and WifiStateMachine has not reached L2ConnectedState.
-        when(mockWifiManager.getCurrentNetwork()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockActivity).finish();
-    }
-
-    @Test
-    public void noLinkProperties_allIpDetailsHidden() {
-        when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(null);
-        reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref,
-                mockDnsPref);
-
-        displayAndResume();
-
-        verify(mockIpv6Category).setVisible(false);
-        verify(mockIpAddressPref).setVisible(false);
-        verify(mockSubnetPref).setVisible(false);
-        verify(mockGatewayPref).setVisible(false);
-        verify(mockDnsPref).setVisible(false);
-        verify(mockIpv6Category, never()).setVisible(true);
-        verify(mockIpAddressPref, never()).setVisible(true);
-        verify(mockSubnetPref, never()).setVisible(true);
-        verify(mockGatewayPref, never()).setVisible(true);
-        verify(mockDnsPref, never()).setVisible(true);
-    }
-
-    // Convenience method to convert a LinkAddress to a string without a prefix length.
-    private String asString(LinkAddress l) {
-        return l.getAddress().getHostAddress();
-    }
-
-    // Pretend that the NetworkCallback was triggered with a new copy of lp. We need to create a
-    // new copy because the code only updates if !mLinkProperties.equals(lp).
-    private void updateLinkProperties(LinkProperties lp) {
-        mCallbackCaptor.getValue().onLinkPropertiesChanged(mockNetwork, new LinkProperties(lp));
-    }
-
-    private void updateNetworkCapabilities(NetworkCapabilities nc) {
-        mCallbackCaptor.getValue().onCapabilitiesChanged(mockNetwork, new NetworkCapabilities(nc));
-    }
-
-    private NetworkCapabilities makeNetworkCapabilities() {
-        NetworkCapabilities nc = new NetworkCapabilities();
-        nc.clearAll();
-        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-        return nc;
-    }
-
-    private void verifyDisplayedIpv6Addresses(InOrder inOrder, LinkAddress... addresses) {
-        String text = Arrays.stream(addresses)
-                .map(address -> asString(address))
-                .collect(Collectors.joining("\n"));
-        inOrder.verify(mockIpv6AddressesPref).setSummary(text);
-    }
-
-    @Test
-    public void onLinkPropertiesChanged_updatesFields() {
-        displayAndResume();
-
-        InOrder inOrder = inOrder(mockIpAddressPref, mockGatewayPref, mockSubnetPref,
-                mockDnsPref, mockIpv6Category, mockIpv6AddressesPref);
-
-        LinkProperties lp = new LinkProperties();
-
-        lp.addLinkAddress(Constants.IPV6_LINKLOCAL);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder, Constants.IPV6_LINKLOCAL);
-        inOrder.verify(mockIpv6Category).setVisible(true);
-
-        lp.addRoute(Constants.IPV4_DEFAULT);
-        updateLinkProperties(lp);
-        inOrder.verify(mockGatewayPref).setDetailText(Constants.IPV4_GATEWAY.getHostAddress());
-        inOrder.verify(mockGatewayPref).setVisible(true);
-
-        lp.addLinkAddress(Constants.IPV4_ADDR);
-        lp.addRoute(Constants.IPV4_SUBNET);
-        updateLinkProperties(lp);
-        inOrder.verify(mockIpAddressPref).setDetailText(asString(Constants.IPV4_ADDR));
-        inOrder.verify(mockIpAddressPref).setVisible(true);
-        inOrder.verify(mockSubnetPref).setDetailText("255.255.255.128");
-        inOrder.verify(mockSubnetPref).setVisible(true);
-
-        lp.addLinkAddress(Constants.IPV6_GLOBAL1);
-        lp.addLinkAddress(Constants.IPV6_GLOBAL2);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder,
-                Constants.IPV6_LINKLOCAL,
-                Constants.IPV6_GLOBAL1,
-                Constants.IPV6_GLOBAL2);
-
-        lp.removeLinkAddress(Constants.IPV6_GLOBAL1);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder,
-                Constants.IPV6_LINKLOCAL,
-                Constants.IPV6_GLOBAL2);
-
-        lp.addDnsServer(Constants.IPV6_DNS);
-        updateLinkProperties(lp);
-        inOrder.verify(mockDnsPref).setDetailText(Constants.IPV6_DNS.getHostAddress());
-        inOrder.verify(mockDnsPref).setVisible(true);
-
-        lp.addDnsServer(Constants.IPV4_DNS1);
-        lp.addDnsServer(Constants.IPV4_DNS2);
-        updateLinkProperties(lp);
-        inOrder.verify(mockDnsPref).setDetailText(
-                Constants.IPV6_DNS.getHostAddress() + "\n" +
-                Constants.IPV4_DNS1.getHostAddress() + "\n" +
-                Constants.IPV4_DNS2.getHostAddress());
-        inOrder.verify(mockDnsPref).setVisible(true);
-    }
-
-    @Test
-    public void onCapabilitiesChanged_callsRefreshIfNecessary() {
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        when(mockConnectivityManager.getNetworkCapabilities(mockNetwork))
-                .thenReturn(new NetworkCapabilities(nc));
-
-        String summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
-
-        InOrder inOrder = inOrder(mockHeaderController);
-        displayAndResume();
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // Check that an irrelevant capability update does not update the access point summary, as
-        // doing so could cause unnecessary jank...
-        summary = "Connected";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
-
-        // ... but that if the network validates, then we do refresh.
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
-
-        // Another irrelevant update won't cause the UI to refresh...
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
-
-        // ... but if the network is no longer validated, then we display "connected, no Internet".
-        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-    }
-
-    @Test
-    public void canForgetNetwork_noNetwork() {
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-
-        mController = newWifiDetailPreferenceController();
-        displayAndResume();
-
-        verify(mockForgetButton).setVisibility(View.INVISIBLE);
-    }
-
-    @Test
-    public void canForgetNetwork_ephemeral() {
-        when(mockWifiInfo.isEphemeral()).thenReturn(true);
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockForgetButton).setVisibility(View.VISIBLE);
-    }
-
-    @Test
-    public void canForgetNetwork_saved() {
-        displayAndResume();
-
-        verify(mockForgetButton).setVisibility(View.VISIBLE);
-    }
-
-    @Test
-    public void forgetNetwork_ephemeral() {
-        String ssid = "ssid";
-        when(mockWifiInfo.isEphemeral()).thenReturn(true);
-        when(mockWifiInfo.getSSID()).thenReturn(ssid);
-
-        displayAndResume();
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager).disableEphemeralNetwork(ssid);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-    }
-
-    @Test
-    public void forgetNetwork_saved() {
-        mockWifiConfig.networkId = 5;
-
-        mController.displayPreference(mockScreen);
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager).forget(mockWifiConfig.networkId, null);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-    }
-
-    @Test
-    public void networkStateChangedIntent_shouldRefetchInfo() {
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void rssiChangedIntent_shouldRefetchInfo() {
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void networkDisconnectedState_shouldFinishActivity() {
-        displayAndResume();
-
-        when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(null);
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockActivity).finish();
-    }
-
-    @Test
-    public void networkOnLost_shouldFinishActivity() {
-        displayAndResume();
-
-        mCallbackCaptor.getValue().onLost(mockNetwork);
-
-        verify(mockActivity).finish();
-    }
-
-    @Test
-    public void ipv6AddressPref_shouldHaveHostAddressTextSet() {
-        mLinkProperties.addLinkAddress(Constants.IPV6_LINKLOCAL);
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL1);
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
-
-        displayAndResume();
-
-        List <Preference> addrs = mIpv6AddressCaptor.getAllValues();
-
-        String expectedAddresses = String.join("\n",
-                asString(Constants.IPV6_LINKLOCAL),
-                asString(Constants.IPV6_GLOBAL1),
-                asString(Constants.IPV6_GLOBAL2));
-
-        verify(mockIpv6AddressesPref).setSummary(expectedAddresses);
-    }
-
-    @Test
-    public void ipv6AddressPref_shouldNotBeSelectable() {
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
-
-        displayAndResume();
-
-        assertThat(mockIpv6AddressesPref.isSelectable()).isFalse();
-    }
-
-    @Test
-    public void captivePortal_shouldShowSignInButton() {
-        InOrder inOrder = inOrder(mockSignInButton);
-
-        displayAndResume();
-
-        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
-
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
-
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockSignInButton).setVisibility(View.VISIBLE);
-
-        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
-    }
-
-    @Test
-    public void testSignInButton_shouldStartCaptivePortalApp() {
-        displayAndResume();
-
-        ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
-        verify(mockSignInButton).setOnClickListener(captor.capture());
-        captor.getValue().onClick(mockSignInButton);
-        verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
-    }
-
-    @Test
-    public void signInButtonVisible_buttonPanelShouldBeVisible() {
-        when(mockSignInButton.getVisibility()).thenReturn(View.VISIBLE);
-        when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setVisible(true);
-    }
-
-    @Test
-    public void forgetButtonVisible_buttonPanelShouldBeVisible() {
-        when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
-        when(mockForgetButton.getVisibility()).thenReturn(View.VISIBLE);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setVisible(true);
-    }
-
-    @Test
-    public void neitherButtonVisible_buttonPanelShouldBeInvisible() {
-        when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
-        when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setVisible(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
deleted file mode 100644
index dd2ef5259f24aded43664e88b3b4759759d0c021..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.p2p;
-
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class P2pCategoryPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PreferenceCategory mCategory;
-    private P2pCategoryPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mPreferenceScreen.findPreference(anyString())).thenReturn(mCategory);
-
-        mController = new P2pCategoryPreferenceController(RuntimeEnvironment.application) {
-
-            @Override
-            public String getPreferenceKey() {
-                return "test_key";
-            }
-        };
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-
-    @Test
-    public void removeAllChildren_shouldRemove() {
-        mController.removeAllChildren();
-
-        verify(mCategory).removeAll();
-        verify(mCategory).setVisible(false);
-    }
-
-    @Test
-    public void addChild_shouldAdd() {
-        final Preference pref = new Preference(RuntimeEnvironment.application);
-        mController.addChild(pref);
-
-        verify(mCategory).addPreference(pref);
-        verify(mCategory).setVisible(true);
-    }
-
-    @Test
-    public void shouldToggleEnable() {
-        mController.setEnabled(false);
-
-        verify(mCategory).setEnabled(false);
-
-        mController.setEnabled(true);
-
-        verify(mCategory).setEnabled(true);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
deleted file mode 100644
index 62fd01f87751bd5bf31f3dd0cf4fcda956589e73..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.p2p;
-
-
-import android.net.wifi.p2p.WifiP2pDevice;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class P2pThisDevicePreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    private Preference mPreference;
-    private P2pThisDevicePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPreference = new Preference(RuntimeEnvironment.application);
-        when(mPreferenceScreen.findPreference(anyString())).thenReturn(mPreference);
-
-        mController = new P2pThisDevicePreferenceController(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateDeviceName_emptyName_shouldUseIpAddress() {
-        WifiP2pDevice device = new WifiP2pDevice();
-        device.deviceAddress = "address";
-        mController.displayPreference(mPreferenceScreen);
-        mController.updateDeviceName(device);
-
-        assertThat(mPreference.getTitle()).isEqualTo(device.deviceAddress);
-    }
-
-    @Test
-    public void updateDeviceName_hasName_shouldUseName() {
-        WifiP2pDevice device = new WifiP2pDevice();
-        device.deviceAddress = "address";
-        device.deviceName = "name";
-        mController.displayPreference(mPreferenceScreen);
-        mController.updateDeviceName(device);
-
-        assertThat(mPreference.getTitle()).isEqualTo(device.deviceName);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
deleted file mode 100644
index 8946a5e1077711d34d15a21fde3b994c1be46702..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.p2p;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiP2PPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private WifiManager mWifiManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mWifiDirectPreference;
-
-    private Lifecycle mLifecycle;
-    private WifiP2pPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mContext.getSystemService(WifiManager.class))
-                .thenReturn(mWifiManager);
-        when(mScreen.findPreference(anyString()))
-                .thenReturn(mWifiDirectPreference);
-        mController = new WifiP2pPreferenceController(mContext, mLifecycle, mWifiManager);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testOnResume_shouldRegisterListener() {
-        mLifecycle.onResume();
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-    }
-
-    @Test
-    public void testOnPause_shouldUnregisterListener() {
-        mLifecycle.onPause();
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-    }
-
-    @Test
-    public void testWifiStateChange_shouldToggleEnabledState() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-
-        //Sets the preferences.
-        mController.displayPreference(mScreen);
-        verify(mWifiDirectPreference).setEnabled(true);
-
-        Intent dummyIntent = new Intent();
-        mController.mReceiver.onReceive(mContext, dummyIntent);
-        verify(mWifiDirectPreference, times(2)).setEnabled(true);
-
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.mReceiver.onReceive(mContext, dummyIntent);
-        verify(mWifiDirectPreference).setEnabled(false);
-    }
-
-    @Test
-    public void testDisplayPreference_shouldToggleEnabledState() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-        mController.displayPreference(mScreen);
-        verify(mWifiDirectPreference).setEnabled(true);
-
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.displayPreference(mScreen);
-        verify(mWifiDirectPreference).setEnabled(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
deleted file mode 100644
index 8f0b143ae022d8a7464b95e67140a0a3caa8f8c9..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.tether;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiTetherApBandPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private WifiTetherApBandPreferenceController mController;
-    private ListPreference mListPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mListPreference = new ListPreference(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
-        when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
-        when(mScreen.findPreference(anyString())).thenReturn(mListPreference);
-
-        mController = new WifiTetherApBandPreferenceController(mContext, mListener);
-    }
-
-    @Test
-    public void display_5GhzSupported_shouldDisplayFullList() {
-        when(mWifiManager.getCountryCode()).thenReturn("US");
-        when(mWifiManager.isDualBandSupported()).thenReturn(true);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mListPreference.getEntries().length).isEqualTo(2);
-    }
-
-    @Test
-    public void display_noCountryCode_shouldDisable() {
-        when(mWifiManager.getCountryCode()).thenReturn(null);
-        when(mWifiManager.isDualBandSupported()).thenReturn(true);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mListPreference.getEntries()).isNull();
-        assertThat(mListPreference.isEnabled()).isFalse();
-        assertThat(mListPreference.getSummary())
-                .isEqualTo(RuntimeEnvironment.application.getString(R.string.wifi_ap_choose_2G));
-    }
-
-    @Test
-    public void display_5GhzNotSupported_shouldDisable() {
-        when(mWifiManager.isDualBandSupported()).thenReturn(false);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mListPreference.getEntries()).isNull();
-        assertThat(mListPreference.isEnabled()).isFalse();
-        assertThat(mListPreference.getSummary())
-                .isEqualTo(RuntimeEnvironment.application.getString(R.string.wifi_ap_choose_2G));
-    }
-
-    @Test
-    public void changePreference_shouldUpdateValue() {
-        when(mWifiManager.is5GHzBandSupported()).thenReturn(true);
-
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mListPreference, "1");
-        assertThat(mController.getBandIndex()).isEqualTo(1);
-
-        mController.onPreferenceChange(mListPreference, "0");
-        assertThat(mController.getBandIndex()).isEqualTo(0);
-
-        verify(mListener, times(2)).onTetherConfigUpdated();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
deleted file mode 100644
index fdb8390d8d447052c5f452ade39af06d7e64a03e..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.tether;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.ValidatedEditTextPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiTetherPasswordPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private WifiTetherPasswordPreferenceController mController;
-    private ValidatedEditTextPreference mPreference;
-    private WifiConfiguration mConfig;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
-        mConfig = new WifiConfiguration();
-        mConfig.SSID = "test_1234";
-        mConfig.preSharedKey = "test_password";
-
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
-        when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-
-        mController = new WifiTetherPasswordPreferenceController(mContext, mListener);
-    }
-
-    @Test
-    public void displayPreference_shouldStylePreference() {
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.getText()).isEqualTo(mConfig.preSharedKey);
-        assertThat(mPreference.getSummary()).isEqualTo(mConfig.preSharedKey);
-    }
-
-    @Test
-    public void changePreference_shouldUpdateValue() {
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, "1");
-        assertThat(mController.getPassword()).isEqualTo("1");
-
-        mController.onPreferenceChange(mPreference, "0");
-        assertThat(mController.getPassword()).isEqualTo("0");
-
-        verify(mListener, times(2)).onTetherConfigUpdated();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
deleted file mode 100644
index ff3f47e6cfafe25497815c80051b7d9dee66a5cf..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.tether;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.provider.Settings;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.MasterSwitchPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowSettings;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
-                WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
-        })
-public class WifiTetherPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mFeatureFactoryContext;
-    @Mock
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private WifiTetherPreferenceController mController;
-    private Lifecycle mLifecycle;
-    private MasterSwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        FakeFeatureFactory.setupForTest(mFeatureFactoryContext);
-        mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
-        mController = new WifiTetherPreferenceController(mContext, mLifecycle);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowWifiTetherSwitchBarController.reset();
-    }
-
-    @Test
-    public void isAvailable_noTetherRegex_shouldReturnFalse() {
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
-        mController = new WifiTetherPreferenceController(mContext, mLifecycle);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_hasTetherRegex_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void startAndStop_shouldRegisterUnregisterReceiver() {
-        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
-
-        mController.displayPreference(mScreen);
-        mLifecycle.onStart();
-        mLifecycle.onStop();
-
-        assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
-        assertThat(ShadowWifiTetherSwitchBarController.onStopCalled).isTrue();
-        verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
-        verify(mContext).unregisterReceiver(receiver);
-    }
-
-    @Test
-    public void start_wifiApOff_shouldSetInitialStateToOff() {
-        when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_DISABLED);
-        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
-        final MasterSwitchPreference pref = mock(MasterSwitchPreference.class);
-        when(mScreen.findPreference(anyString())).thenReturn(pref);
-
-        mController.displayPreference(mScreen);
-        mLifecycle.onStart();
-
-        assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
-        verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
-        verify(pref).setChecked(false);
-    }
-
-    @Test
-    public void start_wifiApOn_shouldSetInitialStateToOn() {
-        when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED);
-        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
-        final MasterSwitchPreference pref = mock(MasterSwitchPreference.class);
-        when(mScreen.findPreference(anyString())).thenReturn(pref);
-
-        mController.displayPreference(mScreen);
-        mLifecycle.onStart();
-
-        assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
-        verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
-        verify(pref).setChecked(true);
-    }
-
-    @Test
-    public void testReceiver_apStateChangedToDisabled_shouldUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLED);
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));
-    }
-
-    @Test
-    public void testReceiver_apStateChangedToDisabling_shouldUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLING);
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.wifi_tether_stopping));
-    }
-
-    @Test
-    public void testReceiver_apStateChangedToEnabling_shouldUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
-    }
-
-    @Test
-    public void testReceiver_apStateChangedToEnabled_shouldNotUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLED);
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));
-
-        // When turning on the hotspot, we receive STATE_ENABLING followed by STATE_ENABLED. The
-        // first should change the status to wifi_tether_starting, and the second should not change
-        // this.
-        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
-        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLED);
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
-    }
-
-    @Test
-    public void testReceiver_goingToAirplaneMode_shouldClearPreferenceSummary() {
-        final ContentResolver cr = mock(ContentResolver.class);
-        when(mContext.getContentResolver()).thenReturn(cr);
-        ShadowSettings.ShadowGlobal.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, 1);
-        mController.displayPreference(mScreen);
-        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
-        final Intent broadcast = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-
-        receiver.onReceive(RuntimeEnvironment.application, broadcast);
-
-        assertThat(mPreference.getSummary().toString()).isEqualTo(
-                RuntimeEnvironment.application.getString(R.string.summary_placeholder));
-    }
-
-    @Test
-    public void testReceiver_tetherEnabled_shouldUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
-        final Intent broadcast = new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
-        final ArrayList<String> activeTethers = new ArrayList<>();
-        activeTethers.add("1");
-        broadcast.putStringArrayListExtra(ConnectivityManager.EXTRA_ACTIVE_TETHER, activeTethers);
-        broadcast.putStringArrayListExtra(ConnectivityManager.EXTRA_ERRORED_TETHER,
-                new ArrayList<>());
-        final WifiConfiguration configuration = new WifiConfiguration();
-        configuration.SSID = "test-ap";
-        when(mWifiManager.getWifiApConfiguration()).thenReturn(configuration);
-
-        receiver.onReceive(RuntimeEnvironment.application, broadcast);
-
-        verify(mContext).getString(eq(R.string.wifi_tether_enabled_subtext), any());
-    }
-
-    @Implements(WifiTetherSettings.class)
-    public static final class ShadowWifiTetherSettings {
-
-        @Implementation
-        public static boolean isTetherSettingPageEnabled() {
-            return true;
-        }
-    }
-
-    @Implements(WifiTetherSwitchBarController.class)
-    public static final class ShadowWifiTetherSwitchBarController {
-
-        public static boolean onStartCalled;
-        public static boolean onStopCalled;
-
-        public static void reset() {
-            onStartCalled = false;
-            onStopCalled = false;
-        }
-
-        @Implementation
-        public void onStart() {
-            onStartCalled = true;
-        }
-
-        @Implementation
-        public void onStop() {
-            onStopCalled = true;
-        }
-    }
-
-    /**
-     * Helper to cause the controller to receive a WIFI_AP_STATE_CHANGED_ACTION with a specific
-     * state.
-     * @param state - the state, as specified by one of the WifiManager.WIFI_AP_STATE_* values
-     */
-    private void receiveApStateChangedBroadcast(int state) {
-        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
-        final Intent broadcast = new Intent(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
-        broadcast.putExtra(WifiManager.EXTRA_WIFI_AP_STATE, state);
-        receiver.onReceive(RuntimeEnvironment.application, broadcast);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
deleted file mode 100644
index f43e3a7b53f650bde7d385c727cbc790b884737c..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.tether;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.ValidatedEditTextPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiTetherSSIDPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private WifiTetherSSIDPreferenceController mController;
-    private ValidatedEditTextPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
-
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
-        when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-
-        mController = new WifiTetherSSIDPreferenceController(mContext, mListener);
-    }
-
-    @Test
-    public void displayPreference_noWifiConfig_shouldDisplayDefaultSSID() {
-        when(mWifiManager.getWifiApConfiguration()).thenReturn(null);
-
-        mController.displayPreference(mScreen);
-        assertThat(mController.getSSID())
-                .isEqualTo(WifiTetherSSIDPreferenceController.DEFAULT_SSID);
-    }
-
-    @Test
-    public void displayPreference_hasCustomWifiConfig_shouldDisplayCustomSSID() {
-        final WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "test_1234";
-        when(mWifiManager.getWifiApConfiguration()).thenReturn(config);
-
-        mController.displayPreference(mScreen);
-        assertThat(mController.getSSID()).isEqualTo(config.SSID);
-    }
-
-    @Test
-    public void changePreference_shouldUpdateValue() {
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, "1");
-        assertThat(mController.getSSID()).isEqualTo("1");
-
-        mController.onPreferenceChange(mPreference, "0");
-        assertThat(mController.getSSID()).isEqualTo("0");
-
-        verify(mListener, times(2)).onTetherConfigUpdated();
-    }
-}
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
deleted file mode 100644
index 060c3e11bcf803cdc7f416faa3ccfa486e8ef7a1..0000000000000000000000000000000000000000
--- a/tests/unit/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-test \
-    espresso-core \
-    legacy-android-test \
-    mockito-target-minus-junit4 \
-    truth-prebuilt \
-    ub-uiautomator \
-
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SettingsUnitTests
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-LOCAL_INSTRUMENTATION_FOR := Settings
-
-include $(BUILD_PACKAGE)
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
deleted file mode 100644
index c4cae0c3f874cd9d099e3773c2e244873b3c7571..0000000000000000000000000000000000000000
--- a/tests/unit/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.tests.unit">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.settings"
-        android:label="Settings Test Cases">
-    </instrumentation>
-
-</manifest>
diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml
deleted file mode 100644
index b74c1e36ee589f8e59878c437bb3099c4ea07ee4..0000000000000000000000000000000000000000
--- a/tests/unit/AndroidTest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Runs Settings Test Cases.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
-        <option name="test-file-name" value="SettingsUnitTests.apk" />
-    </target_preparer>
-
-    <option name="test-suite-tag" value="apct" />
-    <option name="test-tag" value="SettingsUnitTests" />
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="com.android.settings.tests.unit" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
-    </test>
-</configuration>
diff --git a/tests/unit/README b/tests/unit/README
deleted file mode 100644
index 2544ea5b6af16d662d113e0989798876b4aad1b9..0000000000000000000000000000000000000000
--- a/tests/unit/README
+++ /dev/null
@@ -1,17 +0,0 @@
-To build the tests you can use the following command at the root of your android source tree
-$ make -j SettingsUnitTests
-
-The test apk then needs to be installed onto your test device via for example
-$ adb install -r ${ANDROID_PRODUCT_OUT}/data/app/SettingsUnitTests/SettingsUnitTests.apk
-
-To run all tests:
-$ adb shell am instrument -w com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
-
-To run all tests in a specific class:
-$ adb shell am instrument -w -e class com.android.settings.<class> com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
-
-To run a specific test:
-$ adb shell am instrument -w -e class com.android.settings.<class>#<test> com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
-
-More general information can be found at
-http://developer.android.com/reference/android/support/test/runner/AndroidJUnitRunner.html
diff --git a/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java b/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
deleted file mode 100644
index b1d94d46a120de0566790d358762097b9c054762..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Instrumentation;
-import android.app.UiAutomation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.graphics.Bitmap;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.util.Log;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.RootMatchers.isDialog;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static junit.framework.Assert.fail;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class RegulatoryInfoDisplayActivityTest {
-    private static final String TAG = "RegulatoryInfoTest";
-
-    private Instrumentation mInstrumentation;
-    private Intent mRegulatoryInfoIntent;
-    private UiAutomation mUiAutomation;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
-        mRegulatoryInfoIntent = new Intent("android.settings.SHOW_REGULATORY_INFO")
-                .addCategory(Intent.CATEGORY_DEFAULT)
-                .setPackage(mInstrumentation.getTargetContext().getPackageName());
-    }
-
-    @Test
-    public void resolveRegulatoryInfoIntent_intentShouldMatchConfig() {
-        // Load intent from PackageManager and load config from Settings app
-        final Context context = mInstrumentation.getTargetContext();
-
-        final boolean hasRegulatoryInfo = context.getResources()
-                .getBoolean(R.bool.config_show_regulatory_info);
-        final ResolveInfo resolveInfo = mInstrumentation.getTargetContext().getPackageManager()
-                .resolveActivity(mRegulatoryInfoIntent, 0 /* flags */);
-
-        // Check config and intent both enable or both disabled.
-        if (hasRegulatoryInfo && resolveInfo == null) {
-            fail("Config enables regulatory info but there is no handling intent");
-            return;
-        }
-        if (!hasRegulatoryInfo && resolveInfo != null) {
-            fail("Config disables regulatory info but there is at least one handling intent");
-            return;
-        }
-    }
-
-    @Test
-    public void launchRegulatoryInfo_shouldNotCrash() {
-        final Context context = mInstrumentation.getTargetContext();
-        final boolean hasRegulatoryInfo = context.getResources()
-                .getBoolean(R.bool.config_show_regulatory_info);
-
-        if (!hasRegulatoryInfo) {
-            return;
-        }
-        // Launch intent
-        mInstrumentation.startActivitySync(mRegulatoryInfoIntent);
-
-        onView(withId(R.id.regulatoryInfo))
-                .inRoot(isDialog())
-                .check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void launchRegulatoryInfo_withInfoImage_shouldDisplay() throws IOException {
-        // TODO: Remove "setenforce 0" when selinux rules is updated to give read permission for
-        // regulatory info.
-        mUiAutomation.executeShellCommand("setenforce 0");
-
-        final boolean tempFileCreated = ensureRegulatoryInfoImageExists();
-        try {
-            final Context context = mInstrumentation.getTargetContext();
-            final boolean hasRegulatoryInfo = context.getResources()
-                    .getBoolean(R.bool.config_show_regulatory_info);
-
-            if (!hasRegulatoryInfo) {
-                return;
-            }
-            // Launch intent
-            mInstrumentation.startActivitySync(mRegulatoryInfoIntent);
-
-            onView(withId(R.id.regulatoryInfo))
-                    .inRoot(isDialog())
-                    .check(matches(isDisplayed()));
-        } finally {
-            if (tempFileCreated) {
-                final String filename =
-                        RegulatoryInfoDisplayActivity.getRegulatoryInfoImageFileName();
-                new File(filename).delete();
-                Log.d(TAG, "Deleting temp file " + filename);
-            }
-        }
-    }
-
-    /**
-     * Ensures regulatory label image exists on disk.
-     *
-     * @return true if a test image is created.
-     */
-    private boolean ensureRegulatoryInfoImageExists() throws IOException {
-        final String filename = RegulatoryInfoDisplayActivity.getRegulatoryInfoImageFileName();
-        if (new File(filename).exists()) {
-            return false;
-        }
-        Log.d(TAG, "Creating temp file " + filename);
-        final Bitmap bitmap = Bitmap.createBitmap(400 /* width */, 400 /* height */,
-                Bitmap.Config.ARGB_8888);
-        final FileOutputStream out = new FileOutputStream(filename);
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100 /* quality */, out);
-        out.close();
-        return true;
-    }
-
-
-}
diff --git a/tests/unit/src/com/android/settings/TetherServiceTest.java b/tests/unit/src/com/android/settings/TetherServiceTest.java
deleted file mode 100644
index 899ea7a1f746a55349814819b00ee683b345066a..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/TetherServiceTest.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static android.net.ConnectivityManager.EXTRA_ADD_TETHER_TYPE;
-import static android.net.ConnectivityManager.EXTRA_PROVISION_CALLBACK;
-import static android.net.ConnectivityManager.EXTRA_REM_TETHER_TYPE;
-import static android.net.ConnectivityManager.EXTRA_RUN_PROVISION;
-import static android.net.ConnectivityManager.EXTRA_SET_ALARM;
-import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
-import static android.net.ConnectivityManager.TETHERING_INVALID;
-import static android.net.ConnectivityManager.TETHERING_USB;
-import static android.net.ConnectivityManager.TETHERING_WIFI;
-import static android.net.ConnectivityManager.TETHER_ERROR_NO_ERROR;
-import static android.net.ConnectivityManager.TETHER_ERROR_PROVISION_FAILED;
-
-import android.app.Activity;
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.app.usage.UsageStatsManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.PackageManager;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.res.Resources;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.os.SystemClock;
-import android.test.ServiceTestCase;
-import android.test.mock.MockResources;
-import android.util.Log;
-
-import com.android.settings.TetherService;
-
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TetherServiceTest extends ServiceTestCase<TetherService> {
-
-    private static final String TAG = "TetherServiceTest";
-    private static final String FAKE_PACKAGE_NAME = "com.some.package.name";
-    private static final String ENTITLEMENT_PACKAGE_NAME = "com.some.entitlement.name";
-    private static final String TEST_RESPONSE_ACTION = "testProvisioningResponseAction";
-    private static final String TEST_NO_UI_ACTION = "testNoUiProvisioningRequestAction";
-    private static final int BOGUS_RECEIVER_RESULT = -5;
-    private static final int TEST_CHECK_PERIOD = 100;
-    private static final int MS_PER_HOUR = 60 * 60 * 1000;
-    private static final int SHORT_TIMEOUT = 100;
-    private static final int PROVISION_TIMEOUT = 1000;
-
-    private TetherService mService;
-    private MockResources mResources;
-    private FakeUsageStatsManagerWrapper mUsageStatsManagerWrapper;
-    int mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-    private int mLastTetherRequestType = TETHERING_INVALID;
-    private int mProvisionResponse = BOGUS_RECEIVER_RESULT;
-    private ProvisionReceiver mProvisionReceiver;
-    private Receiver mResultReceiver;
-
-    @Mock private AlarmManager mAlarmManager;
-    @Mock private ConnectivityManager mConnectivityManager;
-    @Mock private PackageManager mPackageManager;
-    @Mock private WifiManager mWifiManager;
-    @Mock private SharedPreferences mPrefs;
-    @Mock private Editor mPrefEditor;
-    @Captor private ArgumentCaptor<PendingIntent> mPiCaptor;
-    @Captor private ArgumentCaptor<String> mStoredTypes;
-
-    public TetherServiceTest() {
-        super(TetherService.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        MockitoAnnotations.initMocks(this);
-
-        mResources = new MockResources();
-        mContext = new TestContextWrapper(getContext());
-        setContext(mContext);
-
-        mResultReceiver = new Receiver(this);
-        mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-        mProvisionResponse = Activity.RESULT_OK;
-        mProvisionReceiver = new ProvisionReceiver();
-        IntentFilter filter = new IntentFilter(TEST_NO_UI_ACTION);
-        filter.addCategory(Intent.CATEGORY_DEFAULT);
-        mContext.registerReceiver(mProvisionReceiver, filter);
-
-        final String CURRENT_TYPES = "currentTethers";
-        when(mPrefs.getString(CURRENT_TYPES, "")).thenReturn("");
-        when(mPrefs.edit()).thenReturn(mPrefEditor);
-        when(mPrefEditor.putString(eq(CURRENT_TYPES), mStoredTypes.capture())).thenReturn(
-                mPrefEditor);
-        mUsageStatsManagerWrapper = new FakeUsageStatsManagerWrapper(mContext);
-
-        ResolveInfo systemAppResolveInfo = new ResolveInfo();
-        ActivityInfo systemActivityInfo = new ActivityInfo();
-        systemActivityInfo.packageName = ENTITLEMENT_PACKAGE_NAME;
-        ApplicationInfo systemAppInfo = new ApplicationInfo();
-        systemAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
-        systemActivityInfo.applicationInfo = systemAppInfo;
-        systemAppResolveInfo.activityInfo = systemActivityInfo;
-
-        ResolveInfo nonSystemResolveInfo = new ResolveInfo();
-        ActivityInfo nonSystemActivityInfo = new ActivityInfo();
-        nonSystemActivityInfo.packageName = FAKE_PACKAGE_NAME;
-        nonSystemActivityInfo.applicationInfo = new ApplicationInfo();
-        nonSystemResolveInfo.activityInfo = nonSystemActivityInfo;
-
-        List<ResolveInfo> resolvers = new ArrayList();
-        resolvers.add(nonSystemResolveInfo);
-        resolvers.add(systemAppResolveInfo);
-        when(mPackageManager.queryBroadcastReceivers(
-                any(Intent.class), eq(PackageManager.MATCH_ALL))).thenReturn(resolvers);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContext.unregisterReceiver(mProvisionReceiver);
-        super.tearDown();
-    }
-
-    private void cancelAllProvisioning() {
-        int[] types = new int[]{TETHERING_BLUETOOTH, TETHERING_WIFI, TETHERING_USB};
-        for (int type : types) {
-            Intent intent = new Intent();
-            intent.putExtra(EXTRA_REM_TETHER_TYPE, type);
-            startService(intent);
-        }
-    }
-
-    public void testStartForProvision() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-    }
-
-    public void testStartKeepsProvisionAppActive() {
-        setupService();
-        getService().setUsageStatsManagerWrapper(mUsageStatsManagerWrapper);
-
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-        assertFalse(mUsageStatsManagerWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
-        // Non-system handler of the intent action should stay idle.
-        assertTrue(mUsageStatsManagerWrapper.isAppInactive(FAKE_PACKAGE_NAME));
-    }
-
-    public void testScheduleRechecks() {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI);
-        intent.putExtra(EXTRA_SET_ALARM, true);
-        startService(intent);
-
-        long period = TEST_CHECK_PERIOD * MS_PER_HOUR;
-        verify(mAlarmManager).setRepeating(eq(AlarmManager.ELAPSED_REALTIME), anyLong(),
-                eq(period), mPiCaptor.capture());
-        PendingIntent pi = mPiCaptor.getValue();
-        assertEquals(TetherService.class.getName(), pi.getIntent().getComponent().getClassName());
-    }
-
-    public void testStartMultiple() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-
-        runProvisioningForType(TETHERING_USB);
-
-        assertTrue(waitForProvisionRequest(TETHERING_USB));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-
-        runProvisioningForType(TETHERING_BLUETOOTH);
-
-        assertTrue(waitForProvisionRequest(TETHERING_BLUETOOTH));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-    }
-
-    public void testPersistTypes() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        waitForProvisionRequest(TETHERING_WIFI);
-        waitForProvisionResponse(TETHER_ERROR_NO_ERROR);
-
-        runProvisioningForType(TETHERING_BLUETOOTH);
-
-        waitForProvisionRequest(TETHERING_BLUETOOTH);
-        waitForProvisionResponse(TETHER_ERROR_NO_ERROR);
-
-        shutdownService();
-        assertEquals(TETHERING_WIFI + "," + TETHERING_BLUETOOTH, mStoredTypes.getValue());
-    }
-
-    public void testFailureStopsTethering_Wifi() {
-        mProvisionResponse = Activity.RESULT_CANCELED;
-
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_PROVISION_FAILED));
-
-        verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
-    }
-
-    public void testFailureStopsTethering_Usb() {
-        mProvisionResponse = Activity.RESULT_CANCELED;
-
-        runProvisioningForType(TETHERING_USB);
-
-        assertTrue(waitForProvisionRequest(TETHERING_USB));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_PROVISION_FAILED));
-
-        verify(mConnectivityManager).setUsbTethering(eq(false));
-    }
-
-    public void testCancelAlarm() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_REM_TETHER_TYPE, TETHERING_WIFI);
-        startService(intent);
-
-        verify(mAlarmManager).cancel(mPiCaptor.capture());
-        PendingIntent pi = mPiCaptor.getValue();
-        assertEquals(TetherService.class.getName(), pi.getIntent().getComponent().getClassName());
-    }
-
-    private void runProvisioningForType(int type) {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_ADD_TETHER_TYPE, type);
-        intent.putExtra(EXTRA_RUN_PROVISION, true);
-        intent.putExtra(EXTRA_PROVISION_CALLBACK, mResultReceiver);
-        startService(intent);
-    }
-
-    private boolean waitForAppInactive(UsageStatsManager usageStatsManager, String packageName) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (usageStatsManager.isAppInactive(packageName)) {
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private boolean waitForProvisionRequest(int expectedType) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (mLastTetherRequestType == expectedType) {
-                mLastTetherRequestType = -1;
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                Log.v(TAG, String.format(
-                        "waitForProvisionRequest timeout: expected=%d, actual=%d",
-                        expectedType, mLastTetherRequestType));
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private boolean waitForProvisionResponse(int expectedValue) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (mLastReceiverResultCode == expectedValue) {
-                mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                Log.v(TAG, String.format(
-                        "waitForProvisionResponse timeout: expected=%d, actual=%d",
-                        expectedValue, mLastReceiverResultCode));
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private static class MockResources extends android.test.mock.MockResources {
-        @Override
-        public int getInteger(int id) {
-            switch(id) {
-                case com.android.internal.R.integer.config_mobile_hotspot_provision_check_period:
-                    return TEST_CHECK_PERIOD;
-                default:
-                    return 0;
-            }
-        }
-
-        @Override
-        public String getString(int id) {
-            switch(id) {
-                case com.android.internal.R.string.config_mobile_hotspot_provision_response:
-                    return TEST_RESPONSE_ACTION;
-                case com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui:
-                    return TEST_NO_UI_ACTION;
-                default:
-                    return null;
-            }
-        }
-    }
-
-    private class TestContextWrapper extends ContextWrapper {
-
-        public TestContextWrapper(Context base) {
-            super(base);
-        }
-
-        @Override
-        public Resources getResources() {
-            return mResources;
-        }
-
-        @Override
-        public SharedPreferences getSharedPreferences(String name, int mode) {
-            // Stub out prefs to control the persisted tether type list.
-            if (name == "tetherPrefs") {
-                return mPrefs;
-            }
-            return super.getSharedPreferences(name, mode);
-        }
-
-        @Override
-        public PackageManager getPackageManager() {
-            return mPackageManager;
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            if (ALARM_SERVICE.equals(name)) {
-                return mAlarmManager;
-            } else if (CONNECTIVITY_SERVICE.equals(name)) {
-                return mConnectivityManager;
-            } else if (WIFI_SERVICE.equals(name)) {
-                return mWifiManager;
-            }
-
-            return super.getSystemService(name);
-        }
-    }
-
-    private static final class Receiver extends ResultReceiver {
-        final WeakReference<TetherServiceTest> mTest;
-
-        Receiver(TetherServiceTest test) {
-            super(null);
-            mTest = new WeakReference<TetherServiceTest>(test);
-        }
-
-        @Override
-        protected void onReceiveResult(int resultCode, Bundle resultData) {
-            TetherServiceTest test = mTest.get();
-            if (test != null) {
-                test.mLastReceiverResultCode = resultCode;
-            }
-        }
-    };
-
-    /**
-     * Stubs out the provisioning app receiver.
-     */
-    private class ProvisionReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            mLastTetherRequestType = intent.getIntExtra("TETHER_TYPE", TETHERING_INVALID);
-            sendResponse(mProvisionResponse, context);
-        }
-
-        private void sendResponse(int response, Context context) {
-            Intent responseIntent = new Intent(TEST_RESPONSE_ACTION);
-            responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
-            responseIntent.putExtra(TetherService.EXTRA_RESULT, response);
-            context.sendBroadcast(
-                    responseIntent, android.Manifest.permission.CONNECTIVITY_INTERNAL);
-        }
-    }
-
-    private static class FakeUsageStatsManagerWrapper
-            extends TetherService.UsageStatsManagerWrapper {
-        private final Set<String> mActivePackages;
-
-        FakeUsageStatsManagerWrapper(Context context) {
-            super(context);
-            mActivePackages = new HashSet<>();
-        }
-
-        @Override
-        void setAppInactive(String packageName, boolean isInactive) {
-            if (!isInactive) {
-                mActivePackages.add(packageName);
-            } else {
-                mActivePackages.remove(packageName);
-            }
-        }
-
-        boolean isAppInactive(String packageName) {
-            return !mActivePackages.contains(packageName);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/UserCredentialsTest.java b/tests/unit/src/com/android/settings/UserCredentialsTest.java
deleted file mode 100644
index 41ef4dec2f5722f4fcdd5fce4e39ea4cb6849c1b..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/UserCredentialsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.os.Parcel;
-import android.os.Process;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import static com.android.settings.UserCredentialsSettings.Credential;
-
-/**
- * User credentials settings fragment tests
- *
- * To run the test, use command:
- * adb shell am instrument -e class com.android.settings.UserCredentialsTest
- * -w com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
- *
- */
-public class UserCredentialsTest extends InstrumentationTestCase {
-    private static final String TAG = "UserCredentialsTests";
-
-    @SmallTest
-    public void testCredentialIsParcelable() {
-        final String alias = "credential-test-alias";
-        Credential c = new Credential(alias, Process.SYSTEM_UID);
-
-        c.storedTypes.add(Credential.Type.CA_CERTIFICATE);
-        c.storedTypes.add(Credential.Type.USER_SECRET_KEY);
-
-        Parcel p = Parcel.obtain();
-        c.writeToParcel(p, /* flags */ 0);
-        p.setDataPosition(0);
-
-        Credential r = Credential.CREATOR.createFromParcel(p);
-        assertEquals(c.alias, r.alias);
-        assertEquals(c.uid, r.uid);
-        assertEquals(c.storedTypes, r.storedTypes);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/UtilsTest.java b/tests/unit/src/com/android/settings/UtilsTest.java
deleted file mode 100644
index 20e701350a4f6217ee1dbd06d1139961e6c320f9..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/UtilsTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.when;
-
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class UtilsTest extends AndroidTestCase {
-    private static final int TEST_PRIMARY_USER_ID = 10;
-    private static final int TEST_MANAGED_PROFILE_ID = 11;
-
-    @Mock private UserManager mUserManager;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        // // this is necessary for mockito to work
-        System.setProperty("dexmaker.dexcache", getContext().getCacheDir().toString());
-
-        MockitoAnnotations.initMocks(this);
-        when(mUserManager.getUserHandle()).thenReturn(TEST_PRIMARY_USER_ID);
-        UserInfo primaryUser = new UserInfo(TEST_PRIMARY_USER_ID, null,
-                UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_PRIMARY);
-        when(mUserManager.getUserInfo(TEST_PRIMARY_USER_ID)).thenReturn(primaryUser);
-        UserInfo managedProfile = new UserInfo(TEST_MANAGED_PROFILE_ID, null,
-                UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_MANAGED_PROFILE);
-        when(mUserManager.getUserInfo(eq(TEST_MANAGED_PROFILE_ID))).thenReturn(managedProfile);
-    }
-
-    @SmallTest
-    public void testGetManagedProfile() {
-        UserHandle[] userHandles = new UserHandle[] {
-            new UserHandle(TEST_PRIMARY_USER_ID),
-            new UserHandle(TEST_MANAGED_PROFILE_ID)
-        };
-        when(mUserManager.getUserProfiles())
-                .thenReturn(new ArrayList<UserHandle>(Arrays.asList(userHandles)));
-        assertEquals(TEST_MANAGED_PROFILE_ID,
-                Utils.getManagedProfile(mUserManager).getIdentifier());
-    }
-
-    @SmallTest
-    public void testGetManagedProfile_notPresent() {
-        UserHandle[] userHandles = new UserHandle[] {
-            new UserHandle(TEST_PRIMARY_USER_ID)
-        };
-        when(mUserManager.getUserProfiles())
-                .thenReturn(new ArrayList<UserHandle>(Arrays.asList(userHandles)));
-        assertNull(Utils.getManagedProfile(mUserManager));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
deleted file mode 100644
index 5e5e143727fe8ff8c33dcdf240cc08497dbad9ab..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.os.Bundle;
-import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings.AccessibilitySettingsActivity;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ToggleFeaturePreferenceFragmentTest {
-    private static final String SUMMARY_TEXT = "Here's some summary text";
-
-    @Rule
-    public final ActivityTestRule<AccessibilitySettingsActivity> mActivityRule =
-            new ActivityTestRule<>(AccessibilitySettingsActivity.class, true);
-
-    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
-
-    @BeforeClass
-    public static void oneTimeSetup() {
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-    }
-
-    @Before
-    public void setUp() {
-        mInstrumentation.runOnMainSync(() -> {
-            MyToggleFeaturePreferenceFragment fragment = new MyToggleFeaturePreferenceFragment();
-            Bundle args = new Bundle();
-            args.putString(AccessibilitySettings.EXTRA_SUMMARY, SUMMARY_TEXT);
-            fragment.setArguments(args);
-            mActivityRule.getActivity().startPreferenceFragment(fragment, false);
-        });
-    }
-
-    @Test
-    public void testSummaryTestDisplayed() {
-        onView(withText(SUMMARY_TEXT)).check(matches(isDisplayed()));
-    }
-
-    public static class MyToggleFeaturePreferenceFragment extends ToggleFeaturePreferenceFragment {
-        @Override
-        protected void onPreferenceToggled(String preferenceKey, boolean enabled) {}
-
-        @Override
-        public int getMetricsCategory() {
-            return 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java
deleted file mode 100644
index e074966eecb0f71982fe08cbf6d0dc941ed5dad2..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class ManageApplicationsLaunchTest {
-
-    private Instrumentation mInstrumentation;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-    }
-
-    @Test
-    public void launchAppsSettings_shouldShowAppList() throws Exception {
-        final Intent appsSettingsIntent = new
-                Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
-
-        mInstrumentation.startActivitySync(appsSettingsIntent);
-
-        onView(allOf(withText("Calculator"))).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
deleted file mode 100644
index ce8603bde9aa82fd8138a83c6a4ad3d188aecc68..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.content.pm.ApplicationInfo;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppFilter;
-
-import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
-import java.lang.reflect.Field;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class ManageApplicationsUnitTest {
-    @Test
-    public void getCompositeFilter_filtersVolumeForAudio() {
-        AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_STORAGE,
-                        ManageApplications.STORAGE_TYPE_MUSIC,
-                        "uuid");
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_AUDIO;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        assertThat(filter.filterApp(appEntry)).isTrue();
-    }
-
-    @Test
-    public void getCompositeFilter_filtersVolumeForVideo() {
-        AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_MOVIES,
-                        ManageApplications.STORAGE_TYPE_DEFAULT,
-                        "uuid");
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_VIDEO;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        assertThat(filter.filterApp(appEntry)).isTrue();
-    }
-
-    @Test
-    public void getCompositeFilter_filtersVolumeForGames() {
-        ApplicationsState.AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_GAMES,
-                        ManageApplications.STORAGE_TYPE_DEFAULT,
-                        "uuid");
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_GAME;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        assertThat(filter.filterApp(appEntry)).isTrue();
-    }
-
-    @Test
-    public void getCompositeFilter_isEmptyNormally() {
-        ApplicationsState.AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_MAIN,
-                        ManageApplications.STORAGE_TYPE_DEFAULT,
-                        "uuid");
-        assertThat(filter).isNull();
-    }
-
-    @Test
-    public void getCompositeFilter_worksWithInstantApps() throws Exception {
-        Field field = AppUtils.class.getDeclaredField("sInstantAppDataProvider");
-        field.setAccessible(true);
-        field.set(AppUtils.class, (InstantAppDataProvider) (i -> true));
-
-        AppFilter filter =
-            ManageApplications.getCompositeFilter(
-                ManageApplications.LIST_TYPE_STORAGE,
-                ManageApplications.STORAGE_TYPE_MUSIC,
-                "uuid");
-        AppFilter composedFilter = new CompoundFilter(ApplicationsState.FILTER_INSTANT, filter);
-
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_AUDIO;
-        info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        assertThat(composedFilter.filterApp(appEntry)).isTrue();
-    }
-
-    @Test
-    public void getCompositeFilter_worksForLegacyPrivateSettings() throws Exception {
-        ApplicationsState.AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_STORAGE,
-                        ManageApplications.STORAGE_TYPE_LEGACY,
-                        "uuid");
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_GAME;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        assertThat(filter.filterApp(appEntry)).isTrue();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/backup/BackupIntentTest.java b/tests/unit/src/com/android/settings/backup/BackupIntentTest.java
deleted file mode 100644
index 0762e8c33bdccc266164b3cc8cb1fd1b09a77e97..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/backup/BackupIntentTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.backup;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class BackupIntentTest {
-
-    private static final String INTENT_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
-    private static final String INTENT_BACKUP_SETTINGS =
-            "android.settings.BACKUP_AND_RESET_SETTINGS";
-    private static final String BACKUP_SETTINGS_ACTIVITY =
-            "com.android.settings.backup.BackupSettingsActivity";
-
-    private Context mContext;
-
-    @Before
-    public void setUp() throws Exception {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = instrumentation.getTargetContext();
-    }
-
-    @Test
-    public void testBackupSettingsIntentResolvesToOnlyOneActivity(){
-        PackageManager pm = mContext.getPackageManager();
-        Intent intent = new Intent(INTENT_BACKUP_SETTINGS);
-        List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
-        assertThat(activities).isNotNull();
-        assertThat(activities.size()).isEqualTo(1);
-        assertThat(activities.get(0).activityInfo.getComponentName().getClassName()).
-                isEqualTo(BACKUP_SETTINGS_ACTIVITY);
-    }
-
-    @Test
-    public void testPrivacySettingsIntentResolvesToOnlyOneActivity(){
-        PackageManager pm = mContext.getPackageManager();
-        Intent intent = new Intent(INTENT_PRIVACY_SETTINGS);
-        List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
-        assertThat(activities).isNotNull();
-        assertThat(activities.size()).isEqualTo(1);
-        assertThat(activities.get(0).activityInfo.getComponentName().getClassName()).
-                isEqualTo(BACKUP_SETTINGS_ACTIVITY);
-    }
-
-}
diff --git a/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java b/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
deleted file mode 100644
index 220211ac19e1e2dd68201313c8ba14fd34e346d6..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.InputFilter;
-import android.text.SpannableStringBuilder;
-
-import com.android.settings.bluetooth.Utf8ByteLengthFilter;
-
-public class Utf8ByteLengthFilterTest extends AndroidTestCase {
-
-    @SmallTest
-    public void testFilter() {
-        // Define the variables
-        CharSequence source;
-        SpannableStringBuilder dest;
-        // Constructor to create a LengthFilter
-        InputFilter lengthFilter = new Utf8ByteLengthFilter(10);
-        InputFilter[] filters = {lengthFilter};
-
-        // filter() implicitly invoked. If the total length > filter length, the filter will
-        // cut off the source CharSequence from beginning to fit the filter length.
-        source = "abc";
-        dest = new SpannableStringBuilder("abcdefgh");
-        dest.setFilters(filters);
-
-        dest.insert(1, source);
-        String expectedString1 = "aabbcdefgh";
-        assertEquals(expectedString1, dest.toString());
-
-        dest.replace(5, 8, source);
-        String expectedString2 = "aabbcabcgh";
-        assertEquals(expectedString2, dest.toString());
-
-        dest.insert(2, source);
-        assertEquals(expectedString2, dest.toString());
-
-        dest.delete(1, 3);
-        String expectedString3 = "abcabcgh";
-        assertEquals(expectedString3, dest.toString());
-
-        dest.append("12345");
-        String expectedString4 = "abcabcgh12";
-        assertEquals(expectedString4, dest.toString());
-
-        source = "\u60a8\u597d";  // 2 Chinese chars == 6 bytes in UTF-8
-        dest.replace(8, 10, source);
-        assertEquals(expectedString3, dest.toString());
-
-        dest.replace(0, 1, source);
-        String expectedString5 = "\u60a8bcabcgh";
-        assertEquals(expectedString5, dest.toString());
-
-        dest.replace(0, 4, source);
-        String expectedString6 = "\u60a8\u597dbcgh";
-        assertEquals(expectedString6, dest.toString());
-
-        source = "\u00a3\u00a5";  // 2 Latin-1 chars == 4 bytes in UTF-8
-        dest.delete(2, 6);
-        dest.insert(0, source);
-        String expectedString7 = "\u00a3\u00a5\u60a8\u597d";
-        assertEquals(expectedString7, dest.toString());
-
-        dest.replace(2, 3, source);
-        String expectedString8 = "\u00a3\u00a5\u00a3\u597d";
-        assertEquals(expectedString8, dest.toString());
-
-        dest.replace(3, 4, source);
-        String expectedString9 = "\u00a3\u00a5\u00a3\u00a3\u00a5";
-        assertEquals(expectedString9, dest.toString());
-
-        // filter() explicitly invoked
-        dest = new SpannableStringBuilder("abcdefgh");
-        CharSequence beforeFilterSource = "TestLengthFilter";
-        String expectedAfterFilter = "TestLength";
-        CharSequence actualAfterFilter = lengthFilter.filter(beforeFilterSource, 0,
-                beforeFilterSource.length(), dest, 0, dest.length());
-        assertEquals(expectedAfterFilter, actualAfterFilter);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java b/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
deleted file mode 100644
index abce2c8e616730b07b31a89514d2e2ae1c8a9db7..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.util.Log;
-
-import com.android.settings.core.gateway.SettingsGateway;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static org.junit.Assert.assertFalse;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class SettingsGatewayTest {
-
-    private static final String TAG = "SettingsGatewayTest";
-
-    @Test
-    public void allRestrictedActivityMustBeDefinedInManifest() {
-        final Context context = InstrumentationRegistry.getTargetContext();
-        final PackageManager packageManager = context.getPackageManager();
-        final String packageName = context.getPackageName();
-        for (String className : SettingsGateway.SETTINGS_FOR_RESTRICTED) {
-            final Intent intent = new Intent();
-            intent.setComponent(new ComponentName(packageName, className));
-            List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(intent,
-                    PackageManager.MATCH_DISABLED_COMPONENTS);
-            Log.d(TAG, packageName + "/" + className + "; resolveInfo size: "
-                    + resolveInfos.size());
-            assertFalse(className + " is not-defined in manifest", resolveInfos.isEmpty());
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java b/tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
deleted file mode 100644
index 910d7914a9da172203e3210f1f1007e747e4da6d..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.content.res.Resources;
-import android.view.View;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-/***
- * Matches on the first view with id if there are multiple views using the same Id.
- */
-public class FirstIdViewMatcher {
-
-    public static Matcher<View> withFirstId(final int id) {
-        return new TypeSafeMatcher<View>() {
-            Resources resources = null;
-            private boolean mMatched;
-
-            public void describeTo(Description description) {
-                String idDescription = Integer.toString(id);
-                if (resources != null) {
-                    try {
-                        idDescription = resources.getResourceName(id);
-                    } catch (Resources.NotFoundException e) {
-                        // No big deal, will just use the int value.
-                        idDescription = String.format("%s (resource name not found)", id);
-                    }
-                }
-                description.appendText("with first id: " + idDescription);
-            }
-
-            public boolean matchesSafely(View view) {
-                this.resources = view.getResources();
-                if (mMatched) {
-                    return false;
-                } else {
-                    mMatched = id == view.getId();
-                    return mMatched;
-                }
-            }
-        };
-    }
-}
diff --git a/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
deleted file mode 100644
index 16e309d1eb658232ce8c40bf760e8abec897d695..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.matcher.ViewMatchers.Visibility;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static com.android.settings.dashboard.FirstIdViewMatcher.withFirstId;
-
-import static org.hamcrest.Matchers.allOf;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PreferenceThemeTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mTargetContext;
-    private String mTargetPackage;
-
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-        mTargetPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void startPhoneStatus_preferenceIconSpaceReserved() throws InterruptedException {
-        launchPhoneStatus();
-        onView(withFirstId(R.id.icon_frame)).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void startSetupWizardLockScreen_preferenceIconSpaceNotReserved() {
-        launchSetupWizardLockScreen();
-        // Icons should not be shown, and the frame should not occupy extra space.
-        onView(allOf(withId(R.id.icon_frame), withEffectiveVisibility(Visibility.VISIBLE)))
-                .check(doesNotExist());
-        onView(withId(R.id.icon_container)).check(doesNotExist());
-    }
-
-    private void launchPhoneStatus() {
-        final Intent settingsIntent = new Intent("android.settings.DEVICE_INFO_SETTINGS")
-                .addCategory(Intent.CATEGORY_DEFAULT)
-                .setPackage(mTargetPackage)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        InstrumentationRegistry.getInstrumentation().startActivitySync(settingsIntent);
-    }
-
-    private void launchSetupWizardLockScreen() {
-        final Intent settingsIntent = new Intent("com.android.settings.SETUP_LOCK_SCREEN")
-                .addCategory(Intent.CATEGORY_DEFAULT)
-                .setPackage(mTargetPackage)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        InstrumentationRegistry.getInstrumentation().startActivitySync(settingsIntent);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/datausage/MobileDataUsageActivityTest.java b/tests/unit/src/com/android/settings/datausage/MobileDataUsageActivityTest.java
deleted file mode 100644
index 135ad9d8b94bd2fb4ba7012e9e1780805c97d3e4..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/datausage/MobileDataUsageActivityTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static junit.framework.Assert.assertEquals;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.NetworkTemplate;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class MobileDataUsageActivityTest {
-    private static final String TAG = "MobileDataUsageTest";
-    @Test
-    public void test_mobileDataUsageIntent() {
-        final Context context = InstrumentationRegistry.getTargetContext();
-        final PackageManager packageManager = context.getPackageManager();
-        final int subId = SubscriptionManager.getDefaultSubscriptionId();
-        final NetworkTemplate template = getNetworkTemplate(context, subId);
-
-        Intent intent = new Intent(android.provider.Settings.ACTION_MOBILE_DATA_USAGE);
-        intent.putExtra(android.provider.Settings.EXTRA_NETWORK_TEMPLATE, template);
-        intent.putExtra(android.provider.Settings.EXTRA_SUB_ID, subId);
-
-        assertEquals(packageManager.queryIntentActivities(intent, 0).size(), 1);
-
-        context.startActivity(intent);
-        // Should exit gracefully without crashing.
-    }
-
-    private NetworkTemplate getNetworkTemplate(Context context, int subId) {
-        TelephonyManager tm = (TelephonyManager) context
-                .getSystemService(Context.TELEPHONY_SERVICE);
-        NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
-                tm.getSubscriberId(subId));
-        return NetworkTemplate.normalize(mobileAll,
-                tm.getMergedSubscriberIds());
-    }
-}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/unit/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
deleted file mode 100644
index be36e43dbb22adaf84cc3e2be1432171457c14e5..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.deviceinfo;
-
-import android.content.Intent;
-import android.content.Context;
-
-import android.os.storage.VolumeRecord;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PrivateVolumeForgetTest {
-    @Rule
-    public ActivityTestRule<Settings.PrivateVolumeForgetActivity> mActivityRule =
-            new ActivityTestRule<>(Settings.PrivateVolumeForgetActivity.class, true, true);
-
-    @Test
-    public void test_invalidSetupDoesNotCrashSettings() {
-        Context targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        Intent intent = new Intent(targetContext, Settings.PrivateVolumeForgetActivity.class);
-        intent.putExtra(VolumeRecord.EXTRA_FS_UUID, "totally-fake-uuid-doesnt-even-fit-format");
-        mActivityRule.launchActivity(intent);
-
-        // Should exit gracefully without crashing.
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/deviceinfo/PublicVolumeSettingsTest.java b/tests/unit/src/com/android/settings/deviceinfo/PublicVolumeSettingsTest.java
deleted file mode 100644
index 4903b8655134037bc9601fc506d10142ad5a2de6..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/deviceinfo/PublicVolumeSettingsTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.deviceinfo;
-
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PublicVolumeSettingsTest {
-    @Rule
-    public ActivityTestRule<Settings.PublicVolumeSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(Settings.PublicVolumeSettingsActivity.class, true, true);
-
-    @Test
-    public void test_invalidSetupDoesNotCrashSettings() {
-        Intent intent = new Intent();
-        intent.setAction(android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS);
-        intent.setClassName(InstrumentationRegistry.getTargetContext().getPackageName(),
-                Settings.PublicVolumeSettingsActivity.class.getName());
-        mActivityRule.launchActivity(intent);
-
-        // Should exit gracefully without crashing.
-    }
-}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
deleted file mode 100644
index 5a3569c22483fa1318c6a782559046f4048848d8..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo.storage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.UserInfo;
-import android.net.TrafficStats;
-import android.os.UserHandle;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.util.SparseArray;
-
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.applications.UserManagerWrapper;
-import com.android.settingslib.applications.StorageStatsSource;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class StorageAsyncLoaderTest {
-    private static final int PRIMARY_USER_ID = 0;
-    private static final int SECONDARY_USER_ID = 10;
-    private static final String PACKAGE_NAME_1 = "com.blah.test";
-    private static final String PACKAGE_NAME_2 = "com.blah.test2";
-    private static final long DEFAULT_QUOTA = 64 * TrafficStats.MB_IN_BYTES;
-
-    @Mock
-    private StorageStatsSource mSource;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-    @Mock
-    private UserManagerWrapper mUserManager;
-    private List<ApplicationInfo> mInfo = new ArrayList<>();
-    private List<UserInfo> mUsers;
-
-    private StorageAsyncLoader mLoader;
-
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mInfo = new ArrayList<>();
-        mLoader = new StorageAsyncLoader(mContext, mUserManager, "id", mSource, mPackageManager);
-        when(mPackageManager.getInstalledApplicationsAsUser(eq(PRIMARY_USER_ID), anyInt()))
-                .thenReturn(mInfo);
-        UserInfo info = new UserInfo();
-        mUsers = new ArrayList<>();
-        mUsers.add(info);
-        when(mUserManager.getUsers()).thenReturn(mUsers);
-        when(mSource.getCacheQuotaBytes(anyString(), anyInt())).thenReturn(DEFAULT_QUOTA);
-    }
-
-    @Test
-    public void testLoadingApps() throws Exception {
-        addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-        addPackage(PACKAGE_NAME_2, 0, 100, 1000, ApplicationInfo.CATEGORY_UNDEFINED);
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).gamesSize).isEqualTo(0L);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(1111L);
-    }
-
-    @Test
-    public void testGamesAreFiltered() throws Exception {
-        addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_GAME);
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).gamesSize).isEqualTo(11L);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(0);
-    }
-
-    @Test
-    public void testLegacyGamesAreFiltered() throws Exception {
-        ApplicationInfo info =
-                addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-        info.flags = ApplicationInfo.FLAG_IS_GAME;
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).gamesSize).isEqualTo(11L);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(0);
-    }
-
-    @Test
-    public void testCacheIsNotIgnored() throws Exception {
-        addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(111L);
-    }
-
-    @Test
-    public void testMultipleUsers() throws Exception {
-        UserInfo info = new UserInfo();
-        info.id = SECONDARY_USER_ID;
-        mUsers.add(info);
-        when(mSource.getExternalStorageStats(anyString(), eq(UserHandle.SYSTEM)))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(9, 2, 3, 4, 0));
-        when(mSource.getExternalStorageStats(anyString(), eq(new UserHandle(SECONDARY_USER_ID))))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(10, 3, 3, 4, 0));
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(2);
-        assertThat(result.get(PRIMARY_USER_ID).externalStats.totalBytes).isEqualTo(9L);
-        assertThat(result.get(SECONDARY_USER_ID).externalStats.totalBytes).isEqualTo(10L);
-    }
-
-    @Test
-    public void testUpdatedSystemAppCodeSizeIsCounted() throws Exception {
-        ApplicationInfo systemApp =
-                addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-        systemApp.flags = ApplicationInfo.FLAG_SYSTEM & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(111L);
-    }
-
-    @Test
-    public void testVideoAppsAreFiltered() throws Exception {
-        addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_VIDEO);
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).videoAppsSize).isEqualTo(11L);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(0);
-    }
-
-    @Test
-    public void testRemovedPackageDoesNotCrash() throws Exception {
-        ApplicationInfo info = new ApplicationInfo();
-        info.packageName = PACKAGE_NAME_1;
-        info.category = ApplicationInfo.CATEGORY_UNDEFINED;
-        mInfo.add(info);
-        when(mSource.getStatsForPackage(anyString(), anyString(), any(UserHandle.class)))
-                .thenThrow(new NameNotFoundException());
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        // Should not crash.
-    }
-
-    @Test
-    public void testPackageIsNotDoubleCounted() throws Exception {
-        UserInfo info = new UserInfo();
-        info.id = SECONDARY_USER_ID;
-        mUsers.add(info);
-        when(mSource.getExternalStorageStats(anyString(), eq(UserHandle.SYSTEM)))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(9, 2, 3, 4, 0));
-        when(mSource.getExternalStorageStats(anyString(), eq(new UserHandle(SECONDARY_USER_ID))))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(10, 3, 3, 4, 0));
-        addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_VIDEO);
-        ArrayList<ApplicationInfo> secondaryUserApps = new ArrayList<>();
-        ApplicationInfo appInfo = new ApplicationInfo();
-        appInfo.packageName = PACKAGE_NAME_1;
-        appInfo.category = ApplicationInfo.CATEGORY_VIDEO;
-        secondaryUserApps.add(appInfo);
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(2);
-        assertThat(result.get(PRIMARY_USER_ID).videoAppsSize).isEqualTo(11L);
-        // No code size for the second user.
-        assertThat(result.get(SECONDARY_USER_ID).videoAppsSize).isEqualTo(10L);
-    }
-
-    @Test
-    public void testCacheOveragesAreCountedAsFree() throws Exception {
-        addPackage(PACKAGE_NAME_1, DEFAULT_QUOTA + 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(DEFAULT_QUOTA + 11);
-    }
-
-    private ApplicationInfo addPackage(String packageName, long cacheSize, long codeSize,
-            long dataSize, int category) throws Exception {
-        StorageStatsSource.AppStorageStats storageStats =
-                mock(StorageStatsSource.AppStorageStats.class);
-        when(storageStats.getCodeBytes()).thenReturn(codeSize);
-        when(storageStats.getDataBytes()).thenReturn(dataSize + cacheSize);
-        when(storageStats.getCacheBytes()).thenReturn(cacheSize);
-        when(mSource.getStatsForPackage(anyString(), eq(packageName), any(UserHandle.class)))
-                .thenReturn(storageStats);
-
-        ApplicationInfo info = new ApplicationInfo();
-        info.packageName = packageName;
-        info.category = category;
-        mInfo.add(info);
-        return info;
-    }
-
-}
diff --git a/tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java b/tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java
deleted file mode 100644
index 4011d9a7bac9a181c5a432f0d33366670933d9b3..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.display;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings.NightDisplaySettingsActivity;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class NightDisplaySettingsActivityTest {
-
-    private Context mTargetContext;
-
-    @Before
-    public void setUp() throws Exception {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = instrumentation.getTargetContext();
-    }
-
-    @Test
-    public void nightDisplaySettingsIntent_resolvesCorrectly() {
-        final boolean nightDisplayAvailable = mTargetContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_nightDisplayAvailable);
-        final PackageManager pm = mTargetContext.getPackageManager();
-        final Intent intent = new Intent(Settings.ACTION_NIGHT_DISPLAY_SETTINGS);
-        final ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
-
-        if (nightDisplayAvailable) {
-            Assert.assertNotNull("No activity for " + Settings.ACTION_NIGHT_DISPLAY_SETTINGS, ri);
-            Assert.assertEquals(mTargetContext.getPackageName(), ri.activityInfo.packageName);
-            Assert.assertEquals(NightDisplaySettingsActivity.class.getName(),
-                    ri.activityInfo.name);
-        } else {
-            Assert.assertNull("Should have no activity for "
-                    + Settings.ACTION_NIGHT_DISPLAY_SETTINGS, ri);
-        }
-    }
-
-}
diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
deleted file mode 100644
index 8c6e8da0db7a6ef902494efd046a1ef7e0a177bf..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ContextWrapper;
-import android.content.om.OverlayInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.v7.preference.ListPreference;
-
-import com.android.settings.display.ThemePreferenceController;
-import com.android.settings.display.ThemePreferenceController.OverlayManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-
-import java.util.ArrayList;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class ThemePreferenceControllerTest {
-
-    private OverlayManager mMockOverlayManager;
-    private ContextWrapper mContext;
-    private ThemePreferenceController mPreferenceController;
-    private PackageManager mMockPackageManager;
-
-    @Before
-    public void setup() {
-        mMockOverlayManager = mock(OverlayManager.class);
-        mMockPackageManager = mock(PackageManager.class);
-        mContext = new ContextWrapper(InstrumentationRegistry.getTargetContext()) {
-            @Override
-            public PackageManager getPackageManager() {
-                return mMockPackageManager;
-            }
-        };
-        mPreferenceController = new ThemePreferenceController(mContext, mMockOverlayManager);
-    }
-
-    @Test
-    public void testUpdateState() throws Exception {
-        OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
-                "", OverlayInfo.STATE_ENABLED, 0);
-        OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
-                "", 0, 0);
-        when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> {
-            ApplicationInfo info = mock(ApplicationInfo.class);
-            if ("com.android.Theme1".equals(inv.getArguments()[0])) {
-                when(info.loadLabel(any())).thenReturn("Theme1");
-            } else {
-                when(info.loadLabel(any())).thenReturn("Theme2");
-            }
-            return info;
-        });
-        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
-                new PackageInfo());
-        when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn(
-                list(info1, info2));
-        ListPreference pref = mock(ListPreference.class);
-        mPreferenceController.updateState(pref);
-        ArgumentCaptor<String[]> arg = ArgumentCaptor.forClass(String[].class);
-        verify(pref).setEntries(arg.capture());
-
-
-        CharSequence[] entries = arg.getValue();
-        assertThat(entries).asList().containsExactly("Theme1", "Theme2");
-
-        verify(pref).setEntryValues(arg.capture());
-        CharSequence[] entryValues = arg.getValue();
-        assertThat(entryValues).asList().containsExactly(
-                "com.android.Theme1", "com.android.Theme2");
-
-        verify(pref).setValue(eq("com.android.Theme1"));
-    }
-
-    @Test
-    public void testUpdateState_withStaticOverlay() throws Exception {
-        OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
-                "", OverlayInfo.STATE_ENABLED, 0);
-        OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
-                "", OverlayInfo.STATE_ENABLED, 0);
-        when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> {
-            ApplicationInfo info = mock(ApplicationInfo.class);
-            if ("com.android.Theme1".equals(inv.getArguments()[0])) {
-                when(info.loadLabel(any())).thenReturn("Theme1");
-            } else {
-                when(info.loadLabel(any())).thenReturn("Theme2");
-            }
-            return info;
-        });
-        PackageInfo pi = new PackageInfo();
-        pi.overlayFlags |= PackageInfo.FLAG_OVERLAY_STATIC;
-        when(mMockPackageManager.getPackageInfo(eq("com.android.Theme1"), anyInt())).thenReturn(pi);
-        when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn(
-                new PackageInfo());
-        when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn(
-                list(info1, info2));
-        ListPreference pref = mock(ListPreference.class);
-        mPreferenceController.updateState(pref);
-        ArgumentCaptor<String[]> arg = ArgumentCaptor.forClass(String[].class);
-        verify(pref).setEntries(arg.capture());
-
-
-        CharSequence[] entries = arg.getValue();
-        assertThat(entries).asList().containsExactly("Theme2");
-
-        verify(pref).setEntryValues(arg.capture());
-        CharSequence[] entryValues = arg.getValue();
-        assertThat(entryValues).asList().containsExactly("com.android.Theme2");
-
-        verify(pref).setValue(eq("com.android.Theme2"));
-    }
-
-    @Test
-    public void testAvailable_false() throws Exception {
-        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
-                new PackageInfo());
-        when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
-                .thenReturn(list(new OverlayInfo("", "", "", 0, 0)));
-        assertThat(mPreferenceController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testAvailable_true() throws Exception {
-        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
-                 new PackageInfo());
-        when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
-                .thenReturn(list(new OverlayInfo("", "", "", 0, 0),
-                        new OverlayInfo("", "", "", 0, 0)));
-        assertThat(mPreferenceController.isAvailable()).isTrue();
-    }
-
-    private ArrayList<OverlayInfo> list(OverlayInfo... infos) {
-        ArrayList<OverlayInfo> list = new ArrayList<>();
-        for (int i = 0; i < infos.length; i++) {
-            list.add(infos[i]);
-        }
-        return list;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java b/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java
deleted file mode 100644
index 497fa0a6d7a940f78d11528f9cca609039ae3f24..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dream;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DreamSettingsLaunchTest {
-
-    @Test
-    public void launchFromIntent_doesNotCrash() {
-        final Context context = InstrumentationRegistry.getTargetContext();
-        Intent intent = new Intent(Settings.ACTION_DREAM_SETTINGS);
-
-        context.startActivity(intent);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java
deleted file mode 100644
index 235ba1e43f02e7c6e2adc2312e9917cbda9348a4..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fingerprint;
-
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.hardware.fingerprint.Fingerprint;
-import android.hardware.fingerprint.FingerprintManager;
-import android.test.ActivityUnitTestCase;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FingerprintEnrollIntroductionTest
-        extends ActivityUnitTestCase<FingerprintEnrollIntroduction> {
-
-    private TestContext mContext;
-
-    @Mock
-    private FingerprintManager mFingerprintManager;
-
-    private FingerprintEnrollIntroduction mActivity;
-
-    public FingerprintEnrollIntroductionTest() {
-        super(FingerprintEnrollIntroduction.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        MockitoAnnotations.initMocks(this);
-        mContext = new TestContext(getInstrumentation().getTargetContext());
-        setActivityContext(mContext);
-
-        getInstrumentation().runOnMainSync(() -> {
-            final Intent intent = new Intent();
-            mActivity = startActivity(intent,
-                    null /* savedInstanceState */, null /* lastNonConfigurationInstance */);
-        });
-    }
-
-    public void testMaxFingerprint_shouldShowErrorMessage() {
-        final int max = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
-        doReturn(generateFingerprintList(max)).when(mFingerprintManager)
-                .getEnrolledFingerprints(anyInt());
-
-        getInstrumentation().runOnMainSync(() -> {
-            getInstrumentation().callActivityOnCreate(mActivity, null);
-            getInstrumentation().callActivityOnResume(mActivity);
-        });
-
-        final TextView errorTextView = (TextView) mActivity.findViewById(R.id.error_text);
-        assertNotNull(errorTextView.getText().toString());
-
-        final Button nextButton = (Button) mActivity.findViewById(R.id.fingerprint_next_button);
-        assertEquals(View.GONE, nextButton.getVisibility());
-    }
-
-    private List<Fingerprint> generateFingerprintList(int num) {
-        ArrayList<Fingerprint> list = new ArrayList<>();
-        for (int i = 0; i < num; i++) {
-            list.add(new Fingerprint("Fingerprint " + i, 0, i, 0));
-        }
-        return list;
-    }
-
-    public class TestContext extends ContextWrapper {
-
-        public TestContext(Context base) {
-            super(base);
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            if (Context.FINGERPRINT_SERVICE.equals(name)) {
-                return mFingerprintManager;
-            }
-            return super.getSystemService(name);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java b/tests/unit/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
deleted file mode 100644
index 8be3320a88d773a0a99e6c64d4337236a931d7c1..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge.anomaly.action;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.fuelgauge.anomaly.Anomaly;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class LocationCheckActionTest {
-    private static final String PACKAGE_NAME = "com.android.chrome";
-
-    private Context mContext;
-    private LocationCheckAction mLocationCheckAction;
-    private Anomaly mAnomaly;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mLocationCheckAction = new LocationCheckAction(mContext);
-
-        mAnomaly = new Anomaly.Builder()
-                .setUid(getPackageUid(mContext, PACKAGE_NAME))
-                .setPackageName(PACKAGE_NAME)
-                .build();
-    }
-
-    @Test
-    public void testRevokeAndCheck() {
-        mLocationCheckAction.handlePositiveAction(mAnomaly, 0 /* metric key */);
-
-        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isFalse();
-    }
-
-    private int getPackageUid(Context context, String packageName) {
-        try {
-            return context.getPackageManager().getPackageUid(packageName,
-                    PackageManager.GET_META_DATA);
-        } catch (PackageManager.NameNotFoundException e) {
-            return -1;
-        }
-    }
-}
-
-
-
-
diff --git a/tests/unit/src/com/android/settings/search/SearchActivityTest.java b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
deleted file mode 100644
index 8a7e3fef81db15cd5541a997048514901809b4cb..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/search/SearchActivityTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class SearchActivityTest {
-
-    @Test
-    public void shouldHaveParentActivity() {
-        final Context context = InstrumentationRegistry.getTargetContext();
-        final PackageManager packageManager = context.getPackageManager();
-        final Intent intent = new Intent(context, SearchActivity.class);
-        final List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(
-                intent, PackageManager.GET_META_DATA);
-
-        assertThat(resolveInfos).isNotEmpty();
-        assertThat(resolveInfos.get(0).activityInfo.parentActivityName)
-                .isEqualTo(Settings.class.getName());
-    }
-}
diff --git a/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java b/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java
deleted file mode 100644
index 4de5fb72deeab747b10db31577214702a3392638..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.provider.SearchIndexablesContract;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-
-public class SearchIndexablesContractTest extends AndroidTestCase {
-        @SmallTest
-        public void testRawColumns_IncludesRank() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_RANK,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[0]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesTitle() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_TITLE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[1]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesSummaryOn() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_SUMMARY_ON,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[2]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesSummaryOff() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_SUMMARY_OFF,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[3]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesEntries() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_ENTRIES,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[4]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesKeywords() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_KEYWORDS,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[5]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesScreenTitle() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_SCREEN_TITLE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[6]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesClassName() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_CLASS_NAME,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[7]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesIcon() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_ICON_RESID,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[8]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesIntentAction() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_INTENT_ACTION,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[9]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesIntentTargetPackage() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_PACKAGE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[10]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesTargetClass() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_CLASS,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[11]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesKey() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_KEY,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[12]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesUserId() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_USER_ID,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[13]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesPayloadType() {
-            assertEquals(SearchIndexablesContract.RawData.PAYLOAD_TYPE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[14]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesPayload() {
-            assertEquals(SearchIndexablesContract.RawData.PAYLOAD,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[15]);
-        }
-}
diff --git a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java b/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
deleted file mode 100644
index 41b236c73d6f0a78d615eb20b7c968d647342145..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.utils;
-
-import static com.android.settings.utils.FileSizeFormatter.GIGABYTE_IN_BYTES;
-import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.icu.util.MeasureUnit;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class FileSizeFormatterTest {
-    private Context mContext;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    public void formatFileSize_zero() throws Exception {
-        assertThat(
-                        FileSizeFormatter.formatFileSize(
-                                mContext,
-                                0 /* size */,
-                                MeasureUnit.GIGABYTE,
-                                GIGABYTE_IN_BYTES))
-                .isEqualTo("0.00 GB");
-    }
-
-    @Test
-    public void formatFileSize_smallSize() throws Exception {
-        assertThat(
-                        FileSizeFormatter.formatFileSize(
-                                mContext,
-                                MEGABYTE_IN_BYTES * 11 /* size */,
-                                MeasureUnit.GIGABYTE,
-                                GIGABYTE_IN_BYTES))
-                .isEqualTo("0.01 GB");
-    }
-
-    @Test
-    public void formatFileSize_lessThanOneSize() throws Exception {
-        assertThat(
-                        FileSizeFormatter.formatFileSize(
-                                mContext,
-                                MEGABYTE_IN_BYTES * 155 /* size */,
-                                MeasureUnit.GIGABYTE,
-                                GIGABYTE_IN_BYTES))
-                .isEqualTo("0.16 GB");
-    }
-
-    @Test
-    public void formatFileSize_greaterThanOneSize() throws Exception {
-        assertThat(
-                        FileSizeFormatter.formatFileSize(
-                                mContext,
-                                MEGABYTE_IN_BYTES * 1551 /* size */,
-                                MeasureUnit.GIGABYTE,
-                                GIGABYTE_IN_BYTES))
-                .isEqualTo("1.6 GB");
-    }
-
-    @Test
-    public void formatFileSize_greaterThanTen() throws Exception {
-        // Should round down due to truncation
-        assertThat(
-                        FileSizeFormatter.formatFileSize(
-                                mContext,
-                                GIGABYTE_IN_BYTES * 15 + MEGABYTE_IN_BYTES * 50 /* size */,
-                                MeasureUnit.GIGABYTE,
-                                GIGABYTE_IN_BYTES))
-                .isEqualTo("15 GB");
-    }
-
-    @Test
-    public void formatFileSize_handlesNegativeFileSizes() throws Exception {
-        assertThat(
-                        FileSizeFormatter.formatFileSize(
-                                mContext,
-                                MEGABYTE_IN_BYTES * -155 /* size */,
-                                MeasureUnit.GIGABYTE,
-                                GIGABYTE_IN_BYTES))
-                .isEqualTo("-0.16 GB");
-    }
-}
diff --git a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
deleted file mode 100644
index fe074cc3e1e32b3cdb6bf4fef19fb99718fbb56a..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.when;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.Process;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class AppSettingsTest extends AndroidTestCase {
-    private static final String TAG = AppSettingsTest.class.getSimpleName();
-
-    @Mock private Context mContext;
-    @Mock private AppOpsManager mAppOps;
-
-    @Override
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(eq(Context.APP_OPS_SERVICE))).thenReturn(mAppOps);
-    }
-
-    @SmallTest
-    public void testAppOpsRequiredToOpenFragment() {
-        ApplicationInfo mockApp = createMockApp();
-
-        final AppOpsManager.PackageOps[] blankOps = {
-            new AppOpsManager.PackageOps(mockApp.packageName, mockApp.uid, new ArrayList<>()),
-            new AppOpsManager.PackageOps(mockApp.packageName, mockApp.uid, new ArrayList<>())
-        };
-
-        // List with one package op
-        when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
-                .thenReturn(Arrays.asList(new AppOpsManager.PackageOps[] {blankOps[0]}));
-        assertTrue(appHasVpnPermission(mContext, mockApp));
-
-        // List with more than one package op
-        when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
-                .thenReturn(Arrays.asList(blankOps));
-        assertTrue(appHasVpnPermission(mContext, mockApp));
-
-        // Empty list
-        when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
-                .thenReturn(Collections.emptyList());
-        assertFalse(appHasVpnPermission(mContext, mockApp));
-
-        // Null list (may be returned in place of an empty list)
-        when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
-                .thenReturn(null);
-        assertFalse(appHasVpnPermission(mContext, mockApp));
-    }
-
-    private static ApplicationInfo createMockApp() {
-        final ApplicationInfo app = new ApplicationInfo();
-        app.packageName = "com.example.mockvpn";
-        app.uid = Process.FIRST_APPLICATION_UID;
-        return app;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java b/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
deleted file mode 100644
index bb12efacf090208899e9f252b217816fd4d1823c..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.vpn2;
-
-import static org.mockito.AdditionalMatchers.not;
-import static org.mockito.Mockito.*;
-
-import android.content.Context;
-import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.TextUtils;
-
-import com.android.internal.net.LegacyVpnInfo;
-import com.android.internal.net.VpnProfile;
-import com.android.settings.R;
-import com.android.settings.vpn2.VpnSettings;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.compat.ArgumentMatcher;
-
-public class PreferenceListTest extends AndroidTestCase {
-    private static final String TAG = "PreferenceListTest";
-
-    @Mock VpnSettings mSettings;
-
-    final Map<String, LegacyVpnPreference> mLegacyMocks = new HashMap<>();
-    final Map<AppVpnInfo, AppPreference> mAppMocks = new HashMap<>();
-
-    @Override
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        mLegacyMocks.clear();
-        mAppMocks.clear();
-
-        doAnswer(invocation -> {
-            final String key = ((VpnProfile)(invocation.getArguments()[0])).key;
-            if (!mLegacyMocks.containsKey(key)) {
-                mLegacyMocks.put(key, mock(LegacyVpnPreference.class));
-            }
-            return mLegacyMocks.get(key);
-        }).when(mSettings).findOrCreatePreference(any(VpnProfile.class), anyBoolean());
-
-        doAnswer(invocation -> {
-            final AppVpnInfo key = (AppVpnInfo)(invocation.getArguments()[0]);
-            if (!mAppMocks.containsKey(key)) {
-                mAppMocks.put(key, mock(AppPreference.class));
-            }
-            return mAppMocks.get(key);
-        }).when(mSettings).findOrCreatePreference(any(AppVpnInfo.class));
-
-        doNothing().when(mSettings).setShownPreferences(any());
-        doReturn(true).when(mSettings).canAddPreferences();
-    }
-
-    @SmallTest
-    public void testNothingShownByDefault() {
-        final VpnSettings.UpdatePreferences updater = new VpnSettings.UpdatePreferences(mSettings);
-        updater.run();
-
-        verify(mSettings, never()).findOrCreatePreference(any(VpnProfile.class), anyBoolean());
-        assertEquals(0, mLegacyMocks.size());
-        assertEquals(0, mAppMocks.size());
-    }
-
-    @SmallTest
-    public void testDisconnectedLegacyVpnShown() {
-        final VpnProfile vpnProfile = new VpnProfile("test-disconnected");
-
-        final VpnSettings.UpdatePreferences updater = new VpnSettings.UpdatePreferences(mSettings);
-        updater.legacyVpns(
-                /* vpnProfiles */ Collections.<VpnProfile>singletonList(vpnProfile),
-                /* connectedLegacyVpns */ Collections.<String, LegacyVpnInfo>emptyMap(),
-                /* lockdownVpnKey */ null);
-        updater.run();
-
-        verify(mSettings, times(1)).findOrCreatePreference(any(VpnProfile.class), eq(true));
-        assertEquals(1, mLegacyMocks.size());
-        assertEquals(0, mAppMocks.size());
-    }
-
-    @SmallTest
-    public void testConnectedLegacyVpnShownIfDeleted() {
-        final LegacyVpnInfo connectedLegacyVpn =new LegacyVpnInfo();
-        connectedLegacyVpn.key = "test-connected";
-
-        final VpnSettings.UpdatePreferences updater = new VpnSettings.UpdatePreferences(mSettings);
-        updater.legacyVpns(
-                /* vpnProfiles */ Collections.<VpnProfile>emptyList(),
-                /* connectedLegacyVpns */ new HashMap<String, LegacyVpnInfo>() {{
-                    put(connectedLegacyVpn.key, connectedLegacyVpn);
-                }},
-                /* lockdownVpnKey */ null);
-        updater.run();
-
-        verify(mSettings, times(1)).findOrCreatePreference(any(VpnProfile.class), eq(false));
-        assertEquals(1, mLegacyMocks.size());
-        assertEquals(0, mAppMocks.size());
-    }
-
-    @SmallTest
-    public void testConnectedLegacyVpnShownExactlyOnce() {
-        final VpnProfile vpnProfile = new VpnProfile("test-no-duplicates");
-        final LegacyVpnInfo connectedLegacyVpn = new LegacyVpnInfo();
-        connectedLegacyVpn.key = new String(vpnProfile.key);
-
-        final VpnSettings.UpdatePreferences updater = new VpnSettings.UpdatePreferences(mSettings);
-        updater.legacyVpns(
-                /* vpnProfiles */ Collections.<VpnProfile>singletonList(vpnProfile),
-                /* connectedLegacyVpns */ new HashMap<String, LegacyVpnInfo>() {{
-                    put(connectedLegacyVpn.key, connectedLegacyVpn);
-                }},
-                /* lockdownVpnKey */ null);
-        updater.run();
-
-        final ArgumentMatcher<VpnProfile> equalsFake = new ArgumentMatcher<VpnProfile>() {
-            @Override
-            public boolean matchesObject(final Object arg) {
-                if (arg == vpnProfile) return true;
-                if (arg == null) return false;
-                return TextUtils.equals(((VpnProfile) arg).key, vpnProfile.key);
-            }
-        };
-
-        // The VPN profile should have been used to create a preference and set up at laest once
-        // with update=true to fill in all the fields.
-        verify(mSettings, atLeast(1)).findOrCreatePreference(argThat(equalsFake), eq(true));
-
-        // ...But no other VPN profile key should ever have been passed in.
-        verify(mSettings, never()).findOrCreatePreference(not(argThat(equalsFake)), anyBoolean());
-
-        // And so we should still have exactly 1 preference created.
-        assertEquals(1, mLegacyMocks.size());
-        assertEquals(0, mAppMocks.size());
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java b/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
deleted file mode 100644
index 79eccc4a87ae6d760c8fff6795556f5e3197609b..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(AndroidJUnit4.class)
-public class SavedNetworkSettingsTest {
-
-    // Keys used to lookup resources by name (see the resourceId helper method).
-    private static final String STRING = "string";
-    private static final String WIFI_ADD_NETWORK = "wifi_add_network";
-    private static final String WIFI_NETWORK_LABEL = "wifi_ssid";
-
-    private Context mContext;
-
-    @Rule
-    public ActivityTestRule<Settings.SavedAccessPointsSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(Settings.SavedAccessPointsSettingsActivity.class, true);
-
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    private void launchSavedNetworksSettings() {
-        Intent intent = new Intent()
-                .setClassName(mContext.getPackageName(),
-                        Settings.SavedAccessPointsSettingsActivity.class.getName())
-                .setPackage(mContext.getPackageName());
-        mActivityRule.launchActivity(intent);
-    }
-
-    @Test
-    public void launchSavedNetworkSettings_shouldHaveAddNetworkField() {
-        launchSavedNetworksSettings();
-        onView(withText(resourceId(STRING, WIFI_ADD_NETWORK))).check(matches(isDisplayed()))
-                .perform(click());
-        onView(withText(resourceId(STRING, WIFI_NETWORK_LABEL))).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
deleted file mode 100644
index cbd9546c2293df27ca42b040d8c249e0eff25b68..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiSsid;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings.WifiSettingsActivity;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.TestAccessPointBuilder;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTracker.WifiListener;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import com.google.common.collect.Lists;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiSettingsUiTest {
-    private static final String TEST_SSID = "\"Test Ssid\"";
-    private static final String TEST_UNQUOTED_SSID = "Test Ssid";
-    private static final String TEST_BSSID = "0a:08:5c:67:89:00";
-    private static final int TEST_RSSI = 123;
-    private static final int TEST_NETWORK_ID = 1;
-
-    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String ID = "id";
-    private static final String STRING = "string";
-    private static final String WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE =
-            "wifi_configure_settings_preference_title";
-    private static final String WIFI_SAVED_ACCESS_POINTS_LABEL = "wifi_saved_access_points_label";
-    private static final String WIFI_EMPTY_LIST_WIFI_OFF = "wifi_empty_list_wifi_off";
-    private static final String WIFI_DISPLAY_STATUS_CONNECTED = "wifi_display_status_connected";
-    private static final String WIFI_PASSWORD = "wifi_password";
-    private static final String WIFI_SHOW_PASSWORD = "wifi_show_password";
-    private static final String PASSWORD_LAYOUT = "password_layout";
-    private static final String PASSWORD = "password";
-
-    @Mock
-    private WifiTracker mWifiTracker;
-    @Mock
-    private WifiManager mWifiManager;
-    private Context mContext;
-    private WifiListener mWifiListener;
-
-    @Rule
-    public ActivityTestRule<WifiSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(WifiSettingsActivity.class, true);
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = InstrumentationRegistry.getTargetContext();
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
-        when(mWifiTracker.getManager()).thenReturn(mWifiManager);
-    }
-
-    /**
-     * Helper to get around the problem that directly accessing settings resource id's from
-     * com.android.settings.R via R.(type).(name) (eg R.id.password or
-     * R.string.wifi_configure_settings_preference_title) may not work due to mismatched resource
-     * ids. See b/37714546 and b/63546650.
-     */
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
-    private String resourceString(String name) {
-        return mContext.getResources().getString(resourceId(STRING, name));
-    }
-
-    private void setupConnectedAccessPoint() {
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        WifiInfo wifiInfo = new WifiInfo();
-        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_UNQUOTED_SSID));
-        wifiInfo.setBSSID(TEST_BSSID);
-        wifiInfo.setRssi(TEST_RSSI);
-        wifiInfo.setNetworkId(TEST_NETWORK_ID);
-        NetworkInfo networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0, null, null);
-        networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);
-        AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, networkInfo);
-
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.getNetworkInfo()).isNotNull();
-        assertThat(accessPoint.isActive()).isTrue();
-        assertThat(accessPoint.getSettingsSummary()).isEqualTo(
-                resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(
-                Lists.asList(accessPoint, new AccessPoint[]{}));
-    }
-
-    /** Launch the activity via an Intent with a String extra. */
-    private void launchActivity(String extraName, String extraValue) {
-        Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
-        if (extraName != null && extraValue != null) {
-            intent.putExtra(extraName, extraValue);
-        }
-        mActivityRule.launchActivity(intent);
-
-        verify(mWifiTracker).getManager();
-
-        List<Fragment> fragments = mActivityRule.getActivity().getFragmentManager().getFragments();
-        assertThat(fragments.size()).isEqualTo(1);
-        mWifiListener = (WifiSettings) fragments.get(0);
-        assertThat(mWifiListener).isNotNull();
-    }
-
-    /** Helper to launch the activity with no extra. */
-    private void launchActivity() {
-        launchActivity(null, null);
-    }
-
-    private void setWifiState(int wifiState) {
-        when(mWifiManager.getWifiState()).thenReturn(wifiState);
-        when(mWifiManager.isWifiEnabled()).thenReturn(wifiState == WifiManager.WIFI_STATE_ENABLED);
-    }
-
-    private void callOnWifiStateChanged(int state) {
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiListener.onWifiStateChanged(state));
-    }
-
-    @Test
-    public void launchActivityShouldSucceed() {
-        launchActivity();
-    }
-
-    @Test
-    public void shouldShowWifiPreferences() {
-        launchActivity();
-
-        onView(withText(resourceId(STRING, WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void noSavedNetworks_wifiEnabled_shouldNotShowSavedNetworksButton() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
-
-        launchActivity();
-
-        onView(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL))).check(
-                matches(not(isDisplayed())));
-    }
-
-    @Test
-    public void noSavedNetworks_wifiDisabled_shouldNotShowSavedNetworksButton() {
-        setWifiState(WifiManager.WIFI_STATE_DISABLED);
-        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
-
-        launchActivity();
-
-        onView(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL))).check(
-                doesNotExist());
-    }
-
-    @Test
-    public void savedNetworksExist_shouldShowSavedNetworksButton() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        when(mWifiTracker.getNumSavedNetworks()).thenReturn(1);
-
-        launchActivity();
-
-        onView(allOf(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL)),
-                withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void onDisableWifi_seeOffMessage() {
-        setWifiState(WifiManager.WIFI_STATE_DISABLED);
-
-        launchActivity();
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_DISABLED);
-
-        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void onEnableWifi_shouldNotSeeOffMessage() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-
-        launchActivity();
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
-                doesNotExist());
-    }
-
-    @Test
-    public void onConnected_shouldSeeConnectedMessage() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        setupConnectedAccessPoint();
-        when(mWifiTracker.isConnected()).thenReturn(true);
-
-        launchActivity();
-
-        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void resumingAp_shouldNotForceUpdateWhenExistingAPsAreListed() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        setupConnectedAccessPoint();
-        when(mWifiTracker.isConnected()).thenReturn(true);
-
-        launchActivity();
-
-        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
-                matches(isDisplayed()));
-        verify(mWifiTracker).forceUpdate();
-
-        Activity activity = mActivityRule.getActivity();
-        activity.finish();
-        getInstrumentation().waitForIdleSync();
-
-        getInstrumentation().callActivityOnStart(activity);
-        verify(mWifiTracker, atMost(1)).forceUpdate();
-    }
-
-    @Test
-    public void changingSecurityStateOnApShouldNotCauseMultipleListItems() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext)
-                .setSsid(TEST_SSID)
-                .setSecurity(AccessPoint.SECURITY_NONE)
-                .setRssi(TEST_RSSI);
-        AccessPoint open = builder.build();
-
-        builder.setSecurity(AccessPoint.SECURITY_EAP);
-        AccessPoint eap = builder.build();
-
-        builder.setSecurity(AccessPoint.SECURITY_WEP);
-        AccessPoint wep = builder.build();
-
-        // Return a different security state each time getAccessPoints is invoked
-        when(mWifiTracker.getAccessPoints())
-                .thenReturn(Lists.newArrayList(open))
-                .thenReturn(Lists.newArrayList(eap))
-                .thenReturn(Lists.newArrayList(wep));
-
-        launchActivity();
-
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-
-        mWifiListener.onAccessPointsChanged();
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-
-        mWifiListener.onAccessPointsChanged();
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void wrongPasswordSavedNetwork() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-
-        // Set up an AccessPoint that is disabled due to incorrect password.
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-
-        WifiConfiguration.NetworkSelectionStatus selectionStatus =
-                new WifiConfiguration.NetworkSelectionStatus();
-        selectionStatus.setNetworkSelectionDisableReason(
-                WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
-        selectionStatus.setNetworkSelectionStatus(
-                WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED);
-        config.setNetworkSelectionStatus(selectionStatus);
-
-        WifiInfo wifiInfo = new WifiInfo();
-        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_UNQUOTED_SSID));
-        wifiInfo.setBSSID(TEST_BSSID);
-        wifiInfo.setRssi(TEST_RSSI);
-        wifiInfo.setNetworkId(TEST_NETWORK_ID);
-        AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, null);
-
-        // Make sure we've set up our access point correctly.
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.isActive()).isFalse();
-        assertThat(accessPoint.getConfig()).isNotNull();
-        WifiConfiguration.NetworkSelectionStatus networkStatus =
-                accessPoint.getConfig().getNetworkSelectionStatus();
-        assertThat(networkStatus).isNotNull();
-        assertThat(networkStatus.isNetworkEnabled()).isFalse();
-        assertThat(networkStatus.getNetworkSelectionDisableReason()).isEqualTo(
-                WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(Lists.newArrayList(accessPoint));
-        launchActivity(WifiSettings.EXTRA_START_CONNECT_SSID, accessPoint.getSsidStr());
-
-        // Make sure that the password dialog is visible.
-        onView(withText(resourceId(STRING, WIFI_PASSWORD))).check(matches(isDisplayed()));
-        onView(withText(resourceId(STRING, WIFI_SHOW_PASSWORD))).check(matches(isDisplayed()));
-        onView(withId(resourceId(ID, PASSWORD_LAYOUT))).check(matches(isDisplayed()));
-        onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
deleted file mode 100644
index add988cc35457ec8c916ff6c9561aeb921179ac5..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.tether;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-
-import com.android.settings.Settings;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class WifiTetherSettingsTest {
-
-    private static final long TIMEOUT = 2000L;
-
-    private Instrumentation mInstrumentation;
-    private Intent mTetherActivityIntent;
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mDevice = UiDevice.getInstance(mInstrumentation);
-        mTetherActivityIntent = new Intent()
-                .setClassName(mInstrumentation.getTargetContext().getPackageName(),
-                        Settings.TetherSettingsActivity.class.getName())
-                .setPackage(mInstrumentation.getTargetContext().getPackageName());
-    }
-
-    @After
-    public void tearDown() {
-        mDevice.pressHome();
-    }
-
-    @Test
-    public void verifyPageIsDisabledByDefault() {
-        assertThat(WifiTetherSettings.isTetherSettingPageEnabled()).isFalse();
-    }
-
-    @Test
-    public void launchTetherSettings_shouldHaveAllFields() {
-        launchWifiTetherActivity();
-        onView(withText("Network name")).check(matches(isDisplayed()));
-        onView(withText("Password")).check(matches(isDisplayed()));
-        onView(withText("Select AP Band")).check(matches(isDisplayed()));
-    }
-
-    private void launchWifiTetherActivity() {
-        mInstrumentation.startActivitySync(mTetherActivityIntent);
-        onView(withText("Portable Wi‑Fi hotspot")).perform();
-        UiObject2 item = mDevice.wait(Until.findObject(By.text("Portable Wi‑Fi hotspot")), TIMEOUT);
-        item.click();
-    }
-}