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

Commit ca023772 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f 

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

Change-Id: I40d08bd3d76425c504c2f17cf73a36e36d261615
parents e7a68174 c8ee867f

res/xml/mobile_network_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- @deprecated This class will be removed in Android U, use {@link network_provider_sims_list.xml}

     instead.-->

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

res/xml/network_and_internet.xml

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- @deprecated This class will be removed in Android U, use {@link network_provider_internet.xml}

     instead.-->

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

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

+0 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr 
    protected static final String CARRIER_WIFI_NETWORK_PREF_KEY = "carrier_wifi_network";



    protected final Context mContext;

    protected boolean mIsProviderModelEnabled;

    protected int mSubId;

    protected WifiPickerTrackerHelper mWifiPickerTrackerHelper;

    protected boolean mIsCarrierProvisionWifiEnabled;
@@ -49,7 +48,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr 
            String preferenceKey) {

        super(context, preferenceKey);

        mContext = context;

        mIsProviderModelEnabled = Utils.isProviderModelEnabled(context);

    }



    /** Initialize related properties */
@@ -62,9 +60,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr 


    @Override

    public int getAvailabilityStatus() {

        if (!mIsProviderModelEnabled) {

            return CONDITIONALLY_UNAVAILABLE;

        }

        return mIsCarrierProvisionWifiEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -45,7 +45,12 @@ import java.util.Map; 
 * This populates the entries on a page which lists all available mobile subscriptions. Each entry

 * has the name of the subscription with some subtext giving additional detail, and clicking on the

 * entry brings you to a details page for that network.

 *

 * @deprecated This class will be removed in Android U, use

 * {@link NetworkProviderSimsCategoryController} and

 * {@link NetworkProviderDownloadedSimsCategoryController} instead.

 */

@Deprecated

public class MobileNetworkListController extends AbstractPreferenceController implements

        LifecycleObserver, SubscriptionsChangeListener.SubscriptionsChangeListenerClient {

    private static final String TAG = "MobileNetworkListCtlr";

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

+10 −18
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ public class MobileNetworkListFragment extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return Utils.isProviderModelEnabled(getContext())

                ? R.xml.network_provider_sims_list

                : R.xml.mobile_network_list;

        return R.xml.network_provider_sims_list;

    }



    @Override
@@ -63,7 +61,6 @@ public class MobileNetworkListFragment extends DashboardFragment { 
    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();



        if (Utils.isProviderModelEnabled(getContext())) {

        NetworkProviderSimsCategoryController simCategoryPrefCtrl =

                new NetworkProviderSimsCategoryController(context, KEY_PREFERENCE_CATEGORY_SIM,

                        getSettingsLifecycle());
@@ -72,9 +69,6 @@ public class MobileNetworkListFragment extends DashboardFragment { 
                new NetworkProviderDownloadedSimsCategoryController(context,

                        KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM, getSettingsLifecycle());

        controllers.add(downloadedSimsCategoryCtrl);

        } else {

            controllers.add(new MobileNetworkListController(getContext(), getLifecycle()));

        }



        return controllers;

    }
@@ -87,9 +81,7 @@ public class MobileNetworkListFragment extends DashboardFragment { 
                        boolean enabled) {

                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = Utils.isProviderModelEnabled(context)

                            ? R.xml.network_provider_sims_list

                            : R.xml.mobile_network_list;

                    sir.xmlResId = R.xml.network_provider_sims_list;

                    result.add(sir);

                    return result;

                }