summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2014-11-17 14:23:44 -0800
committerEthan Chen <intervigil@gmail.com>2015-01-08 12:36:57 -0800
commit659fb041e31008a33b1ca62c073bd6af607ccf01 (patch)
tree090d58289174d1baa217e7ca94534acb5600ec05
parent74afab6ba11e584babcbb5489611616f624cbc25 (diff)
downloadandroid_hardware_qcom_fm-659fb041e31008a33b1ca62c073bd6af607ccf01.tar.gz
android_hardware_qcom_fm-659fb041e31008a33b1ca62c073bd6af607ccf01.tar.bz2
android_hardware_qcom_fm-659fb041e31008a33b1ca62c073bd6af607ccf01.zip
Fm : Make default country an overlay
Change-Id: I219e2a51939af7d65c4a0ed8eb87134ca7f986ee
-rw-r--r--fmapp2/res/values/integers.xml33
-rw-r--r--fmapp2/src/com/caf/fmradio/FmSharedPreferences.java3
2 files changed, 35 insertions, 1 deletions
diff --git a/fmapp2/res/values/integers.xml b/fmapp2/res/values/integers.xml
new file mode 100644
index 0000000..a1698e1
--- /dev/null
+++ b/fmapp2/res/values/integers.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2009, 2011-2013 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2014 The CyanogenMod Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of The Linux Foundation nor
+ * the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Look at FmSharedPreferences.java for index -->
+ <integer name="default_country_index">0</integer>
+</resources>
diff --git a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
index 1a39b17..a20bd50 100644
--- a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
+++ b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
@@ -499,7 +499,8 @@ public class FmSharedPreferences
if (Locale.getDefault().equals(Locale.CHINA)) {
setCountry(sp.getInt(FMCONFIG_COUNTRY, REGIONAL_BAND_CHINA));
} else {
- setCountry(sp.getInt(FMCONFIG_COUNTRY, REGIONAL_BAND_NORTH_AMERICA));
+ int defaultIndex = mContext.getResources().getInteger(R.integer.default_country_index);
+ setCountry(sp.getInt(FMCONFIG_COUNTRY, defaultIndex));
}
/* Last list the user was navigating */
mListIndex = sp.getInt(LAST_LIST_INDEX, 0);