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

Merge "Wifi Sharing page uses a new enum for telemetry." into main

Browse Source
This commit is contained in:
Kai Zhou
2024-07-12 07:55:51 +00:00
committed by Android (Google) Code Review
parent d3a67dc480 9775bd31f9
commit d99198f4ff
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
View File

@@ -44,6 +44,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.chooser.DisplayResolveInfo; import com.android.internal.app.chooser.DisplayResolveInfo;
import com.android.internal.app.chooser.TargetInfo; import com.android.internal.app.chooser.TargetInfo;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.flags.Flags;
import com.android.settingslib.qrcode.QrCodeGenerator; import com.android.settingslib.qrcode.QrCodeGenerator;
import com.google.zxing.WriterException; import com.google.zxing.WriterException;
@@ -69,6 +70,10 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
if (Flags.enableWifiSharingRuntimeFragment()) {
return SettingsEnums.SETTINGS_WIFI_DPP_QR_SHARING;
}
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
} }

22
tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.settings.SettingsEnums;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -36,13 +37,19 @@ import android.content.pm.ResolveInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; 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.fragment.app.FragmentTransaction;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.settings.flags.Flags;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@@ -55,6 +62,7 @@ public class WifiDppQrCodeGeneratorFragmentTest {
private WifiDppQrCodeGeneratorFragment mFragment; private WifiDppQrCodeGeneratorFragment mFragment;
private Context mContext; private Context mContext;
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before @Before
public void setUp() { public void setUp() {
@@ -163,4 +171,18 @@ public class WifiDppQrCodeGeneratorFragmentTest {
assertThat(mFragment.createNearbyButton(new Intent(), v -> { assertThat(mFragment.createNearbyButton(new Intent(), v -> {
})).isNotNull(); })).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);
}
} }