diff options
| author | Ed Falk <efalk@cyngn.com> | 2015-10-01 17:59:09 -0700 |
|---|---|---|
| committer | Matt Wagantall <mwagantall@cyngn.com> | 2016-02-19 14:07:47 -0800 |
| commit | 77e07b70da2c5f430554d55b907849a87edffeae (patch) | |
| tree | bb501994865a8fa77fe1ad1d20c32216629c5ee0 | |
| parent | a0069849364e44f059a61e7880fb5f78f9b2eaea (diff) | |
| download | android_hardware_qcom_fm-77e07b70da2c5f430554d55b907849a87edffeae.tar.gz android_hardware_qcom_fm-77e07b70da2c5f430554d55b907849a87edffeae.tar.bz2 android_hardware_qcom_fm-77e07b70da2c5f430554d55b907849a87edffeae.zip | |
FMRadio : Fix settings UI bugs
Setting any user-defined parameter caused the band to switch
from user-defined to Indonesia. Fixed.
Also removed some bogus localization while I was there.
Issue-Id: CYNGNOS-778
Change-Id: I256f04eab39b820b33676bf598322d480d6dfa44
| -rw-r--r-- | fmapp2/res/values-zh-rCN/strings.xml | 2 | ||||
| -rw-r--r-- | fmapp2/src/com/caf/fmradio/Settings.java | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/fmapp2/res/values-zh-rCN/strings.xml b/fmapp2/res/values-zh-rCN/strings.xml index 8e1adb6..f206781 100644 --- a/fmapp2/res/values-zh-rCN/strings.xml +++ b/fmapp2/res/values-zh-rCN/strings.xml @@ -95,7 +95,7 @@ <string name="usr_def_band_max">最高频率(兆赫)</string> <string name="chanl_spacing">频道间隔</string> <string name="set">设置</string> - <string name="user_defind_band_msg">输入从 760 至 108.0 兆赫频率，最低包含 1 频道间隔</string> + <string name="user_defind_band_msg">输入从 76.0 至 108.0 兆赫频率，最低包含 1 频道间隔</string> <string name="fm_search_no_results">没有找到兼容的电台</string> <!-- program types --> diff --git a/fmapp2/src/com/caf/fmradio/Settings.java b/fmapp2/src/com/caf/fmradio/Settings.java index 0897ad4..55410fc 100644 --- a/fmapp2/src/com/caf/fmradio/Settings.java +++ b/fmapp2/src/com/caf/fmradio/Settings.java @@ -144,6 +144,7 @@ public class Settings extends PreferenceActivity implements mUserBandMinPref.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL); mUserBandMinPref.setDialogTitle(R.string.usr_def_band_min); + mUserBandMinPref.getEditText().setSelectAllOnFocus(true); mUserBandMaxPref = new EditTextPreference(this); mUserBandMaxPref.setKey(USER_DEFINED_BAND_MAX_KEY); @@ -151,6 +152,7 @@ public class Settings extends PreferenceActivity implements mUserBandMaxPref.setDialogTitle(R.string.usr_def_band_max); mUserBandMaxPref.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL); + mUserBandMaxPref.getEditText().setSelectAllOnFocus(true); setBandSummary(index); @@ -344,14 +346,10 @@ public class Settings extends PreferenceActivity implements && (noOfChannels > 0) && (band_width >= 100)) { FmSharedPreferences.setLowerLimit((int)freq); sendSettingsChangedIntent(FM_BAND_CHANGED); - setBandSummary(summaryBandItems.length - 1); + setBandSummary(FmSharedPreferences.REGIONAL_BAND_USER_DEFINED); clearStationList(); }else { - if ((Locale.getDefault().toString().equals("zh_HK"))) - Toast.makeText(this,"請輸入有效的頻道範圍76.0-108.0", - Toast.LENGTH_SHORT).show(); - else - Toast.makeText(this, getString(R.string.user_defind_band_msg), + Toast.makeText(this, getString(R.string.user_defind_band_msg), Toast.LENGTH_SHORT).show(); } }else if(key.equals(USER_DEFINED_BAND_MAX_KEY)) { @@ -372,14 +370,10 @@ public class Settings extends PreferenceActivity implements && (noOfChannels > 0) && (band_width >= 100)) { FmSharedPreferences.setUpperLimit((int)freq); sendSettingsChangedIntent(FM_BAND_CHANGED); - setBandSummary(summaryBandItems.length - 1); + setBandSummary(FmSharedPreferences.REGIONAL_BAND_USER_DEFINED); clearStationList(); }else { - if ((Locale.getDefault().toString().equals("zh_HK"))) - Toast.makeText(this,"請輸入有效的頻道範圍76.0-108.0", - Toast.LENGTH_SHORT).show(); - else - Toast.makeText(this, getString(R.string.user_defind_band_msg), + Toast.makeText(this, getString(R.string.user_defind_band_msg), Toast.LENGTH_SHORT).show(); } }else { |