Merge "FM: Fix the issue of FM show Chinese string"
diff --git a/fmapp2/res/values-zh-rCN/strings.xml b/fmapp2/res/values-zh-rCN/strings.xml
index 0f09f18..ad9ed0b 100644
--- a/fmapp2/res/values-zh-rCN/strings.xml
+++ b/fmapp2/res/values-zh-rCN/strings.xml
@@ -111,4 +111,6 @@
<string name="usr_def_band_max">更高的频率限制(Mhz)</string>
<string name="sel_chanl_spacing">选择信道间隔</string>
<string name="chanl_spacing">信道间隔</string>
+ <string name="set">设置</string>
+ <string name="cancel">取消</string>
</resources>
diff --git a/fmapp2/res/values/strings.xml b/fmapp2/res/values/strings.xml
index 8fdc938..ed02a50 100644
--- a/fmapp2/res/values/strings.xml
+++ b/fmapp2/res/values/strings.xml
@@ -259,5 +259,7 @@
<string name="band_sweep_setting_set">Set</string>
<string name="band_sweep_setting_cancel">Cancel</string>
<string name="band_sweep_choose">Choose Band Sweep Method</string>
+ <string name="set">Set</string>
+ <string name="cancel">Cancel</string>
</resources>
diff --git a/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java b/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java
index cac7dc1..7ec6142 100644
--- a/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java
+++ b/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java
@@ -95,8 +95,8 @@
setTitle("FM - "+MHz+"."+KHz);
mCallBack = callback;
- setButton("Set", this);
- setButton2("Cancel", (OnClickListener) null);
+ setButton(context.getString(R.string.set), this);
+ setButton2(context.getString(R.string.cancel), (OnClickListener) null);
setIcon(R.drawable.alert_dialog_icon);
LayoutInflater inflater =
diff --git a/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java b/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java
index 3c6168b..7081479 100644
--- a/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java
+++ b/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java
@@ -95,8 +95,8 @@
setTitle("FM - "+MHz+"."+KHz);
mCallBack = callback;
- setButton("Set", this);
- setButton2("Cancel", (OnClickListener) null);
+ setButton(context.getString(R.string.set), this);
+ setButton2(context.getString(R.string.cancel), (OnClickListener) null);
setIcon(R.drawable.alert_dialog_icon);
LayoutInflater inflater =