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

Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev

Browse Source 
am: cfcfb024c4

Change-Id: If72465328b970ce0d8e9d0c69f0a229a528bdbee
This commit is contained in:
Goven Liu
2019-08-20 22:36:09 -07:00
committed by android-build-merger
parent 10ca16aebb cfcfb024c4
commit fe3548ef41
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -2707,7 +2707,7 @@
<activity <activity
android:name=".wifi.NetworkRequestDialogActivity" android:name=".wifi.NetworkRequestDialogActivity"
android:theme="@style/Transparent" android:theme="@style/Theme.AlertDialog"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:taskAffinity=".wifi.NetworkRequestDialogActivity" android:taskAffinity=".wifi.NetworkRequestDialogActivity"

10
tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
View File

@@ -26,6 +26,7 @@ import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settingslib.wifi.WifiTracker; import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory; import com.android.settingslib.wifi.WifiTrackerFactory;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
@@ -36,15 +37,18 @@ import org.robolectric.annotation.Config;
@Config(shadows = ShadowAlertDialogCompat.class) @Config(shadows = ShadowAlertDialogCompat.class)
public class NetworkRequestDialogActivityTest { public class NetworkRequestDialogActivityTest {
@Test @Before
public void LaunchActivity_shouldShowNetworkRequestDialog() { public void setUp() {
// Mocks fake WifiTracker, in case of exception in NetworkRequestDialogFragment.onResume(). // Mocks fake WifiTracker, in case of exception in NetworkRequestDialogFragment.onResume().
WifiTracker wifiTracker = mock(WifiTracker.class); WifiTracker wifiTracker = mock(WifiTracker.class);
WifiTrackerFactory.setTestingWifiTracker(wifiTracker); WifiTrackerFactory.setTestingWifiTracker(wifiTracker);
}
@Test
public void launchActivity_shouldShowNetworkRequestDialog() {
Robolectric.setupActivity(NetworkRequestDialogActivity.class); Robolectric.setupActivity(NetworkRequestDialogActivity.class);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog(); final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue(); assertThat(alertDialog.isShowing()).isTrue();
} }