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

Commit 0e9c157c authored by David Jacobo's avatar David Jacobo
Browse files

Add flag to control Internet preference 

This CL adds a flag named config_show_internet_settings so access to
Internet preference can be easily customized as Wi-fi preference was in
the past, this level of customization was lost when Internet preference
was introduced here ag/13053253.

Bug: 271203982
Test: make -j32 Settings
Test: atest -c InternetPreferenceControllerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0af54a1d3cfa26ba5f23b5d8c74ade2bb582f76f)
Merged-In: Iaf9a18f9389be089304d11bd3206d6917ab85124

Change-Id: Iaf9a18f9389be089304d11bd3206d6917ab85124
parent bc48abe0

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