FM radio: Add 'Vietnam' to 'Regional Band' list in settings

YAM-295

Change-Id: I13b8d931fe06c98a91e8821d56fd5317ed88fc36

3 files changed, 39 insertions, 24 deletions

diff --git a/fmapp2/res/values/arrays.xml b/fmapp2/res/values/arrays.xml
index 9358480..bb31631 100644
--- a/fmapp2/res/values/arrays.xml
+++ b/fmapp2/res/values/arrays.xml
@@ -208,6 +208,7 @@
     <item>@string/regional_band_entry_greece</item>
     <item>@string/regional_band_entry_hong_kong</item>
     <item>@string/regional_band_entry_india</item>
+    <item>@string/regional_band_entry_indonesia</item>
     <item>@string/regional_band_entry_ireland</item>
     <item>@string/regional_band_entry_italy</item>
     <item>@string/regional_band_entry_korea</item>
@@ -227,8 +228,8 @@
     <item>@string/regional_band_entry_turkey</item>
     <item>@string/regional_band_entry_united_kingdom</item>
     <item>@string/regional_band_entry_united_states</item>
+    <item>@string/regional_band_entry_vietnam</item>
     <item>@string/regional_band_entry_user_defined</item>
-    <item>@string/regional_band_entry_indonesia</item>
   </string-array>
 
   <string-array name="regional_band_values" translatable="false">
@@ -270,6 +271,7 @@
     <item>35</item>
     <item>36</item>
     <item>37</item>
+    <item>38</item>
   </string-array>
 
   <string-array name="regional_band_summary" translatable="false">
@@ -290,6 +292,7 @@
     <item>@string/regional_band_summary_greece</item>
     <item>@string/regional_band_summary_hong_kong</item>
     <item>@string/regional_band_summary_india</item>
+    <item>@string/regional_band_summary_indonesia</item>
     <item>@string/regional_band_summary_ireland</item>
     <item>@string/regional_band_summary_italy</item>
     <item>@string/regional_band_summary_korea</item>
@@ -309,8 +312,8 @@
     <item>@string/regional_band_summary_turkey</item>
     <item>@string/regional_band_summary_united_kingdom</item>
     <item>@string/regional_band_summary_united_states</item>
+    <item>@string/regional_band_summary_vietnam</item>
     <item>@string/regional_band_summary_user_defined</item>
-    <item>@string/regional_band_summary_indonesia</item>
   </string-array>
 
   <string-array name="channel_spacing_val" translatable="false">
diff --git a/fmapp2/res/values/strings.xml b/fmapp2/res/values/strings.xml
index b43e689..4824ee9 100644
--- a/fmapp2/res/values/strings.xml
+++ b/fmapp2/res/values/strings.xml
@@ -103,6 +103,7 @@
     <string name="regional_band_entry_turkey">Turkey</string>
     <string name="regional_band_entry_united_kingdom">United Kingdom</string>
     <string name="regional_band_entry_united_states">United States</string>
+    <string name="regional_band_entry_vietnam">Vietnam</string>
     <string name="regional_band_entry_user_defined">User defined band</string>
 
     <string name="regional_band_summary_north_america">North America (87.5MHz to 108.0MHz in 200 KHz steps)</string>
@@ -142,6 +143,7 @@
     <string name="regional_band_summary_turkey">Turkey (87.5MHz to 108.0MHz in 100 KHz steps)</string>
     <string name="regional_band_summary_united_kingdom">United Kingdom (87.5MHz to 108.0MHz in 100 KHz steps)</string>
     <string name="regional_band_summary_united_states">United States (88.1MHz to 107.9MHz in 200 KHz steps)</string>
+    <string name="regional_band_summary_vietnam">Vietnam (87.5MHz to 108.0MHz in 100 KHz steps)</string>
     <string name="regional_band_summary_user_defined">User defined band</string>
 
     <string name="aud_output_mode">Audio output mode</string>
diff --git a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
index 838d1e9..ab24883 100644
--- a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
+++ b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
@@ -60,27 +60,29 @@ public class FmSharedPreferences
    public static final int REGIONAL_BAND_GREECE          = 14;
    public static final int REGIONAL_BAND_HONGKONG        = 15;
    public static final int REGIONAL_BAND_INDIA           = 16;
