summaryrefslogtreecommitdiff
authorYu Fang <yu.fang@amlogic.com>2018-01-17 09:21:05 (GMT)
committer Yu Fang <yu.fang@amlogic.com>2018-01-17 09:21:05 (GMT)
commit10ab7a095ce0c27430be9e72760413b60e385c63 (patch)
tree512af0274e476648bec1bb75c013e1d2c59af4f0
parent58f6a6841a44766e8cbeafb35e3afddf76c620c8 (diff)
downloadTvInput-10ab7a095ce0c27430be9e72760413b60e385c63.zip
TvInput-10ab7a095ce0c27430be9e72760413b60e385c63.tar.gz
TvInput-10ab7a095ce0c27430be9e72760413b60e385c63.tar.bz2
Revert "DroidLogicTvInput: save channel counts when searched some channels.[3/3]"
This reverts commit 58f6a6841a44766e8cbeafb35e3afddf76c620c8. Change-Id: I2b9f030993f3215850d70ee815f26ae8f88551a1
Diffstat
-rw-r--r--DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java7
-rw-r--r--DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java6
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 81ed8d2..4c530ce 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 9ef964b..76e2755 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
@@ -1139,19 +1139,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;
@@ -1175,8 +1171,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;