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

Commit 647b437d authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

parents d23f8b44 e6edb161
Loading
Loading
Loading
Loading
+27 −0
Original line number Diff line number Diff line
@@ -31,4 +31,31 @@
    <!-- If this value is true, The mms content-disposition field is supported correctly.
         If false, Content-disposition fragments are ignored -->
    <bool name="config_mms_content_disposition_support">false</bool>

    <!-- An array of CDMA roaming indicators which means international roaming -->
    <integer-array translatable="false" name="config_cdma_international_roaming_indicators" >
        <item>2</item>
        <item>74</item>
        <item>124</item>
        <item>125</item>
        <item>126</item>
        <item>157</item>
        <item>158</item>
        <item>159</item>
        <item>193</item>
        <item>194</item>
        <item>195</item>
        <item>196</item>
        <item>197</item>
        <item>198</item>
        <item>228</item>
        <item>229</item>
        <item>230</item>
        <item>231</item>
        <item>232</item>
        <item>233</item>
        <item>234</item>
        <item>235</item>
    </integer-array>

</resources>
+27 −0
Original line number Diff line number Diff line
@@ -23,4 +23,31 @@

    <!-- Sprint need a 70 ms delay for 3way call -->
    <integer name="config_cdma_3waycall_flash_delay">70</integer>

    <!-- An array of CDMA roaming indicators which means international roaming -->
    <integer-array translatable="false" name="config_cdma_international_roaming_indicators" >
        <item>2</item>
        <item>74</item>
        <item>124</item>
        <item>125</item>
        <item>126</item>
        <item>157</item>
        <item>158</item>
        <item>159</item>
        <item>193</item>
        <item>194</item>
        <item>195</item>
        <item>196</item>
        <item>197</item>
        <item>198</item>
        <item>228</item>
        <item>229</item>
        <item>230</item>
        <item>231</item>
        <item>232</item>
        <item>233</item>
        <item>234</item>
        <item>235</item>
    </integer-array>

</resources>
+27 −0
Original line number Diff line number Diff line
@@ -27,4 +27,31 @@

    <!-- Sprint need a 70 ms delay for 3way call -->
    <integer name="config_cdma_3waycall_flash_delay">70</integer>

    <!-- An array of CDMA roaming indicators which means international roaming -->
    <integer-array translatable="false" name="config_cdma_international_roaming_indicators" >
        <item>2</item>
        <item>74</item>
        <item>124</item>
        <item>125</item>
        <item>126</item>
        <item>157</item>
        <item>158</item>
        <item>159</item>
        <item>193</item>
        <item>194</item>
        <item>195</item>
        <item>196</item>
        <item>197</item>
        <item>198</item>
        <item>228</item>
        <item>229</item>
        <item>230</item>
        <item>231</item>
        <item>232</item>
        <item>233</item>
        <item>234</item>
        <item>235</item>
    </integer-array>

</resources>
+27 −0
Original line number Diff line number Diff line
@@ -27,4 +27,31 @@

    <!-- Sprint need a 70 ms delay for 3way call -->
    <integer name="config_cdma_3waycall_flash_delay">70</integer>

    <!-- An array of CDMA roaming indicators which means international roaming -->
    <integer-array translatable="false" name="config_cdma_international_roaming_indicators" >
        <item>2</item>
        <item>74</item>
        <item>124</item>
        <item>125</item>
        <item>126</item>
        <item>157</item>
        <item>158</item>
        <item>159</item>
        <item>193</item>
        <item>194</item>
        <item>195</item>
        <item>196</item>
        <item>197</item>
        <item>198</item>
        <item>228</item>
        <item>229</item>
        <item>230</item>
        <item>231</item>
        <item>232</item>
        <item>233</item>
        <item>234</item>
        <item>235</item>
    </integer-array>

</resources>
+4 −0
Original line number Diff line number Diff line
@@ -1952,4 +1952,8 @@
    <dimen name="config_mediaMetadataBitmapMaxSize">320dp</dimen>

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

    <!-- An array of CDMA roaming indicators which means international roaming -->
    <integer-array translatable="false" name="config_cdma_international_roaming_indicators" />

</resources>
Loading