fm: Added chinese language string resource
FM app does not display some of the menu items in
chinese language when chinese language is chosen
from system setting app.
Change-Id: I072dd5600de9cf5a7d12241f8cf38515f135f7ac
CRs-Fixed: 574331
diff --git a/fmapp2/res/values-zh-rCN/strings.xml b/fmapp2/res/values-zh-rCN/strings.xml
index 1a5cdf3..0f09f18 100644
--- a/fmapp2/res/values-zh-rCN/strings.xml
+++ b/fmapp2/res/values-zh-rCN/strings.xml
@@ -106,5 +106,9 @@
<string name="station_name_exist">已存在名为\"<xliff:g id="name">%s</xliff:g>\"的电台，请输入其他名称。</string>
<!-- the title of rename dialog lack of translation -->
<string name="dialog_presetlist_rename_title">"请输入名字"</string>
-
+ <string name="menu_display_tags">显示标签</string>
+ <string name="usr_def_band_min">下限频率（Mhz）</string>
+ <string name="usr_def_band_max">更高的频率限制(Mhz)</string>
+ <string name="sel_chanl_spacing">选择信道间隔</string>
+ <string name="chanl_spacing">信道间隔</string>
</resources>
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 523bb1c..df97413 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -237,7 +237,7 @@
private static boolean mIsSeeking = false;
private static boolean mIsSearching = false;
private static int mScanPty = 0;
-
+ private static int mScanPtyIndex = 0;
private Animation mAnimation = null;
private ScrollerText mRadioTextScroller = null;
private ScrollerText mERadioTextScroller = null;
@@ -1049,6 +1049,7 @@
Toast.LENGTH_SHORT);
int pty = Integer.parseInt(values[item]);
clearStationList();
+ mScanPtyIndex = item;
initiateSearch(pty);
}
}
@@ -1171,6 +1172,7 @@
private Dialog createProgressDialog(int id) {
String msgStr = "";
String titleStr = "";
+ String []items;
double frequency = mTunedStation.getFrequency() / 1000.0;
boolean bSearchActive = false;
@@ -1178,10 +1180,20 @@
msgStr = getString(R.string.msg_seeking);
bSearchActive = true;
}else if (isScanActive()) {
- String ptyStr = PresetStation.parsePTY(mScanPty);
+ if(FmSharedPreferences.isRBDSStd()) {
+ items = getResources().
+ getStringArray(R.array.search_category_rbds_entries);
+ }else { // if(FmSharedPreferences.isRDSStd())
+ items = getResources().
+ getStringArray(R.array.search_category_rds_entries);
+ }
+ String ptyStr = "";
+ if (items.length > mScanPtyIndex)
+ ptyStr = items[mScanPtyIndex];
if (!TextUtils.isEmpty(ptyStr)) {
msgStr = getString(R.string.msg_scanning_pty, ptyStr);
}else {
+ Log.d(LOGTAG, "pty is null\n");
msgStr = getString(R.string.msg_scanning);
}
titleStr = getString(R.string.msg_search_title, ("" + frequency));
@@ -2606,6 +2618,7 @@
public void run() {
Log.d(LOGTAG, "mSearchComplete: ");
mScanPty=0;
+ mScanPtyIndex = 0;
mIsScaning = false;
mIsSeeking = false;
mIsSearching = false;
@@ -3023,6 +3036,7 @@
public void onSearchComplete() {
Log.d(LOGTAG, "mServiceCallbacks.onSearchComplete :");
mScanPty = 0;
+ mScanPtyIndex = 0;
mIsScaning = false;
mIsSeeking = false;
mIsSearching = false;