Use MetricsFeatureProvider for logging in Settings.

Bug: 31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
      verifying log

Change-Id: Id944be7c4ff9911aebee481c2df485542f1318f0

1 files changed, 18 insertions, 16 deletions

diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 950d52a04b..56a4ca075e 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -27,21 +27,21 @@ import android.provider.Settings;
 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.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.WirelessUtils;
 
 public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener {
 
-    private final Context mContext;
+    private static final int EVENT_SERVICE_STATE_CHANGED = 3;
 
-    private PhoneStateIntentReceiver mPhoneStateReceiver;
-    
+    private final Context mContext;
     private final SwitchPreference mSwitchPref;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    private static final int EVENT_SERVICE_STATE_CHANGED = 3;
+    private PhoneStateIntentReceiver mPhoneStateReceiver;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -61,19 +61,21 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
         }
     };
 
-    public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeSwitchPreference) {
-        
+    public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeSwitchPreference,
+            MetricsFeatureProvider metricsFeatureProvider) {
+
         mContext = context;
         mSwitchPref = airplaneModeSwitchPreference;
+        mMetricsFeatureProvider = metricsFeatureProvider;
 
         airplaneModeSwitchPreference.setPersistent(false);
-    
+
         mPhoneStateReceiver = new PhoneStateIntentReceiver(mContext, mHandler);
         mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
     }
 
     public void resume() {
-        
+
         mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
 
         mPhoneStateReceiver.registerIntent();
@@ -82,7 +84,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
                 Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), true,
                 mAirplaneModeObserver);
     }
-    
+
     public void pause() {
         mPhoneStateReceiver.unregisterIntent();
         mSwitchPref.setOnPreferenceChangeListener(null);
@@ -91,11 +93,11 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
 
     private void setAirplaneModeOn(boolean enabling) {
         // Change the system setting
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 
-                                enabling ? 1 : 0);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON,
+                enabling ? 1 : 0);
         // Update the UI to reflect system setting
         mSwitchPref.setChecked(enabling);
-        
+
         // Post the intent
         Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
         intent.putExtra("state", enabling);
@@ -113,17 +115,17 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
     private void onAirplaneModeChanged() {
         mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
     }
-    
+
     /**
      * Called when someone clicks on the checkbox preference.
      */
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (Boolean.parseBoolean(
-                    SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
+                SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
             // In ECM mode, do not update database at this point
         } else {
             Boolean value = (Boolean) newValue;
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, value);
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, value);
             setAirplaneModeOn(value);
         }
         return true;