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

Commit 34116c78 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Unhide signal strength carrier config"

parents ff38f236 a59a5eb7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40237,6 +40237,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";

    field public static final java.lang.String KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL = "show_signal_strength_in_sim_status_bool";

    field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final java.lang.String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+5 −6
Original line number Diff line number Diff line
@@ -735,12 +735,11 @@ public class CarrierConfigManager { 
    public static final String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";



    /**

     * Flag specifying whether signal strength is hidden in SIM Status screen,

     * default to false.

     * @hide

     * Flag specifying whether the {@link android.telephony.SignalStrength} is shown in the SIM

     * Status screen. The default value is true.

     */

    public static final String KEY_HIDE_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL =

        "hide_signal_strength_in_sim_status_bool";

    public static final String KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL =

        "show_signal_strength_in_sim_status_bool";



    /**

     * Flag specifying whether an additional (client initiated) intent needs to be sent on System
@@ -1801,7 +1800,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, "");

        sDefaults.putStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, true);

        sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false);

        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, "");

        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, "");