Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 68335164e1 (0f428f48) · Commits · e / os / android_packages_apps_Settings

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/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);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class StorageDashboardFragment extends DashboardFragment
		implements
		LoaderManager.LoaderCallbacks<SparseArray<StorageAsyncLoader.AppsStorageResult>> {
		private static final String TAG = "StorageDashboardFrag";
		private static final String SUMMARY_PREF_KEY = "pref_summary";
		private static final String SUMMARY_PREF_KEY = "storage_summary";
		private static final int STORAGE_JOB_ID = 0;
		private static final int ICON_JOB_ID = 1;
		private static final int VOLUME_SIZE_JOB_ID = 2;

src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java

+10 −20

Original line number	Diff line number	Diff line
		@@ -19,10 +19,7 @@ package com.android.settings.deviceinfo.storage;
		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.Typeface;
		import android.os.storage.StorageManager;
		import android.text.TextPaint;
		import android.text.style.StyleSpan;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.Button;
		@@ -31,8 +28,10 @@ import androidx.preference.Preference;
		import androidx.preference.PreferenceViewHolder;

		import com.android.settings.R;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.widget.DonutView;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		/**
		* StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left
		@@ -79,23 +78,14 @@ public class StorageSummaryDonutPreference extends Preference implements View.On
		@Override
		public void onClick(View v) {
		if (v != null && R.id.deletion_helper_button == v.getId()) {
		Context context = getContext();
		FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(
		context, SettingsEnums.STORAGE_FREE_UP_SPACE_NOW);
		Intent intent = new Intent(StorageManager.ACTION_MANAGE_STORAGE);
		getContext().startActivity(intent);
		}
		}

		private static class BoldLinkSpan extends StyleSpan {
		public BoldLinkSpan() {
		super(Typeface.BOLD);
		}

		@Override
		public void updateDrawState(TextPaint ds) {
		super.updateDrawState(ds);
		ds.setColor(ds.linkColor);
		final Context context = getContext();
		final MetricsFeatureProvider metricsFeatureProvider =
		FeatureFactory.getFactory(context).getMetricsFeatureProvider();
		metricsFeatureProvider.logClickedPreference(this,
		getExtras().getInt(DashboardFragment.CATEGORY));
		metricsFeatureProvider.action(context, SettingsEnums.STORAGE_FREE_UP_SPACE_NOW);
		final Intent intent = new Intent(StorageManager.ACTION_MANAGE_STORAGE);
		context.startActivity(intent);
		}
		}
		}