Merge "Migrate to use instrumentation classes from settingslib." (de7135fb) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/AirplaneModeEnabler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@ import android.support.v7.preference.Preference;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.telephony.PhoneStateIntentReceiver;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.settings.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.WirelessUtils;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener {

src/com/android/settings/DeviceAdminSettings.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -49,8 +49,9 @@ import android.widget.Switch;
		import android.widget.TextView;

		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.core.instrumentation.Instrumentable;
		import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.core.instrumentation.Instrumentable;
		import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;

		import org.xmlpull.v1.XmlPullParserException;

		@@ -63,8 +64,7 @@ import java.util.List;
		public class DeviceAdminSettings extends ListFragment implements Instrumentable {
		static final String TAG = "DeviceAdminSettings";

		private final VisibilityLoggerMixin mVisibilityLoggerMixin =
		new VisibilityLoggerMixin(getMetricsCategory());
		private VisibilityLoggerMixin mVisibilityLoggerMixin;
		private DevicePolicyManager mDPM;
		private UserManager mUm;

		@@ -85,12 +85,6 @@ public class DeviceAdminSettings extends ListFragment implements Instrumentable
		}
		}

		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		mVisibilityLoggerMixin.onAttach(context);
		}

		/**
		* Internal collection of device admin info objects for all profiles associated with the current
		* user.
		@@ -121,6 +115,8 @@ public class DeviceAdminSettings extends ListFragment implements Instrumentable
		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
		FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider());
		}

		@Override

src/com/android/settings/SettingsActivity.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -56,13 +56,13 @@ import com.android.settings.Settings.WifiSettingsActivity;
		import com.android.settings.applications.manageapplications.ManageApplications;
		import com.android.settings.backup.BackupSettingsActivity;
		import com.android.settings.core.gateway.SettingsGateway;
		import com.android.settings.core.instrumentation.MetricsFeatureProvider;
		import com.android.settings.core.instrumentation.SharedPreferencesLogger;
		import com.android.settings.dashboard.DashboardFeatureProvider;
		import com.android.settings.dashboard.DashboardSummary;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.wfd.WifiDisplaySettings;
		import com.android.settings.widget.SwitchBar;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.core.instrumentation.SharedPreferencesLogger;
		import com.android.settingslib.development.DevelopmentSettingsEnabler;
		import com.android.settingslib.drawer.DashboardCategory;
		import com.android.settingslib.drawer.SettingsDrawerActivity;
		@@ -92,11 +92,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		*/
		public static final String EXTRA_SHOW_FRAGMENT = ":settings:show_fragment";

		/**
		* The metrics category constant for logging source when a setting fragment is opened.
		*/
		public static final String EXTRA_SOURCE_METRICS_CATEGORY = ":settings:source_metrics";

		/**
		* When starting this activity and using {@link #EXTRA_SHOW_FRAGMENT},
		* this extra can also be specified to supply a Bundle of arguments to pass
		@@ -220,7 +215,8 @@ public class SettingsActivity extends SettingsDrawerActivity
		@Override
		public SharedPreferences getSharedPreferences(String name, int mode) {
		if (name.equals(getPackageName() + "_preferences")) {
		return new SharedPreferencesLogger(this, getMetricsTag());
		return new SharedPreferencesLogger(this, getMetricsTag(),
		FeatureFactory.getFactory(this).getMetricsFeatureProvider());
		}
		return super.getSharedPreferences(name, mode);
		}

src/com/android/settings/SettingsPreferenceFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.widget.Button;

		import com.android.settings.applications.LayoutPreference;
		import com.android.settings.core.InstrumentedPreferenceFragment;
		import com.android.settings.core.instrumentation.Instrumentable;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.search.actionbar.SearchMenuController;
		import com.android.settings.support.actionbar.HelpMenuController;
		@@ -53,6 +52,7 @@ import com.android.settings.support.actionbar.HelpResourceProvider;
		import com.android.settings.widget.LoadingViewController;
		import com.android.settingslib.CustomDialogPreference;
		import com.android.settingslib.CustomEditTextPreference;
		import com.android.settingslib.core.instrumentation.Instrumentable;
		import com.android.settingslib.widget.FooterPreferenceMixin;

		import java.util.UUID;

src/com/android/settings/Utils.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -110,6 +110,7 @@ import com.android.internal.widget.LockPatternUtils;
		import com.android.settings.password.ChooseLockSettingsHelper;
		import com.android.settings.wrapper.DevicePolicyManagerWrapper;
		import com.android.settings.wrapper.FingerprintManagerWrapper;
		import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;

		import java.net.InetAddress;
		import java.util.ArrayList;
		@@ -576,7 +577,7 @@ public final class Utils extends com.android.settingslib.Utils {
		intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, titleResId);
		intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title);
		intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, isShortcut);
		intent.putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY, sourceMetricsCategory);
		intent.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY, sourceMetricsCategory);
		return intent;
		}