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

Commit a980758c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31 

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

Change-Id: I046e1e97d1f195147c65b7676326afd5e1121fb0
parents 289bdbe5 8e98df31

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -13404,8 +13404,10 @@ 
    <string name="carrier_wifi_network_title">W+ network</string>

    <!-- Provider Model: title of SIM category -->

    <string name="sim_category_title">SIM</string>

    <!-- Provider Model: title of Downloaded category. [CHAR LIMIT=50] -->

    <!-- Provider Model: title of Downloaded SIM category. [CHAR LIMIT=50] -->

    <string name="downloaded_sim_category_title">DOWNLOADED SIM</string>

    <!-- Provider Model: title of Downloaded SIMs category. [CHAR LIMIT=50] -->

    <string name="downloaded_sims_category_title">DOWNLOADED SIMS</string>

    <!-- Provider Model: summary of Active in SIM category. [CHAR LIMIT=50] -->

    <string name="sim_category_active_sim">Active</string>

    <!-- Provider Model: summary of Inactive in SIM category. [CHAR LIMIT=50] -->

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

+15 −2
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ package com.android.settings.network; 
import android.content.Context;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.widget.PreferenceCategoryController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -15,6 +17,7 @@ public class NetworkProviderDownloadedSimsCategoryController extends 


    private static final String KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM =

            "provider_model_downloaded_sim_category";

    private PreferenceCategory mPreferenceCategory;

    private NetworkProviderDownloadedSimListController mNetworkProviderDownloadedSimListController;



    public NetworkProviderDownloadedSimsCategoryController(Context context, String key) {
@@ -44,9 +47,19 @@ public class NetworkProviderDownloadedSimsCategoryController extends 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        PreferenceCategory preferenceCategory = screen.findPreference(

        mPreferenceCategory = screen.findPreference(

                KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM);

        preferenceCategory.setVisible(isAvailable());

        mPreferenceCategory.setVisible(isAvailable());

        mNetworkProviderDownloadedSimListController.displayPreference(screen);

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        int count = mPreferenceCategory.getPreferenceCount();

        String title = mContext.getString(count > 1

                ? R.string.downloaded_sims_category_title

                : R.string.downloaded_sim_category_title);

        mPreferenceCategory.setTitle(title);

    }

}