Merge "Add logs for tracking Slice provider startup" into sc-dev
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dc11f3d..05fa1de 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1431,7 +1431,7 @@
<string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar siempre información y hora"</string>
<string name="doze_always_on_summary" msgid="509097829739647852">"Aumenta el uso de la batería"</string>
<string name="force_bold_text" msgid="4620929631102086716">"Texto en negrita"</string>
- <string name="title_font_size" msgid="570613010306330622">"Tamaño de la fuente"</string>
+ <string name="title_font_size" msgid="570613010306330622">"Tamaño de fuente"</string>
<string name="short_summary_font_size" msgid="184712645848458143">"Aumenta o disminuye el tamaño del texto"</string>
<string name="sim_lock_settings" msgid="4493069398250139205">"Ajustes de bloqueo de tarjeta SIM"</string>
<string name="sim_lock_settings_category" msgid="4280307997492851625">"Bloqueo de tarjeta SIM"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fb1e083..2d8305c 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -2266,7 +2266,7 @@
<string name="accessibility_settings" msgid="4713215774904704682">"Erabilerraztasuna"</string>
<string name="accessibility_settings_title" msgid="6739115703615065716">"Erabilerraztasun-ezarpenak"</string>
<string name="accessibility_settings_summary" msgid="2366627644570558503">"Bistaratzea, interakzioak, audioa"</string>
- <string name="vision_settings_title" msgid="8919983801864103069">"Ikusmen-ezarpenak"</string>
+ <string name="vision_settings_title" msgid="8919983801864103069">"Ikusmen-ezarpenak"</string>
<string name="vision_settings_description" msgid="7614894785054441991">"Doitu gailua zure beharretara. Ezarpenak atalean alda ditzakezu Erabilerraztasun-eginbideak."</string>
<string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Aldatu letra-tamaina"</string>
<string name="screen_reader_category_title" msgid="5825700839731107803">"Pantaila-irakurgailua"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d254963..51e4455 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -156,7 +156,7 @@
<string name="connected_device_previously_connected_title" msgid="605808252622814415">"Dispositivi connessi in precedenza"</string>
<string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"Connessi in precedenza"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"Bluetooth attivato"</string>
- <string name="previous_connected_see_all" msgid="7759413145713251328">"Mostra tutti"</string>
+ <string name="previous_connected_see_all" msgid="7759413145713251328">"Mostra tutte"</string>
<string name="date_and_time" msgid="1788358029823431692">"Data e ora"</string>
<string name="choose_timezone" msgid="1450780665958642147">"Scegli il fuso orario"</string>
<!-- no translation found for intent_sender_data_label (1733806423295725392) -->
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index a75fb0f..b3d1048 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -24,6 +24,7 @@
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.Bundle;
import android.util.Log;
+import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
@@ -35,7 +36,9 @@
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.biometrics.BiometricUtils;
+import com.android.settings.biometrics.MultiBiometricEnrollHelper;
import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.SetupSkipDialog;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -89,6 +92,32 @@
footerTitle2.setText(getFooterTitle2());
}
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ // If user has skipped or finished enrolling, don't restart enrollment.
+ final boolean isEnrollRequest = requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
+ || requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST;
+ final boolean isResultSkipOrFinished = resultCode == RESULT_SKIP
+ || resultCode == SetupSkipDialog.RESULT_SKIP || resultCode == RESULT_FINISHED;
+ if (isEnrollRequest && isResultSkipOrFinished) {
+ data = setSkipPendingEnroll(data);
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
+ @Override
+ protected void onCancelButtonClick(View view) {
+ // User has explicitly canceled enroll. Don't restart it automatically.
+ Intent data = setSkipPendingEnroll(new Intent());
+ setResult(RESULT_SKIP, data);
+ finish();
+ }
+
+ @Override
+ protected void onSkipButtonClick(View view) {
+ onCancelButtonClick(view);
+ }
+
@StringRes
int getNegativeButtonTextId() {
return R.string.security_settings_fingerprint_enroll_introduction_no_thanks;
@@ -282,4 +311,13 @@
protected int getMoreButtonTextRes() {
return R.string.security_settings_face_enroll_introduction_more;
}
+
+ @NonNull
+ protected static Intent setSkipPendingEnroll(@Nullable Intent data) {
+ if (data == null) {
+ data = new Intent();
+ }
+ data.putExtra(MultiBiometricEnrollHelper.EXTRA_SKIP_PENDING_ENROLL, true);
+ return data;
+ }
}
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
index 63faf5e..7d8d12e 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -29,7 +29,6 @@
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricUtils;
-import com.android.settings.biometrics.MultiBiometricEnrollHelper;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.SetupChooseLockGeneric;
import com.android.settings.password.SetupSkipDialog;
@@ -85,16 +84,6 @@
data = setFingerprintCount(data);
}
}
-
- // If user has skipped or finished enrolling, don't restart enrollment.
- final boolean isEnrollRequest = requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
- || requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST;
- final boolean isResultSkipOrFinished = resultCode == RESULT_SKIP
- || resultCode == SetupSkipDialog.RESULT_SKIP || resultCode == RESULT_FINISHED;
- if (isEnrollRequest && isResultSkipOrFinished) {
- data = setSkipPendingEnroll(data);
- }
-
super.onActivityResult(requestCode, resultCode, data);
}
@@ -122,14 +111,6 @@
return data;
}
- private Intent setSkipPendingEnroll(Intent data) {
- if (data == null) {
- data = new Intent();
- }
- data.putExtra(MultiBiometricEnrollHelper.EXTRA_SKIP_PENDING_ENROLL, true);
- return data;
- }
-
@Override
protected void onCancelButtonClick(View view) {
final int resultCode;
@@ -151,11 +132,6 @@
finish();
}
- @Override
- protected void onSkipButtonClick(View view) {
- onCancelButtonClick(view);
- }
-
/**
* Propagate lock screen metrics if the user goes back from the fingerprint setup screen
* after having added lock screen to his device.