Snap for 5876498 from 3df43a3eae to qt-qpr1-release

Change-Id: I5be8312de9e3e7c3ef26fa72d534b5b9801f7cfc

res/values-eu/strings.xml

@@ -871,7 +871,7 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ez dago erabilgarri, Wifi-sareen bilaketa desaktibatuta dagoelako"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Erabiltzeko, hautatu sareen balorazioen hornitzaile bat"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Saihestu konexio ahulak"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"Ez erabili Wi-Fi sareak ez badute Interneteko konexio onik"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"Ez erabili wifi-sareak ez badute Interneteko konexio onik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"Erabili Interneteko konexio ona duten sareak soilik"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Konektatu sare irekietara"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Konektatu automatikoki kalitate handiko sare publikoetara"</string>

res/values-gl/strings.xml

@@ -3361,8 +3361,8 @@
     <string name="smart_notifications_title" msgid="3702411478231865970">"Notificacións automáticas"</string>
     <string name="asst_capability_prioritizer_title" msgid="3854208223528908688">"Prioridade das notificacións automáticas"</string>
     <string name="asst_capability_prioritizer_summary" msgid="7553129095829077229">"Define automaticamente como discretas as notificacións con prioridade baixa"</string>
-    <string name="asst_capabilities_actions_replies_title" msgid="8621608733904251499">"Suxestións de accións e respostas"</string>
+    <string name="asst_capabilities_actions_replies_title" msgid="8621608733904251499">"Accións suxeridas e respostas"</string>
-    <string name="asst_capabilities_actions_replies_summary" msgid="2367828721274129806">"Mostra automaticamente suxestións de accións e respostas"</string>
+    <string name="asst_capabilities_actions_replies_summary" msgid="2367828721274129806">"Mostra automaticamente accións suxeridas e respostas"</string>
     <string name="snooze_options_title" msgid="7447722951050463793">"Permitir adiar notificacións"</string>
     <string name="hide_silent_icons_title" msgid="3803036978493857276">"Ocultar iconas das notificacións discretas"</string>
     <string name="hide_silent_icons_summary" msgid="8422819235336628802">"As iconas das notificacións discretas non se mostran na barra de estado"</string>

res/values-in/strings.xml

@@ -572,7 +572,7 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Pilih metode kunci layar cadangan"</string>
-    <string name="lock_settings_picker_face_message" msgid="197106534637556054">"Pilih metode kunci layar backup"</string>
+    <string name="lock_settings_picker_face_message" msgid="197106534637556054">"Pilih metode kunci layar cadangan"</string>
     <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opsi kunci layar"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opsi kunci layar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci layar"</string>
@@ -603,7 +603,7 @@
     <string name="face_unlock_set_unlock_pin" msgid="1359249613033276716">"Face unlock + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="7135335310498158870">"Face unlock + Sandi"</string>
     <string name="face_unlock_skip_face" msgid="3481956557015165094">"Lanjutkan tanpa face unlock"</string>
-    <string name="face_unlock_title" msgid="9042382084472444316">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar backup."</string>
+    <string name="face_unlock_title" msgid="9042382084472444316">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Dinonaktifkan oleh admin, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Geser"</string>
@@ -1528,7 +1528,7 @@
     <string name="storage_wizard_init_v2_external_action" msgid="8662451480642784031">"Penyimpanan portabel"</string>
     <string name="storage_wizard_init_v2_later" msgid="1080613420170749130">"Siapkan nanti"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="5744790239994621663">"Format <xliff:g id="NAME">^1</xliff:g> ini?"</string>
-    <string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"<xliff:g id="NAME_0">^1</xliff:g> perlu diformat untuk menyimpan aplikasi, file, dan media. \n\nMemformat akan menghapus konten yang ada di <xliff:g id="NAME_1">^2</xliff:g>. Agar konten tidak hilang, backup ke <xliff:g id="NAME_2">^3</xliff:g> atau perangkat lain."</string>
+    <string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"<xliff:g id="NAME_0">^1</xliff:g> perlu diformat untuk menyimpan aplikasi, file, dan media. \n\nMemformat akan menghapus konten yang ada di <xliff:g id="NAME_1">^2</xliff:g>. Agar konten tidak hilang, cadangkan ke <xliff:g id="NAME_2">^3</xliff:g> atau perangkat lain."</string>
     <string name="storage_wizard_format_confirm_v2_action" msgid="8258363472135537500">"Format <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="31406330052996898">"Pindahkan konten ke <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4476553430145054781">"Anda dapat memindahkan file, media, dan aplikasi tertentu ke <xliff:g id="NAME">^1</xliff:g> ini. \n\nPemindahan ini akan mengosongkan <xliff:g id="SIZE">^2</xliff:g> dari penyimpanan tablet dan memerlukan waktu sekitar <xliff:g id="DURATION">^3</xliff:g>."</string>
@@ -2603,12 +2603,12 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Cadangkan data saya"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Mencadangkan data aplikasi, sandi Wi-Fi, dan setelan lainnya ke server Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun backup"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun cadangan"</string>
-    <string name="backup_data_management_title" msgid="4059093462647090064">"Kelola akun backup"</string>
+    <string name="backup_data_management_title" msgid="4059093462647090064">"Kelola akun cadangan"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sertakan data aplikasi"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Pulihkan backup setelan dan data saat menginstal ulang aplikasi"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Pulihkan cadangan setelan dan data saat menginstal ulang aplikasi"</string>
-    <string name="backup_inactive_title" msgid="685838037986644604">"Layanan backup tidak aktif"</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"Layanan pencadangan tidak aktif"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Berhenti mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data aplikasi, serta menghapus semua salinan di server Google?"</string>
@@ -3103,7 +3103,7 @@
     <string name="account_dashboard_title" msgid="5895948991491438911">"Akun"</string>
     <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Tidak ada akun yang ditambahkan"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplikasi default"</string>
-    <string name="system_dashboard_summary" msgid="6839969589170062254">"Bahasa, gestur, waktu, backup"</string>
+    <string name="system_dashboard_summary" msgid="6839969589170062254">"Bahasa, gestur, waktu, pencadangan"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setelan"</string>
     <string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, sambungan jaringan, internet, nirkabel, data, wi fi"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="8745178424405564885">"Notifikasi Wi‑Fi, notifikasi wi‑fi"</string>

res/values-pl/strings.xml

@@ -2110,14 +2110,14 @@
     <string name="usage_time_label" msgid="295954901452833058">"Czas użycia"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Ułatwienia dostępu"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki, wyświetlacz, sterowanie interakcjami"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki, wyświetlacz, zarządzanie interakcjami"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Dla niedowidzących"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Możesz dostosować urządzenie do swoich potrzeb. Ułatwienia dostępu możesz zawsze zmienić w Ustawieniach."</string>
     <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Zmień rozmiar czcionki"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Czytniki ekranu"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Dźwięk i tekst na ekranie"</string>
     <string name="display_category_title" msgid="685461049938269166">"Wyświetlacz"</string>
-    <string name="interaction_control_category_title" msgid="7836591031872839151">"Sterowanie interakcjami"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"Zarządzanie interakcjami"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Pobrane usługi"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Eksperymentalne"</string>
     <string name="feature_flags_dashboard_title" msgid="778619522682769966">"Flagi funkcji"</string>

src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java

@@ -47,10 +47,10 @@ public class FaceSettingsLockscreenBypassPreferenceController
 
     @Override
     public boolean isChecked() {
-        boolean defaultValue = mContext.getResources().getBoolean(
+        int defaultValue = mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_faceAuthDismissesKeyguard);
+                com.android.internal.R.bool.config_faceAuthDismissesKeyguard) ? 1 : 0;
-        return Settings.Secure.getInt(mContext.getContentResolver(),
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue ? 1 : 0) != 0;
+                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue, getUserId()) != 0;
     }
 
     @Override
@@ -81,7 +81,8 @@ public class FaceSettingsLockscreenBypassPreferenceController
         }
 
         if (mFaceManager != null && mFaceManager.isHardwareDetected()) {
-            return mFaceManager.hasEnrolledTemplates() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+            return mFaceManager.hasEnrolledTemplates(getUserId())
+                    ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
         } else {
             return UNSUPPORTED_ON_DEVICE;
         }

src/com/android/settings/wifi/NetworkRequestDialogFragment.java

@@ -340,6 +340,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
         // Throws error dialog.
         final NetworkRequestErrorDialogFragment fragment = NetworkRequestErrorDialogFragment
                 .newInstance();
+        fragment.setRejectCallback(mUserSelectionCallback);
         final Bundle bundle = new Bundle();
         bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE, type);
         fragment.setArguments(bundle);

src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java

@@ -20,8 +20,10 @@ import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
@@ -36,6 +38,8 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen
     public static final String DIALOG_TYPE = "DIALOG_ERROR_TYPE";
 
     public enum ERROR_DIALOG_TYPE {TIME_OUT, ABORT}
+    @Nullable
+    private NetworkRequestUserSelectionCallback mRejectCallback;
 
     public static NetworkRequestErrorDialogFragment newInstance() {
         return new NetworkRequestErrorDialogFragment();
@@ -49,7 +53,7 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen
     public void onCancel(@NonNull DialogInterface dialog) {
         super.onCancel(dialog);
         // Wants to finish the activity when user clicks back key or outside of the dialog.
-        getActivity().finish();
+        rejectNetworkRequestAndFinish();
     }
 
     @Override
@@ -65,10 +69,12 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen
             builder.setMessage(R.string.network_connection_timeout_dialog_message)
                     .setPositiveButton(R.string.network_connection_timeout_dialog_ok,
                             (dialog, which) -> startScanningDialog())
-                    .setNegativeButton(R.string.cancel, (dialog, which) -> getActivity().finish());
+                    .setNegativeButton(R.string.cancel,
+                            (dialog, which) -> rejectNetworkRequestAndFinish());
         } else {
             builder.setMessage(R.string.network_connection_errorstate_dialog_message)
-                    .setPositiveButton(R.string.okay, (dialog, which) -> getActivity().finish());
+                    .setPositiveButton(R.string.okay,
+                            (dialog, which) -> rejectNetworkRequestAndFinish());
         }
         return builder.create();
     }
@@ -78,9 +84,23 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen
         return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;
     }
 
+    // Sets the callback for fragment to reject this request.
+    public void setRejectCallback(NetworkRequestUserSelectionCallback rejectCallback) {
+        mRejectCallback = rejectCallback;
+    }
+
     protected void startScanningDialog() {
         final NetworkRequestDialogFragment fragment = NetworkRequestDialogFragment.newInstance();
         fragment.show(getActivity().getSupportFragmentManager(),
                 NetworkRequestErrorDialogFragment.class.getSimpleName());
     }
+
+    private void rejectNetworkRequestAndFinish() {
+        if (getActivity() != null) {
+            if (mRejectCallback != null) {
+                mRejectCallback.reject();
+            }
+            getActivity().finish();
+        }
+    }
 }

src/com/android/settings/wifi/WifiConfigController.java

@@ -987,7 +987,9 @@ public class WifiConfigController implements TextWatcher,
         }
         mView.findViewById(R.id.eap).setVisibility(View.VISIBLE);
 
+        boolean initiateEnterpriseNetworkUi = false;
         if (mEapMethodSpinner == null) {
+            initiateEnterpriseNetworkUi = true;
             mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
             mEapMethodSpinner.setOnItemSelectedListener(this);
             mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
@@ -1045,7 +1047,7 @@ public class WifiConfigController implements TextWatcher,
         }
 
         // Modifying an existing network
-        if (mAccessPoint != null && mAccessPoint.isSaved()) {
+        if (initiateEnterpriseNetworkUi && mAccessPoint != null && mAccessPoint.isSaved()) {
             final WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
             final int eapMethod = enterpriseConfig.getEapMethod();
             final int phase2Method = enterpriseConfig.getPhase2Method();

tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java

@@ -18,11 +18,13 @@ package com.android.settings.wifi;
 
 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.internal.verification.VerificationModeFactory.times;
 
 import android.content.DialogInterface;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
 import android.widget.Button;
 
@@ -32,6 +34,8 @@ import androidx.fragment.app.FragmentActivity;
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
+import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiTrackerFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,12 +51,17 @@ public class NetworkRequestErrorDialogFragmentTest {
 
     private FragmentActivity mActivity;
     private NetworkRequestErrorDialogFragment mFragment;
+    private WifiTracker mWifiTracker;
 
     @Before
     public void setUp() {
         mActivity = Robolectric.setupActivity(FragmentActivity.class);
         mFragment = spy(NetworkRequestErrorDialogFragment.newInstance());
         mFragment.show(mActivity.getSupportFragmentManager(), null);
+
+        // Prevents NPE when calling up NetworkRequestDialogFragment.
+        mWifiTracker = mock(WifiTracker.class);
+        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
     }
 
     @Test
@@ -111,4 +120,17 @@ public class NetworkRequestErrorDialogFragmentTest {
         negativeButton.performClick();
         assertThat(alertDialog.isShowing()).isFalse();
     }
+
+    @Test
+    public void clickNegativeButton_shouldCallReject() {
+        final NetworkRequestUserSelectionCallback rejectCallback =
+                mock(NetworkRequestUserSelectionCallback.class);
+        mFragment.setRejectCallback(rejectCallback);
+
+        final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        final Button negativeButton = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        negativeButton.performClick();
+
+        verify(rejectCallback, times(1)).reject();
+    }
 }

tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java

@@ -28,6 +28,8 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiEnterpriseConfig;
+import android.net.wifi.WifiEnterpriseConfig.Eap;
 import android.net.wifi.WifiManager;
 import android.os.ServiceSpecificException;
 import android.security.KeyStore;
@@ -469,4 +471,22 @@ public class WifiConfigControllerTest {
         final int selectedItemPosition = eapMethodSpinner.getSelectedItemPosition();
         assertThat(eapMethodSpinner.getSelectedItem().toString()).isEqualTo("TLS");
     }
+
+    @Test
+    public void selectEapMethod_savedAccessPoint_shouldGetCorrectPosition() {
+        when(mAccessPoint.isSaved()).thenReturn(true);
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        when(mockWifiEnterpriseConfig.getEapMethod()).thenReturn(Eap.PEAP);
+        mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig ;
+        when(mAccessPoint.getConfig()).thenReturn(mockWifiConfig);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_MODIFY);
+        final Spinner eapMethodSpinner = mView.findViewById(R.id.method);
+
+        eapMethodSpinner.setSelection(Eap.TLS);
+
+        assertThat(eapMethodSpinner.getSelectedItemPosition()).isEqualTo(Eap.TLS);
+    }
 }