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 am: 38989c9c6a am: c272070439

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: Ie763ea027c62efa2652acae3d5b3a09d2979a142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-02 08:32:17 +00:00
committed by Automerger Merge Worker
parent b27b72ace4 c272070439
commit 1a7d9d3626
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;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.location.LocationManager;
import android.net.wifi.WifiManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -70,6 +69,9 @@ public class WifiP2pPreferenceController extends AbstractPreferenceController
super.displayPreference(screen);
mWifiDirectPref = screen.findPreference(KEY_WIFI_DIRECT);
togglePreferences();
if (!mIsWifiDirectAllow) {
mWifiDirectPref.setSummary(R.string.not_allowed_by_ent);
}
}
@Override