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

Merge "[Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-21 09:56:05 +00:00
committed by Android (Google) Code Review
parent c5df8f0cb4 8e3c49123d
commit 546a06af3d
24 changed files with 334 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/res/values/overlayable_icons_test.xml
View File

@@ -40,7 +40,7 @@
<item>@drawable/ic_delete</item>
<item>@drawable/ic_delete_accent</item>
<item>@drawable/ic_devices_other</item>
<item>@drawable/ic_devices_other_opaque_black</item>
<item>@drawable/ic_devices_other_32dp</item>
<item>@drawable/ic_do_not_disturb_on_24dp</item>
<item>@drawable/ic_eject_24dp</item>
<item>@drawable/ic_expand_less</item>

21
tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
View File

@@ -27,7 +27,6 @@ import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settings.wifi.dpp.WifiDppEnrolleeActivity;
import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -38,7 +37,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -113,23 +111,4 @@ public class WifiDialogActivityTest {
assertThat(dialog.getContext().getThemeResId())
.isEqualTo(R.style.SuwAlertDialogThemeCompat_Light);
}
@Test
public void onScan_whenLaunchFromDeferredSetup_shouldApplyLightTheme() {
ActivityController<WifiDppEnrolleeActivity> controller = Robolectric.buildActivity(
WifiDppEnrolleeActivity.class,
new Intent()
.setAction(WifiDppEnrolleeActivity.ACTION_ENROLLEE_QR_CODE_SCANNER)
.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true)
.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
);
controller.create();
Intent intent = controller.getIntent();
assertThat(intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, false)).isTrue();
assertThat(intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, false)).isTrue();
assertThat(controller.get().getThemeResId()).
isEqualTo(R.style.LightTheme_SettingsBase_SetupWizard);
}
}