Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-mr1-dev

diff --combined core/res/res/values/config.xml
index e21925b,ccfbf7d..82c9300
--- 1/core/res/res/values/config.xml
--- 2/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@@ -2071,11 -2071,9 +2071,11 @@@
           "bugreport" = Take bug report, if available
           "silent" = silent mode
           "users" = list of users
 +         "restart" = restart device
           -->
      <string-array translatable="false" name="config_globalActionsList">
          <item>power</item>
 +        <item>restart</item>
          <item>bugreport</item>
          <item>users</item>
      </string-array>
@@@ -2502,10 -2500,6 +2502,10 @@@
      <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
      <bool name="config_useRoundIcon">false</bool>
  
 +    <!-- Flag indicating whether the assist disclosure can be disabled using
 +         ASSIST_DISCLOSURE_ENABLED. -->
 +    <bool name="config_allowDisablingAssistDisclosure">false</bool>
 +
      <!-- True if the device supports system navigation keys. -->
      <bool name="config_supportSystemNavigationKeys">false</bool>
  
@@@ -2519,4 -2513,13 +2519,13 @@@
           Note: Also update appropriate overlay files. -->
      <string-array translatable="false" name="config_defaultFirstUserRestrictions">
      </string-array>
+ 
+     <!-- A array of regex to treat a SMS as VVM SMS if the message body matches.
+          Each item represents an entry, which consists of two parts:
+          a comma (,) separated list of MCCMNC the regex applies to, followed by a semicolon (;), and
+          then the regex itself. -->
+     <string-array translatable="false" name="config_vvmSmsFilterRegexes">
+         <!-- Verizon requires any SMS that starts with //VZWVVM to be treated as a VVM SMS-->
+         <item>310004,310010,310012,310013,310590,310890,310910,311110,311270,311271,311272,311273,311274,311275,311276,311277,311278,311279,311280,311281,311282,311283,311284,311285,311286,311287,311288,311289,311390,311480,311481,311482,311483,311484,311485,311486,311487,311488,311489;^//VZWVVM.*</item>
+     </string-array>
  </resources>

diff --combined core/res/res/values/symbols.xml
index c9ed497,5ffdb66..b31605d
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -1589,7 -1589,6 +1589,7 @@@
    <java-symbol type="string" name="bugreport_title" />
    <java-symbol type="string" name="faceunlock_multiple_failures" />
    <java-symbol type="string" name="global_action_power_off" />
 +  <java-symbol type="string" name="global_action_restart" />
    <java-symbol type="string" name="global_actions_airplane_mode_off_status" />
    <java-symbol type="string" name="global_actions_airplane_mode_on_status" />
    <java-symbol type="string" name="global_actions_toggle_airplane_mode" />
@@@ -2266,6 -2265,8 +2266,8 @@@
    <java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" />
    <java-symbol type="id" name="profile_button" />
  
+   <java-symbol type="array" name="config_vvmSmsFilterRegexes" />
+ 
    <!-- Cascading submenus -->
    <java-symbol type="dimen" name="cascading_menus_min_smallest_width" />
  
@@@ -2675,14 -2676,10 +2677,14 @@@
    <java-symbol type="drawable" name="ic_doc_generic" />
  
    <java-symbol type="bool" name="config_nightDisplayAvailable" />
 +  <java-symbol type="bool" name="config_allowDisablingAssistDisclosure" />
    <java-symbol type="integer" name="config_defaultNightDisplayAutoMode" />
    <java-symbol type="integer" name="config_defaultNightDisplayCustomStartTime" />
    <java-symbol type="integer" name="config_defaultNightDisplayCustomEndTime" />
  
    <!-- Default first user restrictions -->
    <java-symbol type="array" name="config_defaultFirstUserRestrictions" />
 +
 +  <java-symbol type="drawable" name="ic_restart" />
 +
  </resources>