Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d1bfd1e authored by Chris Wren's avatar Chris Wren
Browse files

port settings over to new metrics enum 

Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
parent 6a83d753

src/com/android/settings/AirplaneModeEnabler.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.support.v14.preference.SwitchPreference; 
import android.support.v7.preference.Preference;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.telephony.PhoneStateIntentReceiver;

import com.android.internal.telephony.TelephonyProperties;

import com.android.settingslib.WirelessUtils;
@@ -122,7 +123,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene 
            // In ECM mode, do not update database at this point

        } else {

            Boolean value = (Boolean) newValue;

            MetricsLogger.action(mContext, MetricsLogger.ACTION_AIRPLANE_TOGGLE, value);

            MetricsLogger.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, value);

            setAirplaneModeOn(value);

        }

        return true;

src/com/android/settings/ApnEditor.java

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import android.view.KeyEvent; 
import android.view.Menu;

import android.view.MenuItem;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;



import java.util.HashSet;

import java.util.Set;
@@ -255,7 +255,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity 


    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.APN_EDITOR;

        return MetricsEvent.APN_EDITOR;

    }



    @Override

src/com/android/settings/ApnSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import android.view.MenuItem; 
import android.widget.TextView;

import android.widget.Toast;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.dataconnection.ApnSetting;
@@ -144,7 +144,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements 


    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.APN;

        return MetricsEvent.APN;

    }



    @Override

src/com/android/settings/ApplicationSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.support.v7.preference.ListPreference; 
import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;



public class ApplicationSettings extends SettingsPreferenceFragment {
@@ -45,7 +45,7 @@ public class ApplicationSettings extends SettingsPreferenceFragment { 


    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.APPLICATION;

        return MetricsEvent.APPLICATION;

    }



    @Override

src/com/android/settings/ChooseLockGeneric.java

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import android.view.View; 
import android.view.accessibility.AccessibilityManager;

import android.widget.Toast;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.widget.LockPatternUtils;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedPreference;
@@ -130,7 +130,7 @@ public class ChooseLockGeneric extends SettingsActivity { 


        @Override

        protected int getMetricsCategory() {

            return MetricsLogger.CHOOSE_LOCK_GENERIC;

            return MetricsEvent.CHOOSE_LOCK_GENERIC;

        }



        @Override