Snap for 9305793 from 1d04eb6eb720225e9df11c49724f9c21d132b46e to tm-qpr2-release (1a40a9e6) · Commits · e / os / android_packages_apps_Settings

res/values/config.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -634,9 +634,6 @@
		<item>android.uid.system:1000</item>
		</string-array>

		<!-- The default value for RedactionInterstitial in SUW -->
		<bool name="default_allow_sensitive_lockscreen_content">true</bool>

		<!-- Whether to enable the app battery usage list page feature. -->
		<bool name="config_app_battery_usage_list_enabled">false</bool>

src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -103,10 +103,9 @@ public class MultiBiometricEnrollHelper {
		0 /* requestCode */, faceIntent,
		PendingIntent.FLAG_IMMUTABLE \| PendingIntent.FLAG_UPDATE_CURRENT);
		intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp);

		}
		BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
		hardwareAuthToken, mGkPwHandle, mUserId);
		}
		}));
		}
		}

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,8 @@ import com.google.android.setupcompat.template.FooterBarMixin;
		import com.google.android.setupcompat.template.FooterButton;
		import com.google.android.setupcompat.util.WizardManagerHelper;
		import com.google.android.setupdesign.GlifLayout;
		import com.google.android.setupdesign.template.DescriptionMixin;
		import com.google.android.setupdesign.template.HeaderMixin;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -341,6 +343,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
		return true;
		});
		}

		final Configuration config = getApplicationContext().getResources().getConfiguration();
		maybeHideSfpsText(config);
		}

		@Override
		@@ -1040,6 +1045,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {

		@Override
		public void onConfigurationChanged(@NonNull Configuration newConfig) {
		maybeHideSfpsText(newConfig);
		switch(newConfig.orientation) {
		case Configuration.ORIENTATION_LANDSCAPE: {
		updateOrientation(Configuration.ORIENTATION_LANDSCAPE);
		@@ -1055,6 +1061,27 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
		}
		}

		private void maybeHideSfpsText(@NonNull Configuration newConfig) {
		final HeaderMixin headerMixin = getLayout().getMixin(HeaderMixin.class);
		final DescriptionMixin descriptionMixin = getLayout().getMixin(DescriptionMixin.class);
		final boolean isLandscape = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE;

		if (mCanAssumeSfps) {
		if (isLandscape) {
		headerMixin.setAutoTextSizeEnabled(true);
		headerMixin.getTextView().setMinLines(0);
		headerMixin.getTextView().setMaxLines(10);
		descriptionMixin.getTextView().setMinLines(0);
		descriptionMixin.getTextView().setMaxLines(10);
		} else {
		headerMixin.setAutoTextSizeEnabled(false);
		headerMixin.getTextView().setLines(4);
		// hide the description
		descriptionMixin.getTextView().setLines(0);
		}
		}
		}

		public static class IconTouchDialog extends InstrumentedDialogFragment {

		@Override

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import androidx.annotation.VisibleForTesting;
		import androidx.appcompat.app.AlertDialog;
		import androidx.preference.Preference;
		import androidx.preference.Preference.OnPreferenceChangeListener;
		import androidx.preference.PreferenceCategory;
		import androidx.preference.PreferenceGroup;
		import androidx.preference.PreferenceScreen;
		import androidx.preference.PreferenceViewHolder;
		@@ -158,6 +159,8 @@ public class FingerprintSettings extends SubSettings {
		private static final String KEY_IS_ENROLLING = "is_enrolled";
		private static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH =
		"security_settings_require_screen_on_to_auth";
		private static final String KEY_FINGERPRINT_UNLOCK_CATEGORY =
		"security_settings_fingerprint_unlock_category";

		private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
		private static final int MSG_FINGER_AUTH_SUCCESS = 1001;
		@@ -177,6 +180,7 @@ public class FingerprintSettings extends SubSettings {
		private FingerprintSettingsRequireScreenOnToAuthPreferenceController
		mRequireScreenOnToAuthPreferenceController;
		private RestrictedSwitchPreference mRequireScreenOnToAuthPreference;
		private PreferenceCategory mFingerprintUnlockCategory;

		private FingerprintManager mFingerprintManager;
		private FingerprintUpdater mFingerprintUpdater;
		@@ -493,6 +497,7 @@ public class FingerprintSettings extends SubSettings {
		addFingerprintItemPreferences(root);
		addPreferencesFromResource(getPreferenceScreenResId());
		mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH);
		mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY);
		for (AbstractPreferenceController controller : mControllers) {
		((FingerprintSettingsPreferenceController) controller).setUserId(mUserId);
		}
		@@ -504,7 +509,7 @@ public class FingerprintSettings extends SubSettings {
		mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked);
		return true;
		});
		mRequireScreenOnToAuthPreference.setVisible(false);
		mFingerprintUnlockCategory.setVisible(false);
		if (isSfps()) {
		setRequireScreenOnToAuthVisibility();
		}
		@@ -517,9 +522,9 @@ public class FingerprintSettings extends SubSettings {
		final boolean removalInProgress = mRemovalSidecar.inProgress();
		// Removing last remaining fingerprint
		if (fingerprintsEnrolled == 0 && removalInProgress) {
		mRequireScreenOnToAuthPreference.setVisible(false);
		mFingerprintUnlockCategory.setVisible(false);
		} else {
		mRequireScreenOnToAuthPreference.setVisible(true);
		mFingerprintUnlockCategory.setVisible(true);
		}
		}

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import com.android.settings.SetupWizardUtils;
		import com.google.android.setupcompat.template.FooterBarMixin;
		import com.google.android.setupcompat.template.FooterButton;
		import com.google.android.setupdesign.GlifLayout;
		import com.google.android.setupdesign.template.HeaderMixin;
		import com.google.android.setupdesign.util.ThemeHelper;
		import com.google.android.setupdesign.util.ThemeResolver;

		@@ -167,7 +168,9 @@ public abstract class StorageWizardBase extends FragmentActivity {

		protected void setHeaderText(int resId, CharSequence... args) {
		final CharSequence headerText = TextUtils.expandTemplate(getText(resId), args);
		getGlifLayout().setHeaderText(headerText);
		final GlifLayout layout = getGlifLayout();
		layout.setHeaderText(headerText);
		layout.getMixin(HeaderMixin.class).setAutoTextSizeEnabled(false);
		setTitle(headerText);
		}