| author | Lei Qian <lei.qian@amlogic.com> | 2018-01-18 03:23:36 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2018-01-18 03:23:36 (GMT) |
| commit | ce2824e33a7327e2293ddd0cec7335f9431d4dc9 (patch) | |
| tree | 2edc7718665405c571d4cf3fbde7242cd6691659 | |
| parent | dce827da15260256a0628fd9ff5b3fbc8bf80ca6 (diff) | |
| parent | 10ab7a095ce0c27430be9e72760413b60e385c63 (diff) | |
| download | TvInput-ce2824e33a7327e2293ddd0cec7335f9431d4dc9.zip TvInput-ce2824e33a7327e2293ddd0cec7335f9431d4dc9.tar.gz TvInput-ce2824e33a7327e2293ddd0cec7335f9431d4dc9.tar.bz2 | |
Merge "Revert "DroidLogicTvInput: save channel counts when searched some channels.[3/3]"" into m-amlogic
| -rw-r--r-- | DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java | 7 | ||||
| -rw-r--r-- | DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java | 6 |
2 files changed, 0 insertions, 13 deletions
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java index 8f21e4d..62a5481 100644 --- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java +++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java @@ -2190,7 +2190,6 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener, if ((event.mode == TVChannelParams.MODE_ANALOG) && (optionTag == OPTION_MANUAL_SEARCH) && event.precent == 100) stopSearch(); - break; case TvControlManager.EVENT_STORE_BEGIN: @@ -2200,19 +2199,15 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener, case TvControlManager.EVENT_STORE_END: Log.d(TAG, "onEvent:Store end"); String prompt = mResources.getString(R.string.searched); - int sumNumber = 0; if (channelNumber != 0) { - sumNumber += channelNumber; prompt += " " + channelNumber + " " + mResources.getString(R.string.tv_channel); if (radioNumber != 0) { prompt += ","; } } if (radioNumber != 0) { - sumNumber += radioNumber; prompt += " " + radioNumber + " " + mResources.getString(R.string.radio_channel); } - Settings.System.putInt(mContext.getContentResolver(), DroidLogicTvUtils.ALL_CHANNELS_NUMBER, sumNumber); showToast(prompt); break; @@ -2230,8 +2225,6 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener, if (channelNumber == 0 && radioNumber == 0) { showToast(mResources.getString(R.string.searched) + " 0 " + mResources.getString(R.string.channel)); } - int sumNumber1 = channelNumber + radioNumber; - Settings.System.putInt(mContext.getContentResolver(), DroidLogicTvUtils.ALL_CHANNELS_NUMBER, sumNumber1); break; default: break; diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java index bc86ea1..fdd97c8 100644 --- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java +++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java @@ -1159,19 +1159,15 @@ public class OptionUiManagerT implements OnFocusChangeListener, TvControlManage case TvControlManager.EVENT_STORE_END: Log.d(TAG, "onEvent:Store end"); String prompt = mResources.getString(R.string.searched); - int sumNumber = 0; if (channelNumber != 0) { - sumNumber += channelNumber; prompt += " " + channelNumber + " " + mResources.getString(R.string.tv_channel); if (radioNumber != 0) { prompt += ","; } } if (radioNumber != 0) { - sumNumber += radioNumber; prompt += " " + radioNumber + " " + mResources.getString(R.string.radio_channel); } - Settings.System.putInt(mContext.getContentResolver(), DroidLogicTvUtils.ALL_CHANNELS_NUMBER, sumNumber); showToast(prompt); break; @@ -1196,8 +1192,6 @@ public class OptionUiManagerT implements OnFocusChangeListener, TvControlManage } } if (channelNumber == 0 && radioNumber == 0) { - int sumNumber1 = channelNumber + radioNumber; - Settings.System.putInt(mContext.getContentResolver(), DroidLogicTvUtils.ALL_CHANNELS_NUMBER, sumNumber1); showToast(mResources.getString(R.string.searched) + " 0 " + mResources.getString(R.string.channel)); } break; |