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

Commit 77348365 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev

parents b059ff81 bcb78eec

core/res/res/values-mcc204-mnc04/config.xml

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -63,4 +63,6 @@ 
        <item>Vodafone NL,live.vodafone.com,,,vodafone,vodafone,,,,,204,04,,DUN</item>

        <item>[ApnSettingV3]SaskTel Tethering,inet.stm.sk.ca,,,,,,,,,204,04,,DUN,,,true,0,,,,,,,gid,5A</item>

    </string-array>



    <string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">true;BAE0000000000000</string>

</resources>

core/res/res/values-mcc310-mnc004/config.xml

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,5 @@ 
    <string-array translatable="false" name="config_sms_convert_destination_number_support">

        <item>true</item>

    </string-array>



    <string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">true</string>

</resources>

core/res/res/values-mcc311-mnc480/config.xml

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -60,4 +60,5 @@ 
    <string-array translatable="false" name="config_sms_convert_destination_number_support">

        <item>true</item>

    </string-array>

    <string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">true</string>

</resources>

core/res/res/values/config.xml

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -1950,4 +1950,6 @@ 
    <!-- The maximum bitmap size that can be written to a MediaMetadata object. This value

         is the max width/height allowed in dips.-->

    <dimen name="config_mediaMetadataBitmapMaxSize">320dp</dimen>



    <string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">false</string>

</resources>

core/res/res/values/symbols.xml

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -2127,6 +2127,7 @@ 
  <java-symbol type="id" name="scrollIndicatorUp" />

  <java-symbol type="id" name="scrollIndicatorDown" />

  <java-symbol type="array" name="config_sms_convert_destination_number_support" />

  <java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" />



  <!-- From SignalStrength -->

  <java-symbol type="integer" name="config_LTE_RSRP_threshold_type" />