Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3e90e92 authored by Weng Su's avatar Weng Su Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev am: 5c82ddf0 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2179d2900be82ad280b0b881569d555a44564dd
parents 90e7e5f7 5c82ddf0

res/values/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -12691,10 +12691,8 @@ 
    <string name="provider_internet_settings">Internet</string>

    <!-- Provider Model: SIMs controls settings screen, item title to go into the SIMs settings -->

    <string name="provider_network_settings_title">SIMs</string>

    <!-- Provider Model: Airplane mode networks controls settings screen -->

    <string name="airplane_safe_networks">Show airplane mode networks</string>

    <!-- Provider Model: Summary for showing airplane mode networks-->

    <string name="airplane_safe_networks_summary">Find and connect to networks in airplane mode.</string>

    <!-- Provider Model: Summary for Wi-Fi switch [CHAR LIMIT=NONE] -->

    <string name="wifi_switch_summary">Find and connect to Wi\u2011Fi networks</string>

    <!-- Provider Model: List of synonyms for the airplane-safe networks, used to match in settings search [CHAR LIMIT=NONE] -->

    <string name="keywords_airplane_safe_networks">airplane, airplane-safe</string>

    <!-- Provider Model: Calls and SMS controllers settings screen, item title to go into the Calls and SMS settings -->

res/xml/network_provider_internet.xml

+0 −9
Original line number Diff line number Diff line
@@ -61,15 +61,6 @@ 
        settings:controller="com.android.settings.network.AirplaneModePreferenceController"

        settings:userRestriction="no_airplane_mode"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="airplane_safe_networks"

        android:title="@string/airplane_safe_networks"

        android:icon="@drawable/ic_airplane_safe_networks_24dp"

        android:summary="@string/airplane_safe_networks_summary"

        android:order="-4"

        settings:userRestriction="no_airplane_mode"

        settings:keywords="@string/keywords_airplane_safe_networks" />



    <com.android.settingslib.RestrictedPreference

        android:key="manage_mobile_plan"

        android:title="@string/manage_mobile_plan_title"

res/xml/network_provider_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ 
        android:key="access_points"

        android:layout="@layout/preference_category_no_label"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="wifi_switch"

        android:title="@string/wifi"

        android:summary="@string/wifi_switch_summary"

        settings:allowDividerAbove="true"

        settings:keywords="@string/keywords_wifi"/>



    <Preference

        android:key="configure_wifi_settings"

        android:title="@string/network_and_internet_preferences_title"

src/com/android/settings/network/NetworkDashboardFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements 
        controllers.add(privateDnsPreferenceController);

        if (Utils.isProviderModelEnabled(context)) {

            controllers.add(new NetworkProviderCallsSmsController(context, lifecycle));

            controllers.add(new AirplaneSafeNetworksPreferenceController(context, lifecycle));

        }

        return controllers;

    }

src/com/android/settings/network/NetworkProviderSettings.java

+10 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
    private PreferenceCategory mWifiEntryPreferenceCategory;

    @VisibleForTesting

    AddWifiNetworkPreference mAddWifiNetworkPreference;

    private WifiSwitchPreferenceController mWifiSwitchPreferenceController;

    @VisibleForTesting

    Preference mConfigureWifiSettingsPreference;

    @VisibleForTesting
@@ -270,6 +271,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        addNetworkMobileProviderController();

        addViewAirplaneModeNetworksButtonController();

        addConnectedEthernetNetworkController();

        addWifiSwitchPreferenceController();

    }



    private void addNetworkMobileProviderController() {
@@ -298,6 +300,14 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        mConnectedEthernetNetworkController.displayPreference(getPreferenceScreen());

    }



    private void addWifiSwitchPreferenceController() {

        if (mWifiSwitchPreferenceController == null) {

            mWifiSwitchPreferenceController =

                    new WifiSwitchPreferenceController(getContext(), getSettingsLifecycle());

        }

        mWifiSwitchPreferenceController.displayPreference(getPreferenceScreen());

    }



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);