Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 9178695 from 431d967b6d to udc-release

Browse Source 
Change-Id: I4ff3a29466f332d4d198dfd7fc893dbeeef1485b
This commit is contained in:
Android Build Coastguard Worker
2022-10-15 03:27:19 +00:00
parent 0a84cd9a71 431d967b6d
commit 3360ef1aba
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
View File

@@ -23,6 +23,9 @@ import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.core.PreferenceControllerMixin;
@@ -34,9 +37,6 @@ import com.google.common.annotations.VisibleForTesting;
import java.util.ArrayList;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class ShowOnLockScreenNotificationPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

2
src/com/android/settings/wifi/LongPressWifiEntryPreference.java
View File

@@ -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

2
src/com/android/settings/wifi/WifiEntryPreference.java
View File

@@ -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();
}

5
tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
View File

@@ -28,6 +28,8 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
@@ -42,11 +44,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import androidx.preference.PreferenceScreen;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowUserManager.class, ShadowRestrictedLockUtilsInternal.class})
public class ShowOnLockscreenNotificationPreferenceControllerTest {

2
tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java
View File

@@ -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;

3
tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
View File

@@ -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;