-   public static final int REGIONAL_BAND_IRELAND         = 17;
-   public static final int REGIONAL_BAND_ITALY           = 18;
-   public static final int REGIONAL_BAND_KOREA           = 19;
-   public static final int REGIONAL_BAND_MEXICO          = 20;
-   public static final int REGIONAL_BAND_NETHERLANDS     = 21;
-   public static final int REGIONAL_BAND_NEWZEALAND      = 22;
-   public static final int REGIONAL_BAND_NORWAY          = 23;
-   public static final int REGIONAL_BAND_POLAND          = 24;
-   public static final int REGIONAL_BAND_PORTUGAL        = 25;
-   public static final int REGIONAL_BAND_RUSSIA          = 26;
-   public static final int REGIONAL_BAND_SINGAPORE       = 27;
-   public static final int REGIONAL_BAND_SLOVAKIA        = 28;
-   public static final int REGIONAL_BAND_SPAIN           = 29;
-   public static final int REGIONAL_BAND_SWITZERLAND     = 30;
-   public static final int REGIONAL_BAND_SWEDEN          = 31;
-   public static final int REGIONAL_BAND_TAIWAN          = 32;
-   public static final int REGIONAL_BAND_TURKEY          = 33;
-   public static final int REGIONAL_BAND_UNITEDKINGDOM   = 34;
-   public static final int REGIONAL_BAND_UNITED_STATES   = 35;
-   public static final int REGIONAL_BAND_USER_DEFINED    = 36;
-   public static final int REGIONAL_BAND_INDONESIA       = 37;
+   public static final int REGIONAL_BAND_INDONESIA       = 17;
+   public static final int REGIONAL_BAND_IRELAND         = 18;
+   public static final int REGIONAL_BAND_ITALY           = 19;
+   public static final int REGIONAL_BAND_KOREA           = 20;
+   public static final int REGIONAL_BAND_MEXICO          = 21;
+   public static final int REGIONAL_BAND_NETHERLANDS     = 22;
+   public static final int REGIONAL_BAND_NEWZEALAND      = 23;
+   public static final int REGIONAL_BAND_NORWAY          = 24;
+   public static final int REGIONAL_BAND_POLAND          = 25;
+   public static final int REGIONAL_BAND_PORTUGAL        = 26;
+   public static final int REGIONAL_BAND_RUSSIA          = 27;
+   public static final int REGIONAL_BAND_SINGAPORE       = 28;
+   public static final int REGIONAL_BAND_SLOVAKIA        = 29;
+   public static final int REGIONAL_BAND_SPAIN           = 30;
+   public static final int REGIONAL_BAND_SWITZERLAND     = 31;
+   public static final int REGIONAL_BAND_SWEDEN          = 32;
+   public static final int REGIONAL_BAND_TAIWAN          = 33;
+   public static final int REGIONAL_BAND_TURKEY          = 34;
+   public static final int REGIONAL_BAND_UNITEDKINGDOM   = 35;
+   public static final int REGIONAL_BAND_UNITED_STATES   = 36;
+   public static final int REGIONAL_BAND_VIETNAM         = 37;
+   public static final int REGIONAL_BAND_USER_DEFINED    = 38;
+
    // If you add to this list, add to getBand() below as well.
 
    public static final int RECORD_DUR_INDEX_0_VAL        = 5;
@@ -1098,6 +1100,13 @@ public class FmSharedPreferences
             mFrequencyBand_Stepsize = 100;
             break;
         }
+        case REGIONAL_BAND_VIETNAM:
+        {
+            /*VIETNAM : 87500 TO 108000 IN 100 KHZ STEPS*/
+            mFrequencyBand_Stepsize = 100;
+            break;
+        }
+
         case REGIONAL_BAND_USER_DEFINED:
         {
           mFMConfiguration.setRadioBand(FmReceiver.FM_USER_DEFINED_BAND);
@@ -1222,6 +1231,7 @@ public class FmSharedPreferences
          {"GR"},    // REGIONAL_BAND_GREECE
          {"HK"},    // REGIONAL_BAND_HONGKONG
          {"IN"},    // REGIONAL_BAND_INDIA
+         {"ID"},    // REGIONAL_BAND_INDONESIA
          {"IE"},    // REGIONAL_BAND_IRELAND
          {"IT"},    // REGIONAL_BAND_ITALY
          {"KR"},    // REGIONAL_BAND_KOREA
@@ -1241,8 +1251,8 @@ public class FmSharedPreferences
          {"TR"},    // REGIONAL_BAND_TURKEY
          {"GB","GG","IM","JE"},    // REGIONAL_BAND_UNITEDKINGDOM
          {"US"},    // REGIONAL_BAND_UNITED_STATES
+         {"VN"},    // REGIONAL_BAND_VIETNAM
          {"--"},    // REGIONAL_BAND_USER_DEFINED (handled elsewhere)
-         {"ID"},    // REGIONAL_BAND_INDONESIA
       };
       for (int band = 0; band < countries.length; ++band) {
          for (String cc : countries[band]) {