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

Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-29 15:16:44 +00:00
committed by Android (Google) Code Review
parent 297028ea69 5e3d75a6f9
commit 38989c9c6a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
View File

@@ -15,18 +15,17 @@
*/ */
package com.android.settings.wifi.p2p; package com.android.settings.wifi.p2p;
import android.app.Service;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.location.LocationManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -70,6 +69,9 @@ public class WifiP2pPreferenceController extends AbstractPreferenceController
super.displayPreference(screen); super.displayPreference(screen);
mWifiDirectPref = screen.findPreference(KEY_WIFI_DIRECT); mWifiDirectPref = screen.findPreference(KEY_WIFI_DIRECT);
togglePreferences(); togglePreferences();
if (!mIsWifiDirectAllow) {
mWifiDirectPref.setSummary(R.string.not_allowed_by_ent);
}
} }
@Override @Override

4
tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
View File

@@ -22,12 +22,10 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.Service;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -40,6 +38,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before; import org.junit.Before;
@@ -142,6 +141,7 @@ public class WifiP2PPreferenceControllerTest {
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
verify(mWifiDirectPreference).setEnabled(false); verify(mWifiDirectPreference).setEnabled(false);
verify(mWifiDirectPreference).setSummary(R.string.not_allowed_by_ent);
} }
@Test @Test