am b24373e0: am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev

* commit 'b24373e04a767d81d2f58c1398495214ef181328':
  Add config resource to help ATT prepaid
This commit is contained in:
Robert Greenwalt
2012-10-09 13:34:07 -07:00
committed by Android Git Automerger
2 changed files with 6 additions and 0 deletions

View File

@@ -988,4 +988,9 @@
<!-- Whether camera shutter sound is forced or not (country specific). --> <!-- Whether camera shutter sound is forced or not (country specific). -->
<bool name="config_camera_sound_forced">false</bool> <bool name="config_camera_sound_forced">false</bool>
<!-- Set to true if we need to not prefer an APN.
This is being added to enable a simple scenario of pre-paid
provisioning on some carriers, working around a bug (7305641)
where if the preferred is used we don't try the others. -->
<bool name="config_dontPreferApn">false</bool>
</resources> </resources>

View File

@@ -276,6 +276,7 @@
<java-symbol type="bool" name="config_useDevInputEventForAudioJack" /> <java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
<java-symbol type="bool" name="config_safe_media_volume_enabled" /> <java-symbol type="bool" name="config_safe_media_volume_enabled" />
<java-symbol type="bool" name="config_camera_sound_forced" /> <java-symbol type="bool" name="config_camera_sound_forced" />
<java-symbol type="bool" name="config_dontPreferApn" />
<java-symbol type="integer" name="config_cursorWindowSize" /> <java-symbol type="integer" name="config_cursorWindowSize" />
<java-symbol type="integer" name="config_longPressOnPowerBehavior" /> <java-symbol type="integer" name="config_longPressOnPowerBehavior" />