From c8a65cbddf7a318f08df5266ecb3f4eb28875023 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Fri, 14 Dec 2018 16:12:18 +0800 Subject: [PATCH] Support Wi-Fi DPP metrics categories in Wi-Fi DPP activities & fragments. MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_ENROLLEE Bug: 118797380 Bug: 118794858 Bug: 118794978 Test: NA Change-Id: I62fe09029d350fa976465ac872a4f53a64a74dcd --- .../android/settings/wifi/dpp/WifiDppAddDeviceFragment.java | 6 ++++++ .../wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java | 6 ++++++ .../android/settings/wifi/dpp/WifiDppConfiguratorActivity.java | 4 +--- src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java | 4 +--- .../android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java | 8 -------- .../settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java | 6 ++++++ .../settings/wifi/dpp/WifiDppQrCodeScannerFragment.java | 10 ++++++++++ 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java index 177e79d3b5..8d6aa6813c 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp; import android.os.Bundle; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; /** @@ -31,6 +32,11 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { } @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 7d031c18ea..66bc349ebd 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp; import android.os.Bundle; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; /** @@ -31,6 +32,11 @@ public class WifiDppChooseSavedWifiNetworkFragment extends WifiDppQrCodeBaseFrag } @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 e4ae292d99..6c95f09cec 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.FragmentManager; 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 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements @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 39d993f03f..920e73668d 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.FragmentManager; 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 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity { @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 e6427d9e64..b82f95349d 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java @@ -27,8 +27,6 @@ import android.widget.ListView; 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.wifi.qrcode.QrDecorateView; import com.android.settings.R; @@ -70,12 +68,6 @@ public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment { 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 b064253f31..ec22415d90 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.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; /** @@ -35,6 +36,11 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { 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 342e693371..e1723183c1 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java @@ -31,6 +31,7 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; 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; @@ -53,6 +54,15 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl 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. */ -- 2.11.0