Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 2800133..94a7211 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -761,9 +761,9 @@
<string name="no_internet_access_remember" msgid="4697314331614625075">"Bu şəbəkə üçün daha soruşma"</string>
<string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi İnternetə qoşulmayıb"</string>
<string name="lost_internet_access_text" msgid="1676124057345106398">"Wi‑Fi bağlantısı keyfiyyətsiz olanda mobil internetə keçə bilərsiniz. Mobil internet əlavə xərclərə səbəb ola bilər."</string>
- <string name="lost_internet_access_switch" msgid="1980357004205108781">"Mobil internetə keçid edin"</string>
+ <string name="lost_internet_access_switch" msgid="1980357004205108781">"Mobil internetə keçin"</string>
<string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi‑Fi şəbəkəsində qalın"</string>
- <string name="lost_internet_access_persist" msgid="7634876061262676255">"Heç vaxt yenidən göstərməyin"</string>
+ <string name="lost_internet_access_persist" msgid="7634876061262676255">"Daha göstərməyin"</string>
<string name="wifi_connect" msgid="1076622875777072845">"Qoşul"</string>
<string name="wifi_failed_connect_message" msgid="8491902558970292871">"Şəbəkəyə qoşulmaq alınmadı"</string>
<string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9077d88..287007f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1049,7 +1049,7 @@
<string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
<string name="status_unavailable" msgid="7862009036663793314">"Utilgængelig"</string>
<string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
- <string name="status_awake_time" msgid="2393949909051183652">"Opvågningstid"</string>
+ <string name="status_awake_time" msgid="2393949909051183652">"Aktivtid"</string>
<string name="internal_memory" msgid="9129595691484260784">"Intern lagerplads"</string>
<string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lager"</string>
<string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
@@ -1840,7 +1840,7 @@
<string name="battery_stats_phone_signal_label" msgid="3537569115723850618">"Mobilnetværkssignal"</string>
<!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
<skip />
- <string name="awake" msgid="387122265874485088">"Enhedens opvågningstid"</string>
+ <string name="awake" msgid="387122265874485088">"Enhedens aktivtid"</string>
<string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi til tiden"</string>
<string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi til tiden"</string>
<string name="history_details_title" msgid="3608240585315506067">"Detaljeret historik"</string>
@@ -1861,7 +1861,7 @@
<string name="power_overcounted" msgid="2762354976171358445">"Overvurderet"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
- <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hold aktiv"</string>
+ <string name="usage_type_wake_lock" msgid="5125438890233677880">"Lås ikke"</string>
<string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi aktiv"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index bd739b5..25fff71 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -1445,7 +1445,7 @@
<item quantity="one">1 elementu</item>
</plurals>
<string name="clear_uri_btn_text" msgid="8575655132961012158">"Garbitu sarbidea"</string>
- <string name="controls_label" msgid="7611113077086853799">"Kontrolak"</string>
+ <string name="controls_label" msgid="7611113077086853799">"Kontrolatzeko aukerak"</string>
<string name="force_stop" msgid="7435006169872876756">"Behartu gelditzera"</string>
<string name="total_size_label" msgid="1048676419552557254">"Guztira"</string>
<string name="application_size_label" msgid="8494609207373874267">"Aplikazioa"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f6b7f1c..2d31505 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1330,7 +1330,7 @@
<string name="location_access_title" msgid="7064108942964081243">"Sijaintitietojen käyttö"</string>
<string name="location_access_summary" msgid="69031404093194341">"Anna pyytäneille sovelluksille lupa käyttää sijaintitietoja"</string>
<string name="location_sources_heading" msgid="1278732419851088319">"Sijainnin lähteet"</string>
- <string name="about_settings" product="tablet" msgid="593457295516533765">"Tietoja tablet-laitteesta"</string>
+ <string name="about_settings" product="tablet" msgid="593457295516533765">"Tietoja tabletista"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Tietoja puhelimesta"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Tietoja jäljitellystä laitteesta"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Näytä lakitiedot, tila, ohjelmiston versio"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index cbbd730..a60457c 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -1352,7 +1352,7 @@
<string name="settings_license_activity_loading" msgid="3337535809093591740">"લોડ કરી રહ્યું છે..."</string>
<string name="settings_safetylegal_title" msgid="1289483965535937431">"સલામતી માહિતી"</string>
<string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"સલામતી માહિતી"</string>
- <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"તમારી પાસે ડેટા કનેક્શન નથી. આ માહિતી હમણાં જોવા માટે, ઇન્ટરનેટથી કનેક્ટ થયેલા કોઈપણ કમ્પ્યુટરથી PRETTY_URL પર જાઓ."</string>
+ <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"તમારી પાસે ડેટા કનેક્શન નથી. આ માહિતી હમણાં જોવા માટે, ઇન્ટરનેટથી કનેક્ટ થયેલા કોઈપણ કમ્પ્યુટરથી %s પર જાઓ."</string>
<string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"લોડ કરી રહ્યું છે..."</string>
<string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"તમારો પાસવર્ડ પસંદ કરો"</string>
<string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"તમારી પેટર્ન પસંદ કરો"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 64e2c1d..169ba40 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -842,10 +842,10 @@
<string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Upotrebljavajte Wi-Fi umjesto mobilne mreže"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Postavka poziva"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način Wi-Fi poziva"</string>
- <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferencija za roaming"</string>
+ <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Željena postavka za roaming"</string>
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
- <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencija za roaming"</string>
+ <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Željena postavka za roaming"</string>
<string-array name="wifi_calling_mode_choices">
<item msgid="2124257075906188844">"Prednost ima Wi-Fi mreža"</item>
<item msgid="5267397515594230396">"Prednost ima mobilna mreža"</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index f2570c5..12d5696 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -678,7 +678,7 @@
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"បង្រួមការប្រើថ្មអប្បបរមាពេលបើកវ៉ាយហ្វាយ"</string>
<string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"កំណត់ថ្មដែលបានប្រើតាមវ៉ាយហ្វាយ"</string>
<string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"ប្តូរទៅទិន្នន័យចល័ត ប្រសិនបើបាត់បង់សេវា Wi‑Fi។"</string>
- <string name="wifi_cellular_data_fallback_title" msgid="8741291033791891668">"ប្តូរទៅទិន្នន័យចល័តដោយស្វ័យប្រវត្តិ"</string>
+ <string name="wifi_cellular_data_fallback_title" msgid="8741291033791891668">"ប្តូរទៅទិន្នន័យទូរសព្ទចល័តដោយស្វ័យប្រវត្តិ"</string>
<string name="wifi_cellular_data_fallback_summary" msgid="2641527693037426430">"ប្រើទិន្នន័យចល័តនៅពេលដែល Wi‑Fi លែងមានអ៊ីនធឺណិត។ ការប្រើប្រាស់ទិន្នន័យអាចត្រូវបានអនុវត្ត។"</string>
<string name="wifi_add_network" msgid="6234851776910938957">"បន្ថែមបណ្ដាញ"</string>
<string name="wifi_access_points" msgid="7053990007031968609">"បណ្ដាញវ៉ាយហ្វាយ"</string>
@@ -844,7 +844,7 @@
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wi-Fi"</item>
- <item msgid="122823150092396518">"សេវាទូរសព្ទចល័ត"</item>
+ <item msgid="122823150092396518">"ទូរសព្ទចល័ត"</item>
<item msgid="2838022395783120596">"Wi-Fi តែប៉ុណ្ណោះ"</item>
</string-array>
<string-array name="wifi_calling_mode_values">
@@ -858,7 +858,7 @@
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
- <item msgid="2749029835484916851">"សេវាទូរសព្ទចល័ត"</item>
+ <item msgid="2749029835484916851">"ទូរសព្ទចល័ត"</item>
</string-array>
<string-array name="wifi_calling_mode_values_without_wifi_only">
<item msgid="2339246858001475047">"2"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 998d7b7..4eb4af1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -641,7 +641,7 @@
<string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC inschakelen"</string>
<string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC wisselt gegevens uit tussen dit apparaat en andere apparaten of doelen in de buurt, zoals betaalterminals, toegangslezers en interactieve advertenties of tags."</string>
<string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
- <string name="android_beam_on_summary" msgid="3618057099355636830">"Gereed om app-inhoud te verzenden via NFC"</string>
+ <string name="android_beam_on_summary" msgid="3618057099355636830">"Gereed om app-content te verzenden via NFC"</string>
<string name="android_beam_off_summary" msgid="4663095428454779138">"Uit"</string>
<string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niet beschikbaar omdat NFC is uitgeschakeld"</string>
<string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -1094,7 +1094,7 @@
<string name="sd_ejecting_title" msgid="8824572198034365468">"Ontkoppelen"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Ontkoppelen wordt uitgevoerd"</string>
<string name="storage_low_title" msgid="1388569749716225155">"Opslagruimte is bijna vol"</string>
- <string name="storage_low_summary" msgid="7737465774892563129">"Bepaalde systeemfuncties, zoals synchronisatie, werken mogelijk niet correct. Probeer ruimte vrij te maken door items zoals apps of media-inhoud te verwijderen of los te maken."</string>
+ <string name="storage_low_summary" msgid="7737465774892563129">"Bepaalde systeemfuncties, zoals synchronisatie, werken mogelijk niet correct. Probeer ruimte vrij te maken door items zoals apps of media-content te verwijderen of los te maken."</string>
<string name="storage_menu_rename" msgid="7141058657592615390">"Naam wijzigen"</string>
<string name="storage_menu_mount" msgid="1014683672493425425">"Koppelen"</string>
<string name="storage_menu_unmount" msgid="681485356885955898">"Uitwerpen"</string>
@@ -2010,7 +2010,7 @@
<string name="credentials_unlock" msgid="385427939577366499"></string>
<string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer het wachtwoord voor certificaatopslag in."</string>
<string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
- <string name="credentials_reset_hint" msgid="6297256880896133631">"Alle inhoud verwijderen?"</string>
+ <string name="credentials_reset_hint" msgid="6297256880896133631">"Alle content verwijderen?"</string>
<string name="credentials_password_too_short" msgid="7502749986405522663">"Het wachtwoord moet uit ten minste 8 tekens bestaan."</string>
<string name="credentials_wrong_password" msgid="2541932597104054807">"Onjuist wachtwoord."</string>
<string name="credentials_reset_warning" msgid="5320653011511797600">"Onjuist wachtwoord. Je hebt nog één poging voordat de certificaten worden gewist."</string>
@@ -2349,8 +2349,8 @@
<string name="user_nickname" msgid="5148818000228994488">"Bijnaam"</string>
<string name="user_add_user_type_title" msgid="2146438670792322349">"Toevoegen"</string>
<string name="user_add_max_count" msgid="5405885348463433157">"Je kunt maximaal <xliff:g id="USER_COUNT">%1$d</xliff:g> gebruikers toevoegen"</string>
- <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gebruikers hebben hun eigen apps en inhoud"</string>
- <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Je kunt toegang tot apps en inhoud vanuit je account beperken"</string>
+ <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gebruikers hebben hun eigen apps en content"</string>
+ <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Je kunt toegang tot apps en content vanuit je account beperken"</string>
<string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
<string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkt profiel"</string>
<string name="user_add_user_title" msgid="2108112641783146007">"Nieuwe gebruiker toevoegen?"</string>
@@ -2395,7 +2395,7 @@
<string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefoonoproepen en sms inschakelen?"</string>
<string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"De oproep- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
<string name="emergency_info_title" msgid="208607506217060337">"Informatie bij nood"</string>
- <string name="application_restrictions" msgid="8207332020898004394">"Apps en inhoud toestaan"</string>
+ <string name="application_restrictions" msgid="8207332020898004394">"Apps en content toestaan"</string>
<string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps met beperkingen"</string>
<string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Inst. uitbreiden voor app"</string>
<string name="home_app_uninstall_button" msgid="6808453012607962899">"Deze app verwijderen"</string>
@@ -2425,7 +2425,7 @@
<string name="restriction_menu_change_pin" msgid="740081584044302775">"Pincode wijzigen"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Meldingen weergeven"</string>
<string name="help_label" msgid="6886837949306318591">"Help en feedback"</string>
- <string name="user_account_title" msgid="1127193807312271167">"Account voor inhoud"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Account voor content"</string>
<string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
<string name="extreme_threats_title" msgid="6549541803542968699">"Groot gevaar"</string>
<string name="extreme_threats_summary" msgid="8777860706500920667">"Meldingen over groot gevaar voor levens en eigendommen"</string>
@@ -2447,7 +2447,7 @@
<string name="preferred_network_type_title" msgid="3431041717309776341">"Voorkeursnetwerktype"</string>
<string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (aanbevolen)"</string>
<string name="work_sim_title" msgid="4843322164662606891">"Simkaart voor werk"</string>
- <string name="user_restrictions_title" msgid="5794473784343434273">"Toegang tot apps en inhoud"</string>
+ <string name="user_restrictions_title" msgid="5794473784343434273">"Toegang tot apps en content"</string>
<string name="user_rename" msgid="8523499513614655279">"NAAM WIJZIGEN"</string>
<string name="app_restrictions_custom_label" msgid="6160672982086584261">"App-beperkingen instellen"</string>
<string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Beheerd door <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -2609,13 +2609,13 @@
<string name="profile_section_header" msgid="2320848161066912001">"Werkmeldingen"</string>
<string name="notification_pulse_title" msgid="1247988024534030629">"Meldingslampje knippert"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op het vergrendelingsscherm"</string>
- <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Inhoud van alle meldingen weergeven"</string>
- <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Inhoud van gevoelige meldingen verbergen"</string>
+ <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Content van alle meldingen weergeven"</string>
+ <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Content van gevoelige meldingen verbergen"</string>
<string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Helemaal geen meldingen weergeven"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Hoe moeten meldingen worden weergegeven wanneer je apparaat is vergrendeld?"</string>
<string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Meldingen"</string>
- <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Inhoud van alle werkmeldingen weergeven"</string>
- <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Inhoud van gevoelige werkmeldingen verbergen"</string>
+ <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Content van alle werkmeldingen weergeven"</string>
+ <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Content van gevoelige werkmeldingen verbergen"</string>
<string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Helemaal geen werkmeldingen weergeven"</string>
<string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hoe moeten profielmeldingen worden weergegeven wanneer je apparaat is vergrendeld?"</string>
<string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profielmeldingen"</string>
@@ -2756,7 +2756,7 @@
<string name="managing_admin" msgid="8843802210377459055">"Beheerd door <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
<string name="experimental_preference" msgid="7083015446690681376">"(Experimenteel)"</string>
<string name="display_auto_rotate_title" msgid="6176450657107806043">"Wanneer het apparaat wordt gedraaid"</string>
- <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"De inhoud van het scherm draaien"</string>
+ <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"De content van het scherm draaien"</string>
<string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"In staande stand blijven"</string>
<string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"In liggende stand blijven"</string>
<string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"In huidige stand blijven"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index effb95f..8e9c29f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -330,7 +330,7 @@
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Amprentă"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestionați amprentele"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Folosiți amprenta la"</string>
- <string name="fingerprint_add_title" msgid="1926752654454033904">"Adăugați amprenta"</string>
+ <string name="fingerprint_add_title" msgid="1926752654454033904">"Adăugați o amprentă"</string>
<string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"blocarea ecranului"</string>
<plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
<item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> amprente configurate</item>
@@ -2008,7 +2008,7 @@
<string name="gadget_brightness_state_half" msgid="3696671957608774204">"pe jumătate"</string>
<string name="gadget_brightness_state_off" msgid="946382262872753084">"dezactivată"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
- <string name="credentials_title" msgid="4446234003860769883">"Stocarea acreditărilor"</string>
+ <string name="credentials_title" msgid="4446234003860769883">"Stocarea certificatelor"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalați de pe stocare"</string>
<string name="credentials_install" product="default" msgid="953914549998062317">"Instalați de pe cardul SD"</string>
<string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalați certificate de pe stocare"</string>
@@ -2632,8 +2632,8 @@
<string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos intermitent"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pe ecranul de blocare"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișați integral conținutul notificărilor"</string>
- <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascundeți conținutul sensibil din notificări"</string>
- <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Nu afișați nicio notificare"</string>
+ <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascunde conținutul sensibil din notificări"</string>
+ <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Nu afișa nicio notificare"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Când dispozitivul este blocat, cum doriți să se afișeze notificările?"</string>
<string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificări"</string>
<string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Afișați tot conținutul notificărilor de serviciu"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 14f1d2e..b13648e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -682,7 +682,7 @@
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Punguza matumizi ya betri wakati Wi-Fi imewashwa"</string>
<string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Dhibiti betri inayotumiwa na Wi-Fi"</string>
<string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Badili utumie data ya simu Wi-Fi ikipoteza ufikiaji kwa Intaneti."</string>
- <string name="wifi_cellular_data_fallback_title" msgid="8741291033791891668">"Badili hadi data ya simu za mkononi kiotomatiki"</string>
+ <string name="wifi_cellular_data_fallback_title" msgid="8741291033791891668">"Badili utumie data ya simu za mkononi kiotomatiki"</string>
<string name="wifi_cellular_data_fallback_summary" msgid="2641527693037426430">"Tumia data ya simu za mkononi wakati Wi-Fi haina muunganisho wa Intaneti. Huenda kukawa na matumizi ya data."</string>
<string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao"</string>
<string name="wifi_access_points" msgid="7053990007031968609">"Mitandao ya Wi-Fi"</string>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index cd3c5ee..d84b008 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -328,11 +328,6 @@
android:title="@string/strict_mode"
android:summary="@string/strict_mode_summary"/>
- <SwitchPreference
- android:key="show_cpu_usage"
- android:title="@string/show_cpu_usage"
- android:summary="@string/show_cpu_usage_summary"/>
-
<ListPreference
android:key="track_frame_time"
android:title="@string/track_frame_time"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 08eae1a..a77f7b1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -144,7 +144,6 @@
private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
private static final String USB_AUDIO_KEY = "usb_audio";
- private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
private static final String FORCE_MSAA_KEY = "force_msaa";
private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
@@ -274,7 +273,6 @@
private SwitchPreference mShowTouches;
private SwitchPreference mShowScreenUpdates;
private SwitchPreference mDisableOverlays;
- private SwitchPreference mShowCpuUsage;
private SwitchPreference mForceHardwareUi;
private SwitchPreference mForceMsaa;
private SwitchPreference mShowHwScreenUpdates;
@@ -423,7 +421,6 @@
mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY);
mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY);
mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY);
- mShowCpuUsage = findAndInitSwitchPref(SHOW_CPU_USAGE_KEY);
mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY);
mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY);
mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
@@ -696,7 +693,6 @@
updatePointerLocationOptions();
updateShowTouchesOptions();
updateFlingerOptions();
- updateCpuUsageOptions();
updateHardwareUiOptions();
updateMsaaOptions();
updateTrackFrameTimeOptions();
@@ -1719,25 +1715,6 @@
}
}
- private void updateCpuUsageOptions() {
- updateSwitchPreference(mShowCpuUsage,
- Settings.Global.getInt(getActivity().getContentResolver(),
- Settings.Global.SHOW_PROCESSES, 0) != 0);
- }
-
- private void writeCpuUsageOptions() {
- boolean value = mShowCpuUsage.isChecked();
- Settings.Global.putInt(getActivity().getContentResolver(),
- Settings.Global.SHOW_PROCESSES, value ? 1 : 0);
- Intent service = (new Intent())
- .setClassName("com.android.systemui", "com.android.systemui.LoadAverageService");
- if (value) {
- getActivity().startService(service);
- } else {
- getActivity().stopService(service);
- }
- }
-
private void writeImmediatelyDestroyActivitiesOptions() {
try {
ActivityManagerNative.getDefault().setAlwaysFinish(
@@ -2026,8 +2003,6 @@
writeShowUpdatesOption();
} else if (preference == mDisableOverlays) {
writeDisableOverlaysOption();
- } else if (preference == mShowCpuUsage) {
- writeCpuUsageOptions();
} else if (preference == mImmediatelyDestroyActivities) {
writeImmediatelyDestroyActivitiesOptions();
} else if (preference == mShowAllANRs) {