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

[Wi-Fi] Support passport R1 expiration handling

Browse Source 
1. Keep expired networks in the Saved Networks / Subscriptions area
2. Saved Networks Screen: add "Expired" subtext to the expired network list item
3. Wi-Fi detail page: also add "Expired" subtext under the network name
4. Wi-Fi detail page: hide the "Connect" button

Bug: 141474717
Test: WifiDetailPreferenceControllerTest
      manual:
      Download passpoint profile and connect to a passpoint AP.

Change-Id: Id5f5cf97bb25578ca08ebf9e77b06a2a02521e1c
This commit is contained in:
Arc Wang
2019-10-16 15:34:31 +08:00
parent fd747e663c
commit 4a71bc90f4
2 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -17,8 +17,8 @@ package com.android.settings.wifi.details;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
@@ -35,8 +35,8 @@ import static org.mockito.Mockito.when;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
@@ -56,7 +56,6 @@ import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Handler;
import android.provider.Settings;
import android.util.FeatureFlagUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;
@@ -69,9 +68,9 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.Utils;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.widget.EntityHeaderController;
@@ -101,8 +100,8 @@ import org.robolectric.shadows.ShadowToast;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.stream.Collectors;
@RunWith(RobolectricTestRunner.class)
@@ -1870,6 +1869,21 @@ public class WifiDetailPreferenceControllerTest {
verify(mockMacAddressPref).setTitle(R.string.wifi_advanced_factory_mac_address_title);
}
@Test
public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
setUpForDisconnectedNetwork();
when(mockAccessPoint.isPasspoint()).thenReturn(true);
when(mockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
when(mockAccessPoint.isExpired()).thenReturn(true);
String expireSummary = mContext.getResources().getString(
com.android.settingslib.R.string.wifi_passpoint_expired);
displayAndResume();
verify(mockButtonsPref).setButton3Visible(false);
verify(mockHeaderController).setSummary(expireSummary);
}
private ActionButtonsPreference createMock() {
final ActionButtonsPreference pref = mock(ActionButtonsPreference.class);
when(pref.setButton1Text(anyInt())).thenReturn(pref);