Merge "Add visibility metrics to dialogs." (295f5a03) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SecuritySettings.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.util.Log;
		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.fingerprint.FingerprintSettings;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Index;
		@@ -1222,7 +1223,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
		}
		}

		public static class UnificationConfirmationDialog extends DialogFragment {
		public static class UnificationConfirmationDialog extends InstrumentedDialogFragment {
		private static final String EXTRA_COMPLIANT = "compliant";

		public static UnificationConfirmationDialog newIntance(boolean compliant) {
		@@ -1272,6 +1273,11 @@ public class SecuritySettings extends SettingsPreferenceFragment
		super.onDismiss(dialog);
		((SecuritySettings) getParentFragment()).updateUnificationPreference();
		}

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.DIALOG_UNIFICATION_CONFIRMATION;
		}
		}

		}

src/com/android/settings/UserCredentialsSettings.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import android.widget.TextView;

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

		@@ -108,7 +109,7 @@ public class UserCredentialsSettings extends OptionsMenuFragment implements OnIt
		}
		}

		public static class CredentialDialogFragment extends DialogFragment {
		public static class CredentialDialogFragment extends InstrumentedDialogFragment {
		private static final String TAG = "CredentialDialogFragment";
		private static final String ARG_CREDENTIAL = "credential";

		@@ -166,6 +167,11 @@ public class UserCredentialsSettings extends OptionsMenuFragment implements OnIt
		return builder.create();
		}

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.DIALOG_USER_CREDENTIAL;
		}

		/**
		* Deletes all certificates and keys under a given alias.
		*

src/com/android/settings/accounts/AccountSettings.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Index;
		import com.android.settings.search.Indexable;
		@@ -625,7 +626,7 @@ public class AccountSettings extends SettingsPreferenceFragment
		}
		}

		public static class RemoveUserFragment extends DialogFragment {
		public static class RemoveUserFragment extends InstrumentedDialogFragment {
		private static final String ARG_USER_ID = "userId";

		static RemoveUserFragment newInstance(int userId) {
		@@ -649,12 +650,17 @@ public class AccountSettings extends SettingsPreferenceFragment
		}
		});
		}

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.DIALOG_REMOVE_USER;
		}
		}

		/**
		* Dialog to inform user about changing auto-sync setting
		*/
		public static class ConfirmAutoSyncChangeFragment extends DialogFragment {
		public static class ConfirmAutoSyncChangeFragment extends InstrumentedDialogFragment {
		private static final String SAVE_ENABLING = "enabling";
		private static final String SAVE_USER_HANDLE = "userHandle";
		private boolean mEnabling;
		@@ -705,6 +711,11 @@ public class AccountSettings extends SettingsPreferenceFragment
		outState.putBoolean(SAVE_ENABLING, mEnabling);
		outState.putParcelable(SAVE_USER_HANDLE, mUserHandle);
		}

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.DIALOG_CONFIRM_AUTO_SYNC_CHANGE;
		}
		}

		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

src/com/android/settings/applications/AppInfoBase.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -37,9 +37,11 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.Log;

		import com.android.internal.logging.MetricsProto;
		import com.android.settings.SettingsActivity;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		@@ -229,11 +231,18 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
		new UserHandle(UserHandle.getUserId(uid)));
		}

		public static class MyAlertDialogFragment extends DialogFragment {
		public static class MyAlertDialogFragment extends InstrumentedDialogFragment {

		private static final String ARG_ID = "id";

		@Override
		public int getMetricsCategory() {
		return MetricsProto.MetricsEvent.DIALOG_APP_INFO_ACTION;
		}

		@Override
		public Dialog onCreateDialog(Bundle savedInstanceState) {
		int id = getArguments().getInt("id");
		int id = getArguments().getInt(ARG_ID);
		int errorCode = getArguments().getInt("moveError");
		Dialog dialog = ((AppInfoBase) getTargetFragment()).createDialog(id, errorCode);
		if (dialog == null) {
		@@ -245,7 +254,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
		public static MyAlertDialogFragment newInstance(int id, int errorCode) {
		MyAlertDialogFragment dialogFragment = new MyAlertDialogFragment();
		Bundle args = new Bundle();
		args.putInt("id", id);
		args.putInt(ARG_ID, id);
		args.putInt("moveError", errorCode);
		dialogFragment.setArguments(args);
		return dialogFragment;

src/com/android/settings/applications/RunningServiceDetails.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.settings.core.InstrumentedFragment;
		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

		import java.io.File;
		import java.io.FileInputStream;
		@@ -562,7 +563,7 @@ public class RunningServiceDetails extends InstrumentedFragment
		newFragment.show(getFragmentManager(), "confirmstop");
		}

		public static class MyAlertDialogFragment extends DialogFragment {
		public static class MyAlertDialogFragment extends InstrumentedDialogFragment {

		public static MyAlertDialogFragment newConfirmStop(int id, ComponentName comp) {
		MyAlertDialogFragment frag = new MyAlertDialogFragment();
		@@ -605,6 +606,11 @@ public class RunningServiceDetails extends InstrumentedFragment
		}
		throw new IllegalArgumentException("unknown id " + id);
		}

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.DIALOG_RUNNIGN_SERVICE;
		}
		}

		void ensureData() {