merge in nyc-release history after reset to nyc-dev
diff --git a/Settings/res/values-ml-rIN/strings.xml b/Settings/res/values-ml-rIN/strings.xml
index 157699e..5b0c6bf 100644
--- a/Settings/res/values-ml-rIN/strings.xml
+++ b/Settings/res/values-ml-rIN/strings.xml
@@ -95,7 +95,7 @@
<string name="system_speech" msgid="8128688499687306982">"സംഭാഷണം"</string>
<string name="system_inputs" msgid="2413907183796651102">"ഇൻപുട്ടുകൾ"</string>
<string name="system_accessibility" msgid="6215431399759498005">"പ്രവേശനക്ഷമത"</string>
- <string name="system_developer_options" msgid="3237985523474863638">"ഡവലപ്പർ ഓപ്ഷനുകൾ"</string>
+ <string name="system_developer_options" msgid="3237985523474863638">"ഡെവലപ്പർ ഓപ്ഷനുകൾ"</string>
<string name="accessibility_none" msgid="3441648940134070004">"ഒന്നുമില്ല"</string>
<string name="system_diagnostic" msgid="7269638365915225701">"ഉപയോഗവും പ്രശ്നനിർണ്ണയവും"</string>
<string name="about_system_update" msgid="7282772247661356586">"സിസ്റ്റം അപ്ഡേറ്റ്"</string>
diff --git a/Settings/res/values-pa-rIN/strings.xml b/Settings/res/values-pa-rIN/strings.xml
index 469c39e..ee69b49 100644
--- a/Settings/res/values-pa-rIN/strings.xml
+++ b/Settings/res/values-pa-rIN/strings.xml
@@ -72,8 +72,7 @@
<skip />
<!-- no translation found for wifi_setting_enable_wifi (9214100840401870408) -->
<skip />
- <!-- no translation found for device_daydream (3354366974209179614) -->
- <skip />
+ <string name="device_daydream" msgid="3354366974209179614">"ਸਕ੍ਰੀਨ ਸੇਵਰ"</string>
<!-- no translation found for device_display (101455384386372747) -->
<skip />
<!-- no translation found for device_sound (9214182566287657481) -->
@@ -639,8 +638,7 @@
<skip />
<!-- no translation found for location_mode_title (6573195849329396150) -->
<skip />
- <!-- no translation found for location_category_recent_location_requests (3437903422445812245) -->
- <skip />
+ <string name="location_category_recent_location_requests" msgid="3437903422445812245">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
<!-- no translation found for location_no_recent_apps (4218851908476344030) -->
<skip />
<!-- no translation found for location_high_battery_use (576143332793626088) -->
@@ -651,8 +649,7 @@
<skip />
<!-- no translation found for location_status (3456414279428237558) -->
<skip />
- <!-- no translation found for location_services (5441085185119797200) -->
- <skip />
+ <string name="location_services" msgid="5441085185119797200">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
<!-- no translation found for on (6683600681314500652) -->
<skip />
<!-- no translation found for off (5264189545064767245) -->
@@ -901,12 +898,10 @@
<skip />
<!-- no translation found for security_unknown_sources_title (769762478057744545) -->
<skip />
- <!-- no translation found for security_unknown_sources_desc (7197053279914817124) -->
- <skip />
+ <string name="security_unknown_sources_desc" msgid="7197053279914817124">"Play ਸਟੋਰ ਤੋਂ ਇਲਾਵਾ ਹੋਰ ਸਰੋਤਾਂ ਤੋਂ ਐਪਾਂ ਦੀ ਸਥਾਪਨਾ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
<!-- no translation found for security_unknown_sources_confirm_title (1249752174105198821) -->
<skip />
- <!-- no translation found for security_unknown_sources_confirm_desc (7167350583097191925) -->
- <skip />
+ <string name="security_unknown_sources_confirm_desc" msgid="7167350583097191925">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਸਰੋਤਾਂ ਤੋਂ ਲਈਆਂ ਐਪਾਂ ਵੱਲੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਕਮਜ਼ੋਰ ਹੈ। ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਅਤੇ ਡੈਟੇ ਦੇ ਨਸ਼ਟ ਹੋਣ ਲਈ ਕੇਵਲ ਖੁਦ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਸਿੱਟੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
<!-- no translation found for security_verify_apps_title (5787946958632254988) -->
<skip />
<!-- no translation found for security_verify_apps_desc (1456317893117818733) -->
@@ -1152,8 +1147,7 @@
<skip />
<!-- no translation found for device_daydreams_none (2767107052779579259) -->
<skip />
- <!-- no translation found for device_daydreams_select (2112338101206187695) -->
- <skip />
+ <string name="device_daydreams_select" msgid="2112338101206187695">"ਸਕ੍ਰੀਨ ਸੇਵਰ"</string>
<!-- no translation found for device_daydreams_test (9038920213402659591) -->
<skip />
<!-- no translation found for device_daydreams_sleep (7676938708373592766) -->
diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectToWifiFragment.java b/Settings/src/com/android/tv/settings/connectivity/ConnectToWifiFragment.java
index e48ea8c..0fbc8de 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectToWifiFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectToWifiFragment.java
@@ -234,6 +234,9 @@
@Override
public void onConnectivityChange() {
if (DEBUG) Log.d(TAG, "Connectivity changed");
+ if (!isResumed()) {
+ return;
+ }
if (isNetworkConnected()) {
mConnected = true;
notifyListener(RESULT_SUCCESS);
