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

Commit ab06c6c4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11216811 from 303abbc3 to 24Q1-release 

Change-Id: I7c113082ff3326da404d1f01c6877256bdbb9aab
parents 9e4647dc 303abbc3

aconfig/settings_telephony_flag_declarations.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ flag { 
    description: "Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G. Allow 2G toggle cannot be hidden from users by carriers."

    bug: "300248708"

}



flag {

    name: "is_dual_sim_onboarding_enabled"

    namespace: "settings_experience"

    description: "Control the Dual SIM onobarding feature"

    bug: "298898436"

}

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -258,9 +258,6 @@ 
        com.android.settings.intelligence

    </string>



    <!-- Whether the confirmation for sim deletion is defaulted to be on or off-->

    <bool name="config_sim_deletion_confirmation_default_on">false</bool>



    <!-- Package Installer package name -->

    <string name="config_package_installer_package_name" translatable="false">

        com.android.packageinstaller

res/values/styles.xml

+1 −2
Original line number Diff line number Diff line
@@ -438,11 +438,10 @@ 
    </style>



    <style name="DeviceAudioSharingText">

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAlignment">center</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:paddingBottom">24dp</item>

    </style>



    <style name="ContextualCardStyle">

res/xml/more_security_privacy_settings.xml

+0 −8
Original line number Diff line number Diff line
@@ -204,14 +204,6 @@ 
        settings:keywords="@string/keywords_app_pinning"

        settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />



    <SwitchPreferenceCompat

        android:order="290"

        android:key="confirm_sim_deletion"

        android:title="@string/confirm_sim_deletion_title"

        android:summary="@string/confirm_sim_deletion_description"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />



    <Preference

        android:order="300"

        android:id="@+id/memtag_page"

res/xml/security_advanced_settings.xml

+0 −8
Original line number Diff line number Diff line
@@ -106,14 +106,6 @@ 
        settings:keywords="@string/keywords_app_pinning"

        settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />



    <SwitchPreferenceCompat

        android:order="290"

        android:key="confirm_sim_deletion"

        android:title="@string/confirm_sim_deletion_title"

        android:summary="@string/confirm_sim_deletion_description"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />



  <com.android.settingslib.RestrictedPreference

        android:order="300"

        android:id="@+id/memtag_page"