Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index ab4004a..22bb8a6 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi on during sleep"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"Connect to operator networks"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"Connect to operator networks when available"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Improve efficiency"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi optimisation"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fa63549..634c3d5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi on during sleep"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"Connect to operator networks"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"Connect to operator networks when available"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Improve efficiency"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi optimisation"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index fa63549..634c3d5 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi on during sleep"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"Connect to operator networks"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"Connect to operator networks when available"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Improve efficiency"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi optimisation"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0154cf3..85cd4d3 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activé pendant la veille"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"Connex. au rés. du f. de serv."</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"Connex. au rés. du f. de serv. si possible"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Améliorer l\'efficacité"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimisation du Wi-Fi"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiser la consommation de la batterie lorsque le Wi-Fi est activé"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 630a842..e54f518 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान वाई-फ़ाई चालू रखें"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"निष्क्रिय रहने पर वाई-फ़ाई चालू"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"सेटिंग बदलने में एक समस्या थी"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"ऑपरेटर नेटवर्क से कनेक्ट करें"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"उपलब्ध होने पर, ऑपरेटर नेटवर्क से कनेक्ट करें"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"कार्यक्षमता सुधारें"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"वाई-फ़ाई ऑप्टिमाइज़ेशन"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"वाई-फ़ाई के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 820de97..6ce51ab 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi nyala saat mode tidur"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktif saat mode tidur"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah setelan"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"Sambungkan ke jaringan operator"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"Sambungkan ke jaringan operator jika tersedia"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Tingkatkan efisiensi"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pengoptimalan Wi-Fi"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalkan penggunaan baterai saat Wi-Fi aktif"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dae86ed..3feb2da 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"スリープ時にWi-Fi接続を維持"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"スリープ時にWi-Fi接続を維持"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"設定の変更中に問題が発生しました"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"携帯通信会社のネットワークに接続する"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"利用可能な場合は携帯通信会社のネットワークに接続する"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"効率を上げる"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi最適化"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-FiがONのときに電池使用を節約する"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index cc0da4e..482856c 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Идэвхгүй үед Wi-Fi-г байлгах"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi унтах үед"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Тохиргоог өөрчлөхөд асуудал гарлаа"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"Оператор сүлжээнд холбогдох"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"Боломжтой оператор сүлжээнд холбогд"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Үр ашгийг дээшлүүлэх"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi оновчлол"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi асаалттай үед зайны цэнэг зарцуулалтыг багасгах"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 7868556..c731dd8 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -1088,8 +1088,8 @@
<string name="sd_format" product="default" msgid="2576054280507119870">"SD कार्ड मिटवा"</string>
<string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"अंतर्गत USB संचयनावरील सर्व डेटा मिटवते, जसे की संगीत आणि फोटो"</string>
<string name="sd_format_summary" product="default" msgid="212703692181793109">"SD कार्डवरील सर्व डेटा मिटवते, जसे की संगीत आणि फोटो"</string>
- <string name="memory_clear_cache_title" msgid="5423840272171286191">"कॅशे केलेला डेटा साफ करायचा?"</string>
- <string name="memory_clear_cache_message" msgid="4550262490807415948">"हे सर्व अॅप्ससाठी कॅशे केलेला डेटा साफ करेल."</string>
+ <string name="memory_clear_cache_title" msgid="5423840272171286191">"कॅश केलेला डेटा साफ करायचा?"</string>
+ <string name="memory_clear_cache_message" msgid="4550262490807415948">"हे सर्व अॅप्ससाठी कॅश केलेला डेटा साफ करेल."</string>
<string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP किंवा TP कार्य सक्रिय आहे"</string>
<string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB संचयन अनमाउंट करायचे?"</string>
<string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD कार्ड अनमाउंट करायचे?"</string>
@@ -1447,9 +1447,9 @@
<string name="auto_launch_label_generic" msgid="3230569852551968694">"डीफॉल्ट"</string>
<string name="screen_compatibility_label" msgid="663250687205465394">"स्क्रीन सुसंगतता"</string>
<string name="permissions_label" msgid="2605296874922726203">"परवानग्या"</string>
- <string name="cache_header_label" msgid="1877197634162461830">"कॅशे"</string>
- <string name="clear_cache_btn_text" msgid="5756314834291116325">"कॅशे साफ करा"</string>
- <string name="cache_size_label" msgid="7505481393108282913">"कॅशे"</string>
+ <string name="cache_header_label" msgid="1877197634162461830">"कॅश"</string>
+ <string name="clear_cache_btn_text" msgid="5756314834291116325">"कॅश साफ करा"</string>
+ <string name="cache_size_label" msgid="7505481393108282913">"कॅश"</string>
<plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
<item quantity="one">%d आयटम</item>
<item quantity="other">%d आयटम</item>
@@ -1481,7 +1481,7 @@
<string name="sort_order_alpha" msgid="1410278099123670628">"नावानुसार क्रमवारी लावा"</string>
<string name="sort_order_size" msgid="7024513286636502362">"आकारानुसार क्रमवारी लावा"</string>
<string name="show_running_services" msgid="5736278767975544570">"चालू सेवा दर्शवा"</string>
- <string name="show_background_processes" msgid="2009840211972293429">"कॅशे केलेल्या प्रक्रिया दर्शवा"</string>
+ <string name="show_background_processes" msgid="2009840211972293429">"कॅश केलेल्या प्रक्रिया दर्शवा"</string>
<string name="default_emergency_app" msgid="1951760659640369980">"आणीबाणी अॅप"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"अॅप प्राधान्ये रीसेट करा"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"अॅप प्राधान्ये रीसेट करायचे?"</string>
@@ -1564,7 +1564,7 @@
<string name="storageuse_settings_title" msgid="5657014373502630403">"संचयन वापर"</string>
<string name="storageuse_settings_summary" msgid="3748286507165697834">"अॅप्सद्वारे वापरलेले संचयन पहा"</string>
<string name="service_restarting" msgid="2242747937372354306">"रीस्टार्ट करत आहे"</string>
- <string name="cached" msgid="1059590879740175019">"पार्श्वभूमी प्रक्रिया कॅशे केली"</string>
+ <string name="cached" msgid="1059590879740175019">"पार्श्वभूमी प्रक्रिया कॅश केली"</string>
<string name="no_running_services" msgid="2059536495597645347">"काहीही चालत नाही."</string>
<string name="service_started_by_app" msgid="818675099014723551">"अॅप द्वारे प्रारंभ केला."</string>
<!-- no translation found for service_client_name (4037193625611815517) -->
@@ -1586,7 +1586,7 @@
<string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"अॅप्स"</string>
<string name="running_processes_header_free_prefix" msgid="4620613031737078415">"मोकळी"</string>
<string name="running_processes_header_used_prefix" msgid="5924288703085123978">"वापरलेली"</string>
- <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"कॅशे केलेले"</string>
+ <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"कॅश केलेले"</string>
<string name="running_processes_header_ram" msgid="996092388884426817">"RAM चे <xliff:g id="RAM_0">%1$s</xliff:g>"</string>
<string name="runningservicedetails_settings_title" msgid="3224004818524731568">"चालू अॅप"</string>
<string name="no_services" msgid="7133900764462288263">"सक्रिय नाहीत"</string>
@@ -1937,12 +1937,12 @@
<string name="process_stats_total_duration_percentage" msgid="6522457033380025618">"<xliff:g id="TIMEDURATION">%2$s</xliff:g> पासून <xliff:g id="PERCENT">%1$s</xliff:g> रॅम वापरली"</string>
<string name="process_stats_type_background" msgid="3934992858120683459">"पार्श्वभूमी"</string>
<string name="process_stats_type_foreground" msgid="7713118254089580536">"पुरोभाग"</string>
- <string name="process_stats_type_cached" msgid="6314925846944806511">"कॅशे केलेले"</string>
+ <string name="process_stats_type_cached" msgid="6314925846944806511">"कॅश केलेले"</string>
<string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
<string name="process_stats_os_native" msgid="5322428494231768472">"मूळ"</string>
<string name="process_stats_os_kernel" msgid="1938523592369780924">"कर्नेल"</string>
<string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
- <string name="process_stats_os_cache" msgid="6432533624875078233">"कॅशे"</string>
+ <string name="process_stats_os_cache" msgid="6432533624875078233">"कॅश"</string>
<string name="process_stats_ram_use" msgid="976912589127397307">"RAM वापर"</string>
<string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM वापर (पार्श्वभूमी)"</string>
<string name="process_stats_run_time" msgid="6520628955709369115">"चालण्याचा कालावधी"</string>
@@ -1954,7 +1954,7 @@
<string name="mem_use_subtitle" msgid="7319468770222422412">"मेमरी वापर"</string>
<string name="mem_use_kernel_type" msgid="8698327165935012484">"कर्नेल"</string>
<string name="mem_use_native_type" msgid="5976704902328347400">"मूळ"</string>
- <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"कर्नेल कॅशे"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"कर्नेल कॅश"</string>
<string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam स्वॅप"</string>
<string name="mem_use_free_type" msgid="717708548454880840">"मोकळी"</string>
<string name="mem_use_total" msgid="6308786055749777934">"एकूण"</string>
@@ -2186,9 +2186,9 @@
<string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"सिम कार्ड"</string>
<string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"सेल्युलर नेटवर्क"</string>
<string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"मर्यादेवर विराम दिला"</string>
- <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"डेटा स्वयं-सिंक करा"</string>
- <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"वैयक्तिक डेटा स्वयं-सिंक करा"</string>
- <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"कार्य डेटा स्वयं-सिंक करा"</string>
+ <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"डेटा स्वयं-संकालित करा"</string>
+ <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"वैयक्तिक डेटा स्वयं-संकालित करा"</string>
+ <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"कार्य डेटा स्वयं-संकालित करा"</string>
<string name="data_usage_change_cycle" msgid="7776556448920114866">"आवर्तन बदला…"</string>
<string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"डेटा वापर चक्र रीसेट करण्यासाठी महिन्याचा दिवस:"</string>
<string name="data_usage_empty" msgid="8621855507876539282">"या कालावधी दरम्यान कोणत्याही अॅप्स नी डेटा वापरला नाही."</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index bada978f..754df2a 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"නිද්රාව අතරතුර Wi-Fi සක්රියව තබන්න"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"නිද්රාව අතරතුර Wi-Fi ක්රියාත්මකයි"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"සැකසුම් වෙනස් කිරීමේදී ගැටලුවක් ඇතිවිය"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"මෙහෙයුම් ජාලවලට සම්බන්ධ වන්න"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"ඇති විට මෙහෙයුම් ජාලවලට සබඳි."</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"කාර්යක්ෂමතාව දියුණු කරන්න"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi ප්රශස්තකරණය"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi සක්රිය විට බැටරි භාවිතය අවම කරන්න"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0e5d004..5c55442 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"เปิด Wi-Fi ระหว่างอยู่ในโหมดสลีป"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"เชื่อมต่อเครือข่ายผู้ให้บริการ"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"เชื่อมต่อเครือข่ายผู้ให้บริการเมื่อพร้อมใช้งาน"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"ปรับปรุงประสิทธิภาพ"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"การเพิ่มประสิทธิภาพ WiFi"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ลดการใช้แบตเตอรี่เมื่อ WiFi เปิดอยู่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a96f076..20c19bf 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Naka-on ang Wi-Fi sa sleep"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Nagkaproblema sa pagbabago ng setting"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"Kumonekta sa mga operator network"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"Kumonekta sa mga operator network kapag available"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Pagbutihin ang kahusayan"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pag-optimize ng Wi-Fi"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Bawasan ang paggamit ng baterya kapag naka-on ang Wi-Fi"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8a1d4c2..a8cc76d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"在休眠状态下保持WLAN网络连接"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"在休眠状态下保持WLAN连接"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"连接到运营商网络"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"连接到运营商网络（可用时）"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"提高能效"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WLAN优化"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"开启WLAN时尽可能节约电池用量"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 65543c2..98e10d8 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠時繼續連接 Wi-Fi 網絡"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"休眠狀態仍保持 Wi-Fi 連線"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"連線至行動通訊業者網路"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"有可用行動通訊業者網路時連上網路"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"提升效能"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 優化"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時盡量節約用電"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 02573b5..ac7ebdc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -679,10 +679,8 @@
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠狀態仍保持 Wi-Fi 連線"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"休眠時仍保持 Wi-Fi 連線"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
- <!-- no translation found for wifi_connect_carrier_networks (8126250792185749891) -->
- <skip />
- <!-- no translation found for wifi_connect_carrier_networks_summary (4812773364191051399) -->
- <skip />
+ <string name="wifi_connect_carrier_networks" msgid="8126250792185749891">"連線至行動通訊業者網路"</string>
+ <string name="wifi_connect_carrier_networks_summary" msgid="4812773364191051399">"有可用行動通訊業者網路時連上網路"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"提升效能"</string>
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 最佳化"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時儘可能節約電池用量"</string>
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
index 8bab2cf..4dedb98 100644
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -16,10 +16,14 @@
package com.android.settings;
+import android.app.Activity;
+import android.content.BroadcastReceiver;
import android.os.Bundle;
import android.support.v14.preference.PreferenceFragment;
import com.android.internal.logging.MetricsLogger;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SurveyFeatureProvider;
/**
* Instrumented fragment that logs visibility state.
@@ -39,6 +43,7 @@
* {@link com.android.settings.InstrumentedFragment}.
*/
protected abstract int getMetricsCategory();
+ private BroadcastReceiver mReceiver;
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -48,10 +53,36 @@
public void onResume() {
super.onResume();
MetricsLogger.visible(getActivity(), getMetricsCategory());
+
+ Activity activity = getActivity();
+ // guard against the activity not existing yet or the feature being disabled
+ if (activity != null) {
+ SurveyFeatureProvider provider =
+ FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity);
+ if (provider != null) {
+ // Try to download a survey if there is none available, show the survey otherwise
+ String id = provider.getSurveyId(activity, getClass().getSimpleName());
+ if (provider.getSurveyExpirationDate(activity, id) <= -1) {
+ // register the receiver to show the survey on completion.
+ mReceiver = provider.createAndRegisterReceiver(activity);
+ provider.downloadSurvey(activity, id, "fakeData");
+ } else {
+ provider.showSurveyIfAvailable(activity, id);
+ }
+ }
+ }
}
@Override
public void onPause() {
+ Activity activity = getActivity();
+ if (mReceiver != null && activity != null) {
+ SurveyFeatureProvider provider =
+ FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity);
+ provider.unregisterReceiver(activity, mReceiver);
+ mReceiver = null;
+ }
+
super.onPause();
MetricsLogger.hidden(getActivity(), getMetricsCategory());
}
diff --git a/src/com/android/settings/InstrumentedPreferenceFragment.java b/src/com/android/settings/InstrumentedPreferenceFragment.java
index 243e0bc..1b3d5cd 100644
--- a/src/com/android/settings/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/InstrumentedPreferenceFragment.java
@@ -16,9 +16,13 @@
package com.android.settings;
+import android.app.Activity;
+import android.content.BroadcastReceiver;
import android.support.v14.preference.PreferenceFragment;
import com.android.internal.logging.MetricsLogger;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SurveyFeatureProvider;
/**
* Instrumented preference fragment that logs visibility state.
@@ -32,15 +36,42 @@
* {@link com.android.settings.InstrumentedFragment}.
*/
protected abstract int getMetricsCategory();
+ private BroadcastReceiver mReceiver;
@Override
public void onResume() {
super.onResume();
MetricsLogger.visible(getActivity(), getMetricsCategory());
+
+ Activity activity = getActivity();
+ // guard against the activity not existing yet or the feature being disabled
+ if (activity != null) {
+ SurveyFeatureProvider provider =
+ FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity);
+ if (provider != null) {
+ // Try to download a survey if there is none available, show the survey otherwise
+ String id = provider.getSurveyId(activity, getClass().getSimpleName());
+ if (provider.getSurveyExpirationDate(activity, id) <= -1) {
+ // register the receiver to show the survey on completion.
+ mReceiver = provider.createAndRegisterReceiver(activity);
+ provider.downloadSurvey(activity, id, null /* data */);
+ } else {
+ provider.showSurveyIfAvailable(activity, id);
+ }
+ }
+ }
}
@Override
public void onPause() {
+ Activity activity = getActivity();
+ if (mReceiver != null && activity != null) {
+ SurveyFeatureProvider provider =
+ FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity);
+ provider.unregisterReceiver(activity, mReceiver);
+ mReceiver = null;
+ }
+
super.onPause();
MetricsLogger.hidden(getActivity(), getMetricsCategory());
}
diff --git a/src/com/android/settings/overlay/SurveyFeatureProvider.java b/src/com/android/settings/overlay/SurveyFeatureProvider.java
index 79e907f..907bed8 100644
--- a/src/com/android/settings/overlay/SurveyFeatureProvider.java
+++ b/src/com/android/settings/overlay/SurveyFeatureProvider.java
@@ -40,16 +40,46 @@
*
* @param activity The host activity to show the survey in.
* @param surveyId A unique Id representing a survey to download.
+ * @return A boolean indicating if a survey was shown or not.
*/
- void showSurveyIfAvailable(Activity activity, String surveyId);
+ boolean showSurveyIfAvailable(Activity activity, String surveyId);
/**
* A helper method to get the surveyId. Implementers should create a mapping of
* keys to surveyIds and provide them via this function.
*
* @param context A valid context.
- * @param key The key to get the surveyId for.
+ * @param simpleKey The simple name of the key to get the surveyId for.
* @return The unique Id as a string or null on error.
*/
- String getSurveyId(Context context, String key);
+ String getSurveyId(Context context, String simpleKey);
+
+ /**
+ * Removes the survey for {@code siteId} if it expired, then returns the expiration date (as a
+ * unix timestamp) for the remaining survey should it exist and be ready to show. Returns -1 if
+ * no valid survey exists after removing the potentially expired one.
+ *
+ * @param context the calling context.
+ * @param surveyId the site ID.
+ * @return the unix timestamp for the available survey for the given {@coe siteId} or -1 if
+ * there is none available.
+ */
+ long getSurveyExpirationDate(Context context, String surveyId);
+
+ /**
+ * Registers an activity to show surveys/prompts as soon as they are downloaded. The receiver
+ * should be unregistered prior to destroying the activity to avoid undefined behavior by
+ * calling {@link #unregisterReceiver(Activity, BroadcastReceiver)}.
+ * @param activity The activity that should show surveys once they are downloaded.
+ * @return the broadcast receiver listening for survey downloads. Must be unregistered before
+ * leaving the activity.
+ */
+ BroadcastReceiver createAndRegisterReceiver(Activity activity);
+
+ /**
+ * Unregisters the broadcast receiver for this activity. Should only be called once per activity
+ * after a call to {@link #createAndRegisterReceiver(Activity)}.
+ * @param activity The activity that was used to register the BroadcastReceiver.
+ */
+ void unregisterReceiver(Activity activity, BroadcastReceiver receiver);
}