Snap for 6496549 from fa1e102af7e4285215224c2acc523c3cd97e7c0a to rvc-release (7665fe98) · Commits · e / os / android_packages_apps_Settings

res/values/styles.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -546,8 +546,8 @@
		<!-- 10dp start padding for the start icon -->
		<item name="titleItemStartPadding">10dp</item>

		<!-- Padding between content and the start icon is 5dp -->
		<item name="contentStartPadding">5dp</item>
		<!-- Padding between content and the start icon is 0dp -->
		<item name="contentStartPadding">0dp</item>

		<!-- 0dp start padding for the end item -->
		<item name="endItemStartPadding">0dp</item>
		@@ -555,8 +555,8 @@
		<item name="endItemEndPadding">24dp</item>

		<!-- Align text with slider -->
		<item name="titleStartPadding">6dp</item>
		<item name="subContentStartPadding">6dp</item>
		<item name="titleStartPadding">11dp</item>
		<item name="subContentStartPadding">11dp</item>
		</style>

		<style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">

res/xml/storage_dashboard_fragment.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		android:title="@string/storage_settings"
		android:orderingFromXml="false">
		<com.android.settings.deviceinfo.storage.StorageSummaryDonutPreference
		android:key="pref_summary"
		android:key="storage_summary"
		android:order="0"
		settings:searchable="false"
		settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/>

src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java

+20 −12

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.settings.applications.appinfo;

		import android.app.Activity;
		import android.content.ActivityNotFoundException;
		import android.content.Context;
		import android.content.Intent;
		@@ -123,21 +124,28 @@ public class AppPermissionPreferenceController extends AppInfoPreferenceControll

		private void startManagePermissionsActivity() {
		// start new activity to manage app permissions
		final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
		intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mParent.getAppEntry().info.packageName);
		intent.putExtra(EXTRA_HIDE_INFO_BUTTON, true);
		String action = mParent.getActivity().getIntent().getAction();
		long sessionId = mParent.getActivity().getIntent().getLongExtra(
		final Intent permIntent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
		permIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, mParent.getAppEntry().info.packageName);
		permIntent.putExtra(EXTRA_HIDE_INFO_BUTTON, true);
		Activity activity = mParent.getActivity();
		Intent intent = activity != null ? activity.getIntent() : null;
		if (intent != null) {
		String action = intent.getAction();
		long sessionId = intent.getLongExtra(
		Intent.ACTION_AUTO_REVOKE_PERMISSIONS, INVALID_SESSION_ID);
		if ((action != null && action.equals(Intent.ACTION_AUTO_REVOKE_PERMISSIONS))
		\|\| sessionId != INVALID_SESSION_ID) {
		// If intent is Auto revoke, and we don't already have a session ID, make one
		while (sessionId == INVALID_SESSION_ID) {
		sessionId = new Random().nextLong();
		}
		intent.putExtra(Intent.ACTION_AUTO_REVOKE_PERMISSIONS, sessionId);
		permIntent.putExtra(Intent.ACTION_AUTO_REVOKE_PERMISSIONS, sessionId);
		}
		}
		try {
		mParent.getActivity().startActivityForResult(intent, mParent.SUB_INFO_FRAGMENT);
		if (activity != null) {
		activity.startActivityForResult(permIntent, mParent.SUB_INFO_FRAGMENT);
		}
		} catch (ActivityNotFoundException e) {
		Log.w(TAG, "No app can handle android.intent.action.MANAGE_APP_PERMISSIONS");
		}

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

+24 −21

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.text.TextUtils;

		import androidx.preference.Preference;

		@@ -100,29 +101,31 @@ public abstract class BiometricStatusPreferenceController extends BasePreference
		} else {
		preference.setVisible(true);
		}
		final int userId = getUserId();
		final String clazz;
		if (hasEnrolledBiometrics()) {
		preference.setSummary(getSummaryTextEnrolled());
		clazz = getSettingsClassName();
		} else {
		preference.setSummary(getSummaryTextNoneEnrolled());
		clazz = getEnrollClassName();
		preference.setSummary(hasEnrolledBiometrics() ? getSummaryTextEnrolled()
		: getSummaryTextNoneEnrolled());
		}

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {
		if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
		return super.handlePreferenceTreeClick(preference);
		}
		preference.setOnPreferenceClickListener(target -> {
		final Context context = target.getContext();

		final Context context = preference.getContext();
		final UserManager userManager = UserManager.get(context);
		if (Utils.startQuietModeDialogIfNecessary(context, userManager,
		userId)) {
		final int userId = getUserId();
		if (Utils.startQuietModeDialogIfNecessary(context, userManager, userId)) {
		return false;
		}
		Intent intent = new Intent();

		final Intent intent = new Intent();
		final String clazz = hasEnrolledBiometrics() ? getSettingsClassName()
		: getEnrollClassName();
		intent.setClassName(SETTINGS_PACKAGE_NAME, clazz);
		intent.putExtra(Intent.EXTRA_USER_ID, userId);
		intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true);
		context.startActivity(intent);
		return true;
		});
		}

		protected int getUserId() {

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@ import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.widget.LayoutPreference;

		import java.util.List;
		@@ -80,12 +82,14 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
		void onRemoved();
		}

		private Preference mPreference;
		private Button mButton;
		private Listener mListener;
		private SettingsActivity mActivity;
		private int mUserId;
		private boolean mRemoving;

		private final MetricsFeatureProvider mMetricsFeatureProvider;
		private final Context mContext;
		private final FaceManager mFaceManager;
		private final FaceManager.RemovalCallback mRemovalCallback = new FaceManager.RemovalCallback() {
		@@ -141,6 +145,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
		super(context, preferenceKey);
		mContext = context;
		mFaceManager = context.getSystemService(FaceManager.class);
		mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
		}

		public FaceSettingsRemoveButtonPreferenceController(Context context) {
		@@ -155,6 +160,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
		public void updateState(Preference preference) {
		super.updateState(preference);

		mPreference = preference;
		mButton = ((LayoutPreference) preference)
		.findViewById(R.id.security_settings_face_settings_remove_button);
		mButton.setOnClickListener(this);
		@@ -179,6 +185,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
		@Override
		public void onClick(View v) {
		if (v == mButton) {
		mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
		mRemoving = true;
		ConfirmRemoveDialog dialog = new ConfirmRemoveDialog();
		dialog.setOnClickListener(mOnClickListener);