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

Commit 6f3820c2 authored by Weng Su's avatar Weng Su
Browse files

Hide categories to avoid taking up extra space 

- Hide all Ethernet categories by default

Bug: 407451274
Flag: EXEMPT refactor
Test: Manual testing
  atest ConnectedEthernetNetworkControllerTest
  atest NetworkProviderSettingsTest
Change-Id: Iba9923457cf7905c25baa30a0934dad142d3ebcc
parent 55739cd5

res/xml/network_provider_settings.xml

+10 −7
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ 
        settings:allowDividerBelow="true"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="ethernet_interfaces">

        android:key="ethernet_interfaces"

        settings:isPreferenceVisible="false">

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="main_toggle_ethernet"

            android:title="@string/ethernet"
@@ -45,7 +46,9 @@ 
            settings:allowDividerAbove="true"/>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="connected_ethernet_category"

        settings:isPreferenceVisible="false">

        <Preference

            android:key="connected_ethernet_network"

            android:title="@string/ethernet"

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

+8 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.drawable.Drawable; 


import androidx.lifecycle.Lifecycle;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;
@@ -35,8 +36,10 @@ import com.android.settingslib.core.AbstractPreferenceController; 
public class ConnectedEthernetNetworkController extends AbstractPreferenceController

        implements InternetUpdater.InternetChangeListener {



    public static final String KEY = "connected_ethernet_network";

    public static final String KEY = "connected_ethernet_category";

    public static final String KEY_NETWORK = "connected_ethernet_network";



    private PreferenceCategory mCategory;

    private Preference mPreference;

    private InternetUpdater mInternetUpdater;

    private @InternetUpdater.InternetType int mInternetType;
@@ -60,7 +63,8 @@ public class ConnectedEthernetNetworkController extends AbstractPreferenceContro 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(KEY);

        mCategory = screen.findPreference(KEY);

        mPreference = screen.findPreference(KEY_NETWORK);

        final Drawable drawable = mContext.getDrawable(R.drawable.ic_settings_ethernet);

        if (drawable != null) {

            drawable.setTintList(
@@ -76,8 +80,8 @@ public class ConnectedEthernetNetworkController extends AbstractPreferenceContro 
     */

    public void onInternetTypeChanged(@InternetUpdater.InternetType int internetType) {

        mInternetType = internetType;

        if (mPreference != null) {

            mPreference.setVisible(isAvailable());

        if (mCategory != null) {

            mCategory.setVisible(isAvailable());

        }

    }

}

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

+0 −1
Original line number Diff line number Diff line
@@ -411,7 +411,6 @@ public class NetworkProviderSettings extends RestrictedDashboardFragment 
        if (com.android.settings.connectivity.Flags.ethernetSettings()) {

            addEthernetSwitchPreferenceController();

        } else {

            mEthernetSwitchPreference.setVisible(false);

            addConnectedEthernetNetworkController();

        }

        mWifiStatusMessagePreference = findPreference(PREF_KEY_WIFI_STATUS_MESSAGE);

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

+10 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.Looper; 


import androidx.lifecycle.Lifecycle;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;

import androidx.test.core.app.ApplicationProvider;
@@ -56,6 +57,7 @@ public class ConnectedEthernetNetworkControllerTest { 
    private Context mContext;

    private ConnectedEthernetNetworkController mController;

    private PreferenceScreen mScreen;

    private PreferenceCategory mCategory;

    private Preference mPreference;



    @Before
@@ -71,8 +73,11 @@ public class ConnectedEthernetNetworkControllerTest { 
        }

        final PreferenceManager preferenceManager = new PreferenceManager(mContext);

        mScreen = preferenceManager.createPreferenceScreen(mContext);

        mCategory = new PreferenceCategory(mContext);

        mCategory.setKey(ConnectedEthernetNetworkController.KEY);

        mScreen.addPreference(mCategory);

        mPreference = new Preference(mContext);

        mPreference.setKey(ConnectedEthernetNetworkController.KEY);

        mPreference.setKey(ConnectedEthernetNetworkController.KEY_NETWORK);

        mScreen.addPreference(mPreference);

    }
@@ -116,11 +121,11 @@ public class ConnectedEthernetNetworkControllerTest { 
        mController.displayPreference(mScreen);

        mController.onInternetTypeChanged(INTERNET_WIFI);



        assertThat(mPreference.isVisible()).isFalse();

        assertThat(mCategory.isVisible()).isFalse();



        mController.onInternetTypeChanged(INTERNET_ETHERNET);



        assertThat(mPreference.isVisible()).isTrue();

        assertThat(mCategory.isVisible()).isTrue();

    }



    @Test
@@ -128,10 +133,10 @@ public class ConnectedEthernetNetworkControllerTest { 
        mController.displayPreference(mScreen);

        mController.onInternetTypeChanged(INTERNET_ETHERNET);



        assertThat(mPreference.isVisible()).isTrue();

        assertThat(mCategory.isVisible()).isTrue();



        mController.onInternetTypeChanged(INTERNET_CELLULAR);



        assertThat(mPreference.isVisible()).isFalse();

        assertThat(mCategory.isVisible()).isFalse();

    }

}