Merge "Support Wi-Fi DPP metrics categories in Wi-Fi DPP activities & fragments."
diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
index 177e79d..8d6aa68 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
@@ -18,6 +18,7 @@
import android.os.Bundle;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
/**
@@ -31,6 +32,11 @@
}
@Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
+ }
+
+ @Override
public void onActivityCreated (Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java b/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
index 7d031c1..66bc349 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
@@ -18,6 +18,7 @@
import android.os.Bundle;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
/**
@@ -31,6 +32,11 @@
}
@Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
+ }
+
+ @Override
public void onActivityCreated (Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index e4ae292..6c95f09 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -27,7 +27,6 @@
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
-
import com.android.settings.core.InstrumentedActivity;
import com.android.settings.R;
@@ -67,8 +66,7 @@
@Override
public int getMetricsCategory() {
- //TODO:Should we use a new metrics category for Wi-Fi DPP?
- return MetricsProto.MetricsEvent.WIFI_NETWORK_DETAILS;
+ return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
@Override
diff --git a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
index 39d993f..920e736 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
@@ -27,7 +27,6 @@
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
-
import com.android.settings.core.InstrumentedActivity;
import com.android.settings.R;
@@ -47,8 +46,7 @@
@Override
public int getMetricsCategory() {
- //TODO:Should we use a new metrics category for Wi-Fi DPP?
- return MetricsProto.MetricsEvent.WIFI_NETWORK_DETAILS;
+ return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_ENROLLEE;
}
@Override
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
index cfdb40a..5b76f11 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
@@ -26,8 +26,6 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.android.internal.logging.nano.MetricsProto;
-
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
@@ -62,12 +60,6 @@
abstract protected int getLayout();
@Override
- public int getMetricsCategory() {
- //TODO:Should we use a new metrics category for Wi-Fi DPP?
- return MetricsProto.MetricsEvent.WIFI_NETWORK_DETAILS;
- }
-
- @Override
public final void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index b064253..ec22415 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -23,6 +23,7 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
/**
@@ -35,6 +36,11 @@
return R.layout.wifi_dpp_qrcode_generator_fragment;
}
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
+ }
+
// Container Activity must implement this interface
public interface OnQrCodeGeneratorFragmentAddButtonClickedListener {
public void onQrCodeGeneratorFragmentAddButtonClicked();
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index e7124a5..64ede72 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -33,6 +33,7 @@
import android.view.TextureView.SurfaceTextureListener;
import android.view.View;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.wifi.qrcode.QrCamera;
import com.android.settings.wifi.qrcode.QrDecorateView;
@@ -55,6 +56,15 @@
return R.layout.wifi_dpp_qrcode_scanner_fragment;
}
+ @Override
+ public int getMetricsCategory() {
+ if (mConfiguratorMode) {
+ return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
+ } else {
+ return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_ENROLLEE;
+ }
+ }
+
/**
* Configurator container activity of the fragment should create instance with this constructor.
*/