diff options
| author | Ed Falk <efalk@cyngn.com> | 2015-10-01 17:59:09 -0700 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-10-12 12:26:37 -0700 |
| commit | 77250415430fdf2b501b4ed32a279e7b82d06f80 (patch) | |
| tree | 50f71e60b7bfaf09a2629424e8137e3ccb92747f | |
| parent | dfd1a96ad223be7c5a7f6c95a2fad5a46f6f16de (diff) | |
| download | android_hardware_qcom_fm-77250415430fdf2b501b4ed32a279e7b82d06f80.tar.gz android_hardware_qcom_fm-77250415430fdf2b501b4ed32a279e7b82d06f80.tar.bz2 android_hardware_qcom_fm-77250415430fdf2b501b4ed32a279e7b82d06f80.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
(cherry picked from commit 0a805b5822d7e0de19c88aba38339d4ac65be876)
| -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 ae3f2a8..b3cbea0 100644 --- a/fmapp2/res/values-zh-rCN/strings.xml +++ b/fmapp2/res/values-zh-rCN/strings.xml @@ -95,6 +95,6 @@ <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> </resources> diff --git a/fmapp2/src/com/caf/fmradio/Settings.java b/fmapp2/src/com/caf/fmradio/Settings.java index 08f9ea7..766aad7 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); @@ -331,14 +333,10 @@ public class Settings extends PreferenceActivity implements if((freq > 0) && (freq < max_freq) && (freq >= 76000) && (noOfChannels > 0)) { 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)) { @@ -357,14 +355,10 @@ public class Settings extends PreferenceActivity implements if((freq > 0) && (freq > min_freq) && (freq <= 108000) && (noOfChannels > 0)) { 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 { |