Merge "log more settings actions" into mnc-dev (46c8f759) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/AirplaneModeEnabler.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.preference.Preference;
		import android.preference.SwitchPreference;
		import android.provider.Settings;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.telephony.PhoneStateIntentReceiver;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.settingslib.WirelessUtils;
		@@ -120,7 +121,9 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
		SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
		// In ECM mode, do not update database at this point
		} else {
		setAirplaneModeOn((Boolean) newValue);
		Boolean value = (Boolean) newValue;
		MetricsLogger.action(mContext, MetricsLogger.ACTION_AIRPLANE_TOGGLE, value);
		setAirplaneModeOn(value);
		}
		return true;
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -1217,10 +1217,11 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		public void onClick(View v) {
		if (mBinding) return;

		final boolean dataEnabled = !mDataEnabled.isChecked();
		final boolean enabled = !mDataEnabled.isChecked();
		final String currentTab = mCurrentTab;
		if (isMobileTab(currentTab)) {
		if (dataEnabled) {
		MetricsLogger.action(getContext(), MetricsLogger.ACTION_CELL_DATA_TOGGLE, enabled);
		if (enabled) {
		// If we are showing the Sim Card tile then we are a Multi-Sim device.
		if (Utils.showSimCardTile(getActivity())) {
		handleMultiSimDataDialog();

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.provider.Settings;
		import android.widget.Switch;
		import android.widget.Toast;

		import com.android.internal.logging.MetricsLogger;
		import com.android.settings.R;
		import com.android.settings.search.Index;
		import com.android.settings.widget.SwitchBar;
		@@ -184,6 +185,8 @@ public final class BluetoothEnabler implements SwitchBar.OnSwitchChangeListener
		switchView.setChecked(false);
		}

		MetricsLogger.action(mContext, MetricsLogger.ACTION_BLUETOOTH_TOGGLE, isChecked);

		if (mLocalAdapter != null) {
		mLocalAdapter.setBluetoothEnabled(isChecked);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -231,16 +231,19 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
		switch (item.getItemId()) {
		case MENU_ID_SCAN:
		if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
		MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_SCAN);
		startScanning();
		}
		return true;

		case MENU_ID_RENAME_DEVICE:
		MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_RENAME);
		new BluetoothNameDialogFragment().show(
		getFragmentManager(), "rename device");
		return true;

		case MENU_ID_SHOW_RECEIVED:
		MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_FILES);
		Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
		getActivity().sendBroadcast(intent);
		return true;

+2 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
		new ZenRuleNameDialog(mContext, mServiceListing, null, mConfig.getAutomaticRuleNames()) {
		@Override
		public void onOk(String ruleName, RuleInfo ri) {
		MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ADD_RULE_OK);
		final ZenRule rule = new ZenRule();
		rule.name = ruleName;
		rule.enabled = true;
		@@ -168,6 +169,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
		p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference preference) {
		MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ADD_RULE);
		showAddRuleDialog();
		return true;
		}