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"

Browse Source
This commit is contained in:
Goven Liu
2019-08-20 07:00:50 +00:00
committed by Android (Google) Code Review
parent 484cfe8a27 dbf920cfff
commit 67a24cb98d
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -2725,7 +2725,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"

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

@@ -17,6 +17,7 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@@ -27,12 +28,16 @@ import android.content.Context;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
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.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -122,4 +127,12 @@ public class NetworkRequestDialogActivityTest {
verify(mActivity).finish(); verify(mActivity).finish();
} }
@Test
public void launchActivityDialog_shouldApplyAlertDialogTheme() {
final NetworkRequestDialogActivity activity = Robolectric
.setupActivity(NetworkRequestDialogActivity.class);
assertThat(activity.getThemeResId()).isEqualTo(R.style.Theme_AlertDialog);
}
} }