Merge "Wifi Sharing page uses a new enum for telemetry." into main
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index 1213b0d..42a74dd 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -44,6 +44,7 @@
import com.android.internal.app.chooser.DisplayResolveInfo;
import com.android.internal.app.chooser.TargetInfo;
import com.android.settings.R;
+import com.android.settings.flags.Flags;
import com.android.settingslib.qrcode.QrCodeGenerator;
import com.google.zxing.WriterException;
@@ -69,6 +70,10 @@
@Override
public int getMetricsCategory() {
+ if (Flags.enableWifiSharingRuntimeFragment()) {
+ return SettingsEnums.SETTINGS_WIFI_DPP_QR_SHARING;
+ }
+
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
index 13f575f..38b4b71 100644
--- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
+import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -36,13 +37,19 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import androidx.fragment.app.FragmentTransaction;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
+import com.android.settings.flags.Flags;
+
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
@@ -55,6 +62,7 @@
private WifiDppQrCodeGeneratorFragment mFragment;
private Context mContext;
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
@@ -163,4 +171,18 @@
assertThat(mFragment.createNearbyButton(new Intent(), v -> {
})).isNotNull();
}
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_WIFI_SHARING_RUNTIME_FRAGMENT)
+ public void getMetricsCatetory_shouldReturnDppQrSharing() {
+ assertThat(mFragment.getMetricsCategory())
+ .isEqualTo(SettingsEnums.SETTINGS_WIFI_DPP_QR_SHARING);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_ENABLE_WIFI_SHARING_RUNTIME_FRAGMENT)
+ public void getMetricsCatetory_shouldReturnDppConfigurator() {
+ assertThat(mFragment.getMetricsCategory())
+ .isEqualTo(SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR);
+ }
}