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

Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b am: aba2346cb3

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

Change-Id: I6fca72be41d2c2e0f5528fbf2a7e47660e92ffbf
This commit is contained in:
TreeHugger Robot
2021-06-07 09:16:37 +00:00
committed by Automerger Merge Worker
parent f24aa56275 aba2346cb3
commit ef6e2fa01a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/network_provider_settings.xml
View File

@@ -59,7 +59,7 @@
android:layout="@layout/preference_category_no_label"/> android:layout="@layout/preference_category_no_label"/>
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="wifi_switch" android:key="main_toggle_wifi"
android:title="@string/wifi" android:title="@string/wifi"
android:summary="@string/wifi_switch_summary" android:summary="@string/wifi_switch_summary"
settings:keywords="@string/keywords_wifi"/> settings:keywords="@string/keywords_wifi"/>

2
src/com/android/settings/network/WifiSwitchPreferenceController.java
View File

@@ -35,7 +35,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
public class WifiSwitchPreferenceController extends AbstractPreferenceController implements public class WifiSwitchPreferenceController extends AbstractPreferenceController implements
LifecycleObserver { LifecycleObserver {
public static final String KEY = "wifi_switch"; public static final String KEY = "main_toggle_wifi";
private RestrictedSwitchPreference mPreference; private RestrictedSwitchPreference mPreference;