PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate all MetricsProto enums to SettingsEnums

Browse Source 
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
This commit is contained in:
Fan Zhang
2019-01-16 13:49:47 -08:00
parent dbaa5459b8
commit 31b210017b
502 changed files with 1184 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.nfc;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.PackageManager;
import android.nfc.NfcAdapter;
@@ -33,7 +34,6 @@ import android.widget.ImageView;
import android.widget.Switch;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedFragment;
@@ -142,6 +142,6 @@ public class AndroidBeam extends InstrumentedFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.NFC_BEAM;
return SettingsEnums.NFC_BEAM;
}
}

4
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.nfc;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -30,7 +31,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,7 +53,7 @@ public class PaymentSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.NFC_PAYMENT;
return SettingsEnums.NFC_PAYMENT;
}
@Override