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

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

Merge "Support zero state style in Choose network settingis" into main

parents 559d83a3 d3e7b8c5

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -12492,7 +12492,7 @@ Data usage charges may apply.</string> 
    <!-- Available networks screen, text when a network cannot be connected [CHAR LIMIT=60] -->

    <string name="network_could_not_connect">Couldn\u2019t connect</string>

    <!-- Available networks screen, text when no networks are found [CHAR LIMIT=NONE] -->

    <string name="empty_networks_list">No networks found.</string>

    <string name="empty_networks_list">No networks found</string>

    <!-- Available networks screen, toast when an error is encountered when searching for networks [CHAR LIMIT=NONE] -->

    <string name="network_query_error">Couldn\u2019t find networks. Try again.</string>

    <!-- Text to show this network is forbidden [CHAR LIMIT=NONE] -->

src/com/android/settings/network/telephony/NetworkSelectSettings.java

+7 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.settings.network.telephony.scan.NetworkScanRepository; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.utils.ThreadUtils;

import com.android.settingslib.widget.ZeroStatePreference;



import com.google.common.collect.ImmutableList;
@@ -81,7 +82,7 @@ public class NetworkSelectSettings extends DashboardFragment { 
    @VisibleForTesting

    NetworkOperatorPreference mSelectedPreference;

    private View mProgressHeader;

    private Preference mStatusMessagePreference;

    private ZeroStatePreference mStatusMessagePreference;

    @VisibleForTesting

    @NonNull

    List<CellInfo> mCellInfoList = ImmutableList.of();
@@ -116,8 +117,6 @@ public class NetworkSelectSettings extends DashboardFragment { 
        mSubId = getSubId();



        mPreferenceCategory = getPreferenceCategory(PREF_KEY_NETWORK_OPERATORS);

        mStatusMessagePreference = new Preference(context);

        mStatusMessagePreference.setSelectable(false);

        mSelectedPreference = null;

        mTelephonyManager = getTelephonyManager(context, mSubId);

        mSatelliteManager = getSatelliteManager(context);
@@ -487,6 +486,11 @@ public class NetworkSelectSettings extends DashboardFragment { 
    }



    private void addMessagePreference(int messageId) {

        if (mStatusMessagePreference == null) {

            mStatusMessagePreference = new ZeroStatePreference(getContext());

            mStatusMessagePreference.setIcon(R.drawable.ic_homepage_search);

            mStatusMessagePreference.setSelectable(false);

        }

        mStatusMessagePreference.setTitle(messageId);

        mPreferenceCategory.removeAll();

        mPreferenceCategory.addPreference(mStatusMessagePreference);