Loading res/xml/connected_devices_advanced.xml +1 −1 Original line number Diff line number Diff line Loading @@ -21,7 +21,7 @@ <Preference android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment" android:key="bluetooth_settings" android:key="bluetooth_switchbar_screen" android:title="@string/bluetooth_settings_title" android:icon="@*android:drawable/ic_settings_bluetooth" android:order="-9"/> Loading res/xml/network_and_internet.xml +1 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ <com.android.settings.widget.MasterSwitchPreference android:fragment="com.android.settings.wifi.WifiSettings" android:key="toggle_wifi" android:key="main_toggle_wifi" android:title="@string/wifi_settings" android:summary="@string/summary_placeholder" android:icon="@drawable/ic_settings_wireless" Loading src/com/android/settings/network/NetworkDashboardFragment.java +0 −8 Original line number Diff line number Diff line Loading @@ -150,13 +150,5 @@ public class NetworkDashboardFragment extends DashboardFragment implements null /* metricsFeatureProvider */, null /* fragment */, null /* mobilePlanHost */); } @Override public List<String> getNonIndexableKeys(Context context) { List<String> keys = super.getNonIndexableKeys(context); // Remove master switch as a result keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI); return keys; } }; } src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +1 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ public class WifiMasterSwitchPreferenceController extends AbstractPreferenceCont implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener, LifecycleObserver, OnResume, OnPause, OnStart, OnStop { public static final String KEY_TOGGLE_WIFI = "toggle_wifi"; public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi"; private MasterSwitchPreference mWifiPreference; private WifiEnabler mWifiEnabler; Loading Loading
res/xml/connected_devices_advanced.xml +1 −1 Original line number Diff line number Diff line Loading @@ -21,7 +21,7 @@ <Preference android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment" android:key="bluetooth_settings" android:key="bluetooth_switchbar_screen" android:title="@string/bluetooth_settings_title" android:icon="@*android:drawable/ic_settings_bluetooth" android:order="-9"/> Loading
res/xml/network_and_internet.xml +1 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ <com.android.settings.widget.MasterSwitchPreference android:fragment="com.android.settings.wifi.WifiSettings" android:key="toggle_wifi" android:key="main_toggle_wifi" android:title="@string/wifi_settings" android:summary="@string/summary_placeholder" android:icon="@drawable/ic_settings_wireless" Loading
src/com/android/settings/network/NetworkDashboardFragment.java +0 −8 Original line number Diff line number Diff line Loading @@ -150,13 +150,5 @@ public class NetworkDashboardFragment extends DashboardFragment implements null /* metricsFeatureProvider */, null /* fragment */, null /* mobilePlanHost */); } @Override public List<String> getNonIndexableKeys(Context context) { List<String> keys = super.getNonIndexableKeys(context); // Remove master switch as a result keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI); return keys; } }; }
src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +1 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ public class WifiMasterSwitchPreferenceController extends AbstractPreferenceCont implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener, LifecycleObserver, OnResume, OnPause, OnStart, OnStop { public static final String KEY_TOGGLE_WIFI = "toggle_wifi"; public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi"; private MasterSwitchPreference mWifiPreference; private WifiEnabler mWifiEnabler; Loading