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

Commit 5125477d authored by Bonian Chen's avatar Bonian Chen Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" 

* changes:
  Revert "[Settings] configuration for hidding SIM provider UI"
  Revert "[Settings] configuration for hidding SIM remove UI"
  Revert "[Settings] configuration for hidding SIM settings UI"
  Revert "[Settings] configuration for hidding SIM lock UI"
  Revert "[Settings] configuration for hidding SIM notification UI"
  Revert "[Settings] configuration for hidding SIM related UI"
parents 769d7739 a1c1bd0f

res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -626,8 +626,4 @@ 
        <item>@string/config_settingsintelligence_package_name</item>

        <item>android.uid.system:1000</item>

    </string-array>



    <!-- Whether sim related information is visible to the end user. -->

    <bool name="config_show_sim_info">true</bool>



</resources>

res/xml/my_device_info.xml

+0 −3
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
            android:order="3"

            android:title="@string/status_number"

            android:summary="@string/summary_placeholder"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"

            settings:enableCopying="true"/>

    </PreferenceCategory>
@@ -99,7 +98,6 @@ 
            android:title="@string/sim_status_title"

            settings:keywords="@string/keywords_sim_status"

            android:summary="@string/summary_placeholder"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:enableCopying="true"/>



        <!-- Model & hardware -->
@@ -121,7 +119,6 @@ 
            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_imei_info"

            settings:enableCopying="true"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>



        <!-- Android version -->

res/xml/network_provider_internet.xml

+0 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
        android:icon="@drawable/ic_calls_sms"

        android:order="-20"

        android:summary="@string/summary_placeholder"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:allowDividerBelow="true"

        settings:keywords="@string/calls_and_sms"

        settings:useAdminDisabledSummary="true" />
@@ -50,7 +49,6 @@ 
        android:order="-15"

        settings:keywords="@string/keywords_more_mobile_networks"

        settings:userRestriction="no_config_mobile_networks"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:allowDividerAbove="true"

        settings:useAdminDisabledSummary="true" />
@@ -68,7 +66,6 @@ 
        android:persistent="false"

        android:order="19"

        settings:userRestriction="no_config_mobile_networks"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

res/xml/network_provider_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
        android:key="provider_model_mobile_network"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:controller="com.android.settings.network.NetworkMobileProviderController"/>



    <com.android.settingslib.RestrictedSwitchPreference

res/xml/reset_dashboard_fragment.xml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
    <Preference

        android:key="erase_euicc_data"

        android:title="@string/reset_esim_title"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:controller="com.android.settings.network.EraseEuiccDataController" />



    <!-- Factory reset -->