Refine the check restriction function in WifiEntryPreference
- Move checkRestrictionAndSetDisabled function from WifiEntryPreference to necessary child-classes to avoid impacting other child-classes such as SavedAccessPointsPreference. - Avoid adding ShadowRestrictedPreference to the unnecessary test class. Bug: 233871529 Test: manual test make RunSettingsRoboTests Change-Id: Ia2145401558b293b5f4eaa0860f83b7d3bbab548
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserManager;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.fragment.app.Fragment;
|
||||
@@ -33,6 +34,7 @@ public class LongPressWifiEntryPreference extends WifiEntryPreference {
|
||||
public LongPressWifiEntryPreference(Context context, WifiEntry wifiEntry, Fragment fragment) {
|
||||
super(context, wifiEntry);
|
||||
mFragment = fragment;
|
||||
checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -21,7 +21,6 @@ import android.content.res.Resources;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.graphics.drawable.StateListDrawable;
|
||||
import android.os.UserManager;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.ImageButton;
|
||||
@@ -88,7 +87,6 @@ public class WifiEntryPreference extends RestrictedPreference implements
|
||||
mWifiEntry = wifiEntry;
|
||||
mWifiEntry.setListener(this);
|
||||
mIconInjector = iconInjector;
|
||||
checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
|
||||
refresh();
|
||||
}
|
||||
|
||||
|
@@ -40,13 +40,11 @@ import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowRestrictedPreference.class)
|
||||
public class WifiEntryPreferenceTest {
|
||||
|
||||
private Context mContext;
|
||||
|
@@ -36,7 +36,6 @@ import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceCategory;
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
|
||||
import com.android.settings.wifi.ShadowRestrictedPreference;
|
||||
import com.android.settings.wifi.WifiEntryPreference;
|
||||
import com.android.wifitrackerlib.SavedNetworkTracker;
|
||||
import com.android.wifitrackerlib.WifiEntry;
|
||||
@@ -46,12 +45,10 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowRestrictedPreference.class)
|
||||
public class WifiNetworkListFragmentTest {
|
||||
private WifiNetworkListFragment mWifiNetworkListFragment;
|
||||
private Context mContext;
|
||||
|
Reference in New Issue
Block a user