diff options
author | Danesh M <daneshm90@gmail.com> | 2015-04-16 10:18:08 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-04-18 01:56:39 +0000 |
commit | b06c7b8404fdc711ce29a66756227e42fe137ec9 (patch) | |
tree | 173cc6f4c9f63898a94346ec0f9df8be55683744 | |
parent | 18e9d6b690100ce58923e457e74c41a8afd20da2 (diff) | |
download | android_hardware_qcom_fm-b06c7b8404fdc711ce29a66756227e42fe137ec9.tar.gz android_hardware_qcom_fm-b06c7b8404fdc711ce29a66756227e42fe137ec9.tar.bz2 android_hardware_qcom_fm-b06c7b8404fdc711ce29a66756227e42fe137ec9.zip |
FMRadio : Launch station list automatically after scan
Give status update post scaning for categories
Fix %s showing in stationList
Change-Id: I1845f0cdeb0051bcfb951e2fef791a016fa81ef4
(cherry picked from commit dc3657497c74ee38077b727ca5fabc81a59aa8af)
-rw-r--r-- | fmapp2/res/values/strings.xml | 3 | ||||
-rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadio.java | 24 |
2 files changed, 25 insertions, 2 deletions
diff --git a/fmapp2/res/values/strings.xml b/fmapp2/res/values/strings.xml index ff8736f..2c5e8b9 100644 --- a/fmapp2/res/values/strings.xml +++ b/fmapp2/res/values/strings.xml @@ -110,7 +110,7 @@ <string name="default_blank" translatable="false"></string> <string name="add_station" translatable="false">+</string> - <string name="station_name">Station: <xliff:g id="name">%s</xliff:g></string> + <string name="station_name">Station:</string> <string name="station_exists">This frequency already exists!</string> <string name="station_list_delete_station">Delete: <xliff:g id="name">%s</xliff:g></string> <string name="station_list_delete_station_prompt">Are you sure you want to delete \'<xliff:g id="name">%s</xliff:g>\'?</string> @@ -125,4 +125,5 @@ <string name="set">Set</string> <string name="user_defind_band_msg">Enter frequency from 76.0 to 108.0 MHz with minimum 1 channel spacing</string> + <string name="fm_search_no_results">No compatible stations found</string> </resources> diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java index 90da15d..87a58e3 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadio.java +++ b/fmapp2/src/com/caf/fmradio/FMRadio.java @@ -232,7 +232,7 @@ public class FMRadio extends Activity // default audio device - speaker private static int mAudioRoute = FMRadioService.RADIO_AUDIO_DEVICE_WIRED_HEADSET; private static boolean mFMStats = false; - + private boolean mShowStationList = false; /* Current Status Indicators */ private static boolean mRecording = false; @@ -1717,6 +1717,9 @@ public class FMRadio extends Activity SharedPreferences.Editor editor = sp.edit(); editor.clear(); editor.commit(); + if (mScannedFrequencies != null) { + mScannedFrequencies.clear(); + } } public boolean fmConfigure() { boolean bStatus = true; @@ -2675,6 +2678,11 @@ public class FMRadio extends Activity resetFMStationInfoUI(); invalidateOptionsMenu(); saveStations(); + if (mShowStationList) { + Intent stationListIntent = new Intent(FMRadio.this, StationListActivity.class); + startActivity(stationListIntent); + } + mShowStationList = false; } }; @@ -3088,6 +3096,20 @@ public class FMRadio extends Activity } public void onSearchComplete() { Log.d(LOGTAG, "mServiceCallbacks.onSearchComplete :"); + if (mIsScaning) { + if (mScannedFrequencies != null && mScannedFrequencies.size() > 0) { + mShowStationList = true; + } else { + mHandler.post(new Runnable() { + @Override + public void run() { + Toast t = Toast.makeText(FMRadio.this, + getString(R.string.fm_search_no_results), Toast.LENGTH_SHORT); + t.show(); + } + }); + } + } mScanPty = 0; mScanPtyIndex = 0; mIsScaning = false; |