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

Commit 0f335180 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add flag to control Internet preference" into main

parents fa034b1b 0e9c157c

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -387,6 +387,9 @@ 
    <!-- Whether Wi-Fi hotspot speed should be shown or not. -->

    <bool name="config_show_wifi_hotspot_speed">true</bool>



    <!-- Whether or not Internet preference should be shown. -->

    <bool name="config_show_internet_settings">true</bool>



    <!-- Whether toggle_airplane is available or not. -->

    <bool name="config_show_toggle_airplane">true</bool>

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

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i 


    @Override

    public boolean isAvailable() {

        return true;

        return mContext.getResources().getBoolean(R.bool.config_show_internet_settings);

    }



    @Override

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

+6 −0
Original line number Diff line number Diff line
@@ -295,6 +295,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        final Context context = getContext();

        if (context != null && !context.getResources().getBoolean(

                R.bool.config_show_internet_settings)) {

            finish();

            return;

        }

        mAirplaneModeEnabler = new AirplaneModeEnabler(getContext(), this);



        // TODO(b/37429702): Add animations and preference comparator back after initial screen is

tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import androidx.test.annotation.UiThreadTest; 
import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.settings.R;

import com.android.settings.testutils.ResourcesUtils;

import com.android.settings.wifi.WifiPickerTrackerHelper;

import com.android.settings.wifi.WifiSummaryUpdater;
@@ -188,8 +189,9 @@ public class InternetPreferenceControllerTest { 
    }



    @Test

    public void isAvailable_shouldBeTrue() {

        assertThat(mController.isAvailable()).isTrue();

    public void isAvailable_shouldMatchPrefFlag() {

        assertThat(mController.isAvailable()).isEqualTo(

                mContext.getResources().getBoolean(R.bool.config_show_internet_settings));

    }



    @Test