Snap for 5726890 from 44f731c1c7 to qt-c2f2-release

Change-Id: I537bb914cdeac1f821619ad7c954f77aca69bf67

res/values-eu/strings.xml

@@ -1960,7 +1960,7 @@
     <string name="service_manage" msgid="1876642087421959194">"Ezarpenak"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"Zerbitzua bere aplikazioak hasi du. Gelditzen baduzu, agian aplikazioak huts egingo du."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"Ezin da aplikazioa modu seguruan gelditu. Geldituz gero, uneko lan batzuk gal ditzakezu."</string>
-    <string name="background_process_stop_description" msgid="3834163804031287685">"Aplikazio-prozesu zaharra da hau, baina geroago behar bada erabiltzeko ari da exekutatzen. Normalean ez dago hori gelditzeko arrazoirik."</string>
+    <string name="background_process_stop_description" msgid="3834163804031287685">"Aplikazio-prozesu hau zaharra da, baina abian da oraindik ere, badaezpada berriro behar bada. Normalean ez dago hura gelditzeko arrazoirik."</string>
     <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: beste norbait ari da erabiltzen. Zuk kontrolatzeko, saka ezazu Ezarpenak."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Abian den prozesu nagusia."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> zerbitzua abian da."</string>
@@ -2348,7 +2348,7 @@
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="1040488674178753191">
       <item quantity="other">Aplikazio hauek ezin dira exekutatu atzeko planoan</item>
-      <item quantity="one">Aplikazio hau ezin da exekutatu atzeko planoan</item>
+      <item quantity="one">Aplikazio hau ezin da abiarazi atzeko planoan</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="8130618585820429591">
       <item quantity="other">%1$d aplikazio mugatu nahi dituzu?</item>
@@ -2420,7 +2420,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"PUZaren aurreko planoa"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantendu aktibo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fia exekutatzen"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wifiaren erabilera"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tableta"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefonoa"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"Bidalitako pakete mugikorrak"</string>
@@ -3460,9 +3460,9 @@
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Desaktibatu"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Utzi"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Errealitate birtualeko laguntza-zerbitzuak"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"Ez dago errealitate birtualeko laguntza-zerbitzu gisa exekutatzea eskatu duen aplikaziorik instalatuta."</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"Ez dago errealitate birtualeko laguntza-zerbitzu gisa abiaraztea eskatu duen aplikaziorik instalatuta."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari errealitate birtualeko zerbitzuak atzitzeko baimena eman nahi diozu?"</string>
-    <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"Aplikazioak errealitate birtualean erabiltzen dituzunean exekutatu ahal izango da  <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>."</string>
+    <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"Aplikazioak errealitate birtualean erabiltzen dituzunean abiarazi ahal izango da  <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>."</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Errealitate birtualeko moduan"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Murriztu lausotzea (gomendatua)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Murriztu distira"</string>
@@ -3766,9 +3766,9 @@
     <string name="usage_access_description" msgid="1352111094596416795">"Erabilera-datuek zer beste aplikazio eta zer maiztasunekin erabiltzen dituzun jakiteko baimena ematen die aplikazioei, baita zer operadore duzun, zer hizkuntza-ezarpen dituzun eta beste xehetasun batzuk ere."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memoria"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Memoriaren xehetasunak"</string>
-    <string name="always_running" msgid="6042448320077429656">"Beti ari da exekutatzen (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="always_running" msgid="6042448320077429656">"Beti dago abian (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="sometimes_running" msgid="6611250683037700864">"Noizbehinka exekutatzen da (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="sometimes_running" msgid="6611250683037700864">"Noizbehinka abiarazten da (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="rarely_running" msgid="348413460168817458">"Ez da ia inoiz exekutatzen (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="rarely_running" msgid="348413460168817458">"Ez da ia inoiz abiarazten (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="memory_max_use" msgid="6874803757715963097">"Gehienekoa"</string>
     <string name="memory_avg_use" msgid="7382015389130622870">"Batez besteko erabilera"</string>
     <string name="memory_max_desc" msgid="2861832149718335864">"Gehienekoa: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
@@ -3792,8 +3792,8 @@
     <string name="high_power_off" msgid="3393904131961263278">"Bateria optimizatu egiten da"</string>
     <string name="high_power_system" msgid="7362862974428225301">"Bateria-optimizazioa ez dago erabilgarri"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Ez aplikatu bateria-optimizazioa. Aukera horrekin, bizkorrago agortuko da bateria."</string>
-    <string name="high_power_prompt_title" msgid="6358673688590282655">"Beti atzeko planoan exekutatzeko baimena eman nahi diozu aplikazioari?"</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"Beti atzeko planoan abiarazteko baimena eman nahi diozu aplikazioari?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioari atzeko planoan beti exekutatzeko baimena emanez gero, baliteke bateriak gutxiago irautea. \n\nAukera hori aldatzeko, sakatu Ezarpenak &gt; Aplikazioak eta jakinarazpenak."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioari atzeko planoan beti abiarazteko baimena emanez gero, baliteke bateriak gutxiago irautea. \n\nAukera hori aldatzeko, sakatu Ezarpenak &gt; Aplikazioak eta jakinarazpenak."</string>
     <string name="battery_summary" msgid="8044042095190688654">"Bateriaren <xliff:g id="PERCENTAGE">%1$s</xliff:g> erabili du bateria guztiz kargatu zenetik"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Bateriaren kudeaketa"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Ez du bateriarik erabili bateria guztiz kargatu zenetik"</string>

src/com/android/settings/MasterClear.java

@@ -182,8 +182,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
     void showFinalConfirmation() {
         final Bundle args = new Bundle();
         args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
-        args.putBoolean(ERASE_ESIMS_EXTRA,
+        args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
-            mEsimStorageContainer.getVisibility() == View.VISIBLE && mEsimStorage.isChecked());
         new SubSettingLauncher(getContext())
                 .setDestination(MasterClearConfirm.class.getName())
                 .setArguments(args)

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

@@ -25,7 +25,7 @@ import androidx.preference.Preference;
 
 public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {
 
-    public static final String KEY_FACE_SETTINGS = "face_settings_profile";
+    private static final String KEY_FACE_SETTINGS = "face_settings_profile";
 
     public FaceProfileStatusPreferenceController(Context context) {
         super(context, KEY_FACE_SETTINGS);

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

@@ -26,7 +26,7 @@ import com.android.settings.biometrics.BiometricStatusPreferenceController;
 
 public class FaceStatusPreferenceController extends BiometricStatusPreferenceController {
 
-    private static final String KEY_FACE_SETTINGS = "face_settings";
+    public static final String KEY_FACE_SETTINGS = "face_settings";
 
     protected final FaceManager mFaceManager;
 

src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java

@@ -20,10 +20,13 @@ import android.content.Context;
 import android.os.storage.StorageManager;
 import android.text.format.Formatter;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.text.NumberFormat;
 
@@ -44,14 +47,22 @@ public class TopLevelStoragePreferenceController extends BasePreferenceControlle
     }
 
     @Override
-    public CharSequence getSummary() {
+    protected void refreshSummary(Preference preference) {
-        // TODO: Register listener.
+        if (preference == null) {
-        final NumberFormat percentageFormat = NumberFormat.getPercentInstance();
+            return;
-        final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
+        }
-                mStorageManagerVolumeProvider);
+
-        double privateUsedBytes = info.totalBytes - info.freeBytes;
+        ThreadUtils.postOnBackgroundThread(() -> {
-        return mContext.getString(R.string.storage_summary,
+            final NumberFormat percentageFormat = NumberFormat.getPercentInstance();
-                percentageFormat.format(privateUsedBytes / info.totalBytes),
+            final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
-                Formatter.formatFileSize(mContext, info.freeBytes));
+                    mStorageManagerVolumeProvider);
+            final double privateUsedBytes = info.totalBytes - info.freeBytes;
+
+            ThreadUtils.postOnMainThread(() -> {
+                preference.setSummary(mContext.getString(R.string.storage_summary,
+                        percentageFormat.format(privateUsedBytes / info.totalBytes),
+                        Formatter.formatFileSize(mContext, info.freeBytes)));
+            });
+        });
     }
 }

src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java

@@ -25,7 +25,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.hardware.biometrics.BiometricManager;
+import android.hardware.face.FaceManager;
 import android.net.Uri;
+import android.os.UserHandle;
 
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
@@ -36,7 +38,7 @@ import androidx.slice.builders.SliceAction;
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
-import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController;
+import com.android.settings.biometrics.face.FaceStatusPreferenceController;
 import com.android.settings.security.SecuritySettings;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.CustomSliceable;
@@ -52,13 +54,8 @@ public class FaceSetupSlice implements CustomSliceable {
 
     @Override
     public Slice getSlice() {
-        final BiometricManager biometricManager = mContext.getSystemService(BiometricManager.class);
+        final FaceManager faceManager = mContext.getSystemService(FaceManager.class);
-        final PackageManager packageManager = mContext.getPackageManager();
+        if (faceManager == null || faceManager.hasEnrolledTemplates(UserHandle.myUserId())) {
-        if (!packageManager.hasSystemFeature(PackageManager.FEATURE_FACE)) {
-            // no face hardware
-            return null;
-        } else if (biometricManager.canAuthenticate() == BIOMETRIC_SUCCESS) {
-            // face hardware, and already enrolled
             return null;
         }
 
@@ -84,7 +81,7 @@ public class FaceSetupSlice implements CustomSliceable {
     public Intent getIntent() {
         return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
                 SecuritySettings.class.getName(),
-                FaceProfileStatusPreferenceController.KEY_FACE_SETTINGS,
+                FaceStatusPreferenceController.KEY_FACE_SETTINGS,
                 mContext.getText(R.string.security_settings_face_settings_enroll).toString(),
                 SettingsEnums.SLICE)
                 .setClassName(mContext.getPackageName(), SubSettings.class.getName());

tests/robotests/src/com/android/settings/MasterClearTest.java

@@ -163,7 +163,7 @@ public class MasterClearTest {
         verify(context).startActivity(intent.capture());
         assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
             .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
-            .isFalse();
+            .isTrue();
     }
 
     @Test

tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java

@@ -16,19 +16,15 @@
 
 package com.android.settings.homepage.contextualcards.slices;
 
-import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_NO_BIOMETRICS;
+import static org.mockito.Mockito.mock;
-import static android.hardware.biometrics.BiometricManager.BIOMETRIC_SUCCESS;
-
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
-import android.content.pm.PackageManager;
+import android.hardware.face.FaceManager;
-import android.hardware.biometrics.BiometricConstants;
+import android.os.UserHandle;
-import android.hardware.biometrics.BiometricManager;
 
 import androidx.slice.Slice;
 import androidx.slice.SliceProvider;
@@ -46,43 +42,36 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class FaceSetupSliceTest {
 
-    private BiometricManager mBiometricManager;
     private Context mContext;
-    private PackageManager mPackageManager;
 
     @Before
     public void setUp() {
         // Set-up specs for SliceMetadata.
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
         mContext = spy(RuntimeEnvironment.application);
-        mPackageManager = spy(mContext.getPackageManager());
-        mBiometricManager = spy(mContext.getSystemService(BiometricManager.class));
     }
 
     @Test
-    public void getSlice_noFaceSupported_shouldReturnNull() {
+    public void getSlice_noFaceManager_shouldReturnNull() {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(false);
+        when(mContext.getSystemService(FaceManager.class)).thenReturn(null);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
         final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
         assertThat(setupSlice.getSlice()).isNull();
     }
 
     @Test
-    public void getSlice_faceSupportedUserEnrolled_shouldReturnNull() {
+    public void getSlice_faceEnrolled_shouldReturnNull() {
-        when(mBiometricManager.canAuthenticate()).thenReturn(BIOMETRIC_SUCCESS);
+        final FaceManager faceManager = mock(FaceManager.class);
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
+        when(mContext.getSystemService(FaceManager.class)).thenReturn(faceManager);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(true);
-        when(mContext.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
         final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
         assertThat(setupSlice.getSlice()).isNull();
     }
 
     @Test
-    public void getSlice_faceSupportedUserNotEnrolled_shouldReturnNonNull() {
+    public void getSlice_faceNotEnrolled_shouldReturnNonNull() {
-        when(mBiometricManager.canAuthenticate()).thenReturn(BIOMETRIC_ERROR_NO_BIOMETRICS);
+        final FaceManager faceManager = mock(FaceManager.class);
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
+        when(mContext.getSystemService(FaceManager.class)).thenReturn(faceManager);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(false);
-        when(mContext.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
         final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
         assertThat(setupSlice.getSlice()).isNotNull();
     }