tvinput: change gpl license to amlogic license [5/5]

PD# 160531

change gpl license to amlogic license

Change-Id: I75eaa515d5e4359f46a6e79c47419defdf6d51ca

12 files changed, 151 insertions, 151 deletions

diff --git a/DroidLogicFactoryMenu/src/com/amlogic/factory/KeyDown.java b/DroidLogicFactoryMenu/src/com/amlogic/factory/KeyDown.java
index 82e581a..014bc0b 100644
--- a/DroidLogicFactoryMenu/src/com/amlogic/factory/KeyDown.java
+++ b/DroidLogicFactoryMenu/src/com/amlogic/factory/KeyDown.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.droidlogic.app.tv.TvControlManager;
-import com.droidlogic.app.tv.TVInSignalInfo;
+import com.droidlogic.app.tv.TvInSignalInfo;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
@@ -332,8 +332,8 @@ public class KeyDown {
 
     /*set reShow*/
     private static TvControlManager.SourceInput source = TvControlManager.SourceInput.values()[0];
-    private static TVInSignalInfo.SignalFmt fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M;
-    private static TVInSignalInfo.TransFmt trans_fmt = TVInSignalInfo.TransFmt.values()[0];
+    private static TvInSignalInfo.SignalFmt fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M;
+    private static TvInSignalInfo.TransFmt trans_fmt = TvInSignalInfo.TransFmt.values()[0];
 
     public void adjustReshow(boolean left, int step) {
         String value_str = "";
@@ -348,16 +348,16 @@ public class KeyDown {
                 map.put("sub_value", context.getString(Constant.mInputPortList[FactoryMainActivity.mCurInputPortPos]));
                 source = TvControlManager.SourceInput.values()[FactoryMainActivity.mCurInputPortPos];
                 if (source == TvControlManager.SourceInput.AV1 || source == TvControlManager.SourceInput.TV ||source == TvControlManager.SourceInput.AV2)
-                    fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M;
+                    fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M;
                 else if (source == TvControlManager.SourceInput.HDMI1|| source == TvControlManager.SourceInput.DTV
                          || source == TvControlManager.SourceInput.HDMI2 ||source == TvControlManager.SourceInput.HDMI3 )
-                    fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
+                    fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
                 else if (source == TvControlManager.SourceInput.YPBPR1 ||source == TvControlManager.SourceInput.YPBPR2 )
-                    fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_480P_60HZ_D000;
+                    fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_480P_60HZ_D000;
                 else if (source == TvControlManager.SourceInput.VGA)
-                    fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_512X384P_60HZ_D147;
+                    fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_512X384P_60HZ_D147;
                 else
-                    fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
+                    fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
                 for (int i = mListSubMenuData.size() - 1; i > 0; i--)
                     mListSubMenuData.remove(i);
                 // get new value according new mode
@@ -369,44 +369,44 @@ public class KeyDown {
                 if (source == TvControlManager.SourceInput.values()[0] ||
                     source == TvControlManager.SourceInput.values()[1] ||
                     source == TvControlManager.SourceInput.values()[2]) {
-                    if (1 == step && value_int > TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_MAX.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M;
-                    else if (-1 == step && value_int < TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_MAX;
+                    if (1 == step && value_int > TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_MAX.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M;
+                    else if (-1 == step && value_int < TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_MAX;
                     else
-                        fmt = TVInSignalInfo.SignalFmt.valueOf(value_int);
+                        fmt = TvInSignalInfo.SignalFmt.valueOf(value_int);
                 } else if (source == TvControlManager.SourceInput.values()[5] ||
                            source == TvControlManager.SourceInput.values()[6] ||
                            source == TvControlManager.SourceInput.values()[7] ||
                            source == TvControlManager.SourceInput.values()[10]) {
-                    if (1 == step && value_int > TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
-                    else if (-1 == step && value_int < TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX;
+                    if (1 == step && value_int > TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
+                    else if (-1 == step && value_int < TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX;
                     else
-                        fmt = TVInSignalInfo.SignalFmt.valueOf(value_int);
+                        fmt = TvInSignalInfo.SignalFmt.valueOf(value_int);
                 } else if (source == TvControlManager.SourceInput.values()[3] ||
                            source == TvControlManager.SourceInput.values()[4]) {
-                    if (1 == step && value_int > TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_MAX.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_480P_60HZ_D000;
-                    else if (-1 == step && value_int < TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_480P_60HZ_D000.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_MAX;
+                    if (1 == step && value_int > TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_MAX.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_480P_60HZ_D000;
+                    else if (-1 == step && value_int < TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_480P_60HZ_D000.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_COMP_MAX;
                     else
-                        fmt = TVInSignalInfo.SignalFmt.valueOf(value_int);
+                        fmt = TvInSignalInfo.SignalFmt.valueOf(value_int);
                 } else if (source == TvControlManager.SourceInput.values()[8]) {
-                    if (1 == step && value_int > TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_MAX.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_512X384P_60HZ_D147;
-                    else if (-1 == step && value_int < TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_512X384P_60HZ_D147.toInt())
-                        fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_MAX;
+                    if (1 == step && value_int > TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_MAX.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_512X384P_60HZ_D147;
+                    else if (-1 == step && value_int < TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_512X384P_60HZ_D147.toInt())
+                        fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_VGA_MAX;
                     else
-                        fmt = TVInSignalInfo.SignalFmt.valueOf(value_int);
+                        fmt = TvInSignalInfo.SignalFmt.valueOf(value_int);
                 } else {
-                 if (1 == step && value_int > TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX.toInt())
-                     fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
-                 else if (-1 == step && value_int < TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ.toInt())
-                     fmt = TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX;
+                 if (1 == step && value_int > TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX.toInt())
+                     fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ;
+                 else if (-1 == step && value_int < TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_640X480P_60HZ.toInt())
+                     fmt = TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_MAX;
                  else
-                     fmt = TVInSignalInfo.SignalFmt.valueOf(value_int);
+                     fmt = TvInSignalInfo.SignalFmt.valueOf(value_int);
                 }
                 map.put("sub_value", fmt + "");
                 FactoryMainActivity.sAdapter.notifyDataSetChanged();
@@ -434,7 +434,7 @@ public class KeyDown {
                 else
                     FactoryMainActivity.reshowTvinTransFmtPos = Math.abs(FactoryMainActivity.reshowTvinTransFmtPos + step) % reshowTvinTransFmtCount;
                 map.put("sub_value", context.getString(Constant.mChongxianTvInTransFmt[FactoryMainActivity.reshowTvinTransFmtPos]));
-                trans_fmt = TVInSignalInfo.TransFmt.values()[FactoryMainActivity.reshowTvinTransFmtPos];
+                trans_fmt = TvInSignalInfo.TransFmt.values()[FactoryMainActivity.reshowTvinTransFmtPos];
                 for (int i = mListSubMenuData.size() - 1; i > 3; i--)
                     mListSubMenuData.remove(i);
                 ssv.setElse(source, fmt, trans_fmt);
diff --git a/DroidLogicFactoryMenu/src/com/amlogic/factory/ShowSubView.java b/DroidLogicFactoryMenu/src/com/amlogic/factory/ShowSubView.java
index 74e7d8f..4116f36 100644
--- a/DroidLogicFactoryMenu/src/com/amlogic/factory/ShowSubView.java
+++ b/DroidLogicFactoryMenu/src/com/amlogic/factory/ShowSubView.java
@@ -14,7 +14,7 @@ import com.droidlogic.app.tv.TvControlManager.SourceInput_Type;
 import com.droidlogic.app.tv.TvControlManager.SourceInput;
 import com.droidlogic.app.tv.TvControlManager.noline_params_t;
 import com.droidlogic.app.tv.TvControlManager.tvin_cutwin_t;
-import com.droidlogic.app.tv.TVInSignalInfo;
+import com.droidlogic.app.tv.TvInSignalInfo;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.Context;
@@ -211,13 +211,13 @@ public class ShowSubView {
         map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_PORT));
         map.put("sub_value", context.getString(Constant.FACUI_PICMODE_PORT_TV));
         mListSubMenuData.add(map);
-        setTiming(SourceInput.TV, TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M,
-                  TVInSignalInfo.TransFmt.TVIN_TFMT_2D);
+        setTiming(SourceInput.TV, TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_CVBS_NTSC_M,
+                  TvInSignalInfo.TransFmt.TVIN_TFMT_2D);
         FactoryMainActivity.mPage = Constant.PAGE_OVERSCAN;
     }
 
     /* set reShow rate's all parameter */
-    public void setTiming(SourceInput source, TVInSignalInfo.SignalFmt fmt, TVInSignalInfo.TransFmt trans_fmt) {
+    public void setTiming(SourceInput source, TvInSignalInfo.SignalFmt fmt, TvInSignalInfo.TransFmt trans_fmt) {
         Map<String, String> map = new HashMap<String, String>();
         map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_TIMING));
         map.put("sub_value", fmt + "");
@@ -234,7 +234,7 @@ public class ShowSubView {
     }
 
     /* set reShow rate's parameter except Timing,TVIN_3D_STATUS,TVIN_TRANS_FMT */
-    public void setElse(SourceInput source, TVInSignalInfo.SignalFmt fmt, TVInSignalInfo.TransFmt trans_fmt) {
+    public void setElse(SourceInput source, TvInSignalInfo.SignalFmt fmt, TvInSignalInfo.TransFmt trans_fmt) {
         tvin_cutwin_t cutwin_t;
         cutwin_t = tv.FactoryGetOverscanParams(source, fmt, trans_fmt);
         Map<String, String> map = new HashMap<String, String>();
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ADTVInputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ADTVInputService.java
index 3fa66da..2363248 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ADTVInputService.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ADTVInputService.java
@@ -30,13 +30,13 @@ import com.droidlogic.tvinput.Utils;
 
 import com.droidlogic.app.tv.DroidLogicTvInputService;
 import com.droidlogic.app.tv.TvDataBaseManager;
-import com.droidlogic.app.tv.TVChannelParams;
+import com.droidlogic.app.tv.TvChannelParams;
 import com.droidlogic.app.tv.DroidLogicTvUtils;
 import com.droidlogic.app.tv.ChannelInfo;
 import com.droidlogic.app.tv.TvInputBaseSession;
 import com.droidlogic.app.tv.Program;
-import com.droidlogic.app.tv.TVMultilingualText;
-import com.droidlogic.app.tv.TVTime;
+import com.droidlogic.app.tv.TvMultilingualText;
+import com.droidlogic.app.tv.TvTime;
 import com.droidlogic.app.tv.TvStoreManager;
 import com.droidlogic.app.SystemControlManager;
 
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java
index d1e336d..944b3e2 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java
@@ -397,14 +397,14 @@ public class AV1InputService extends DroidLogicTvInputService {
 
            if (mHandler != null) {
                 if (false) {
-                   /* TVTime tvTime = new TVTime(mContext);
-                    Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), tvTime.getTime());
+                   /* TvTime TvTime = new TvTime(mContext);
+                    Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), TvTime.getTime());
                     Program mNextProgram = null;
                     if (mCurrentProgram != null)
                         mNextProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), mCurrentProgram.getEndTimeUtcMillis() + 1);
                     mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PARENTAL_CONTROL_AV, this),
-                        (mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - tvTime.getTime()));*/
-                    //Log.d(TAG, "doPC next:"+(mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - tvTime.getTime())+"ms");
+                        (mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - TvTime.getTime()));*/
+                    //Log.d(TAG, "doPC next:"+(mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - TvTime.getTime())+"ms");
                     Log.d(TAG, "doPC next");
                 } else {
                     mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PARENTAL_CONTROL_AV, this), mParentControlDelay);
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java
index f789796..83f431c 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java
@@ -397,14 +397,14 @@ public class AV2InputService extends DroidLogicTvInputService {
 
            if (mHandler != null) {
                 if (false) {
-                   /* TVTime tvTime = new TVTime(mContext);
-                    Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), tvTime.getTime());
+                   /* TvTime TvTime = new TvTime(mContext);
+                    Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), TvTime.getTime());
                     Program mNextProgram = null;
                     if (mCurrentProgram != null)
                         mNextProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), mCurrentProgram.getEndTimeUtcMillis() + 1);
                     mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PARENTAL_CONTROL_AV, this),
-                        (mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - tvTime.getTime()));*/
-                    //Log.d(TAG, "doPC next:"+(mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - tvTime.getTime())+"ms");
+                        (mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - TvTime.getTime()));*/
+                    //Log.d(TAG, "doPC next:"+(mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - TvTime.getTime())+"ms");
                     Log.d(TAG, "doPC next");
                 } else {
                     mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PARENTAL_CONTROL_AV, this), mParentControlDelay);
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVEpgScanner.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVEpgScanner.java
index f07a987..78a0890 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVEpgScanner.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVEpgScanner.java
@@ -4,7 +4,7 @@ import android.util.Log;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.droidlogic.app.tv.TVChannelParams;
+import com.droidlogic.app.tv.TvChannelParams;
 import com.droidlogic.app.tv.ChannelInfo;
 
 abstract public class DTVEpgScanner {
@@ -183,7 +183,7 @@ abstract public class DTVEpgScanner {
 
         startScan(mode);
 /*
-        if (fend_type == TVChannelParams.MODE_ATSC) {
+        if (fend_type == TvChannelParams.MODE_ATSC) {
             startScan(SCAN_PSIP_EIT | SCAN_MGT | SCAN_VCT | SCAN_RRT | SCAN_STT);
         } else {
             startScan(SCAN_EIT_ALL | SCAN_TDT | SCAN_SDT);//SCAN_NIT|SCAN_CAT
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
index 535daec..f9a6778 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
@@ -39,15 +39,15 @@ import com.droidlogic.tvinput.Utils;
 
 import com.droidlogic.app.tv.DroidLogicTvInputService;
 import com.droidlogic.app.tv.TvDataBaseManager;
-import com.droidlogic.app.tv.TVChannelParams;
+import com.droidlogic.app.tv.TvChannelParams;
 import com.droidlogic.app.tv.DroidLogicTvUtils;
 import com.droidlogic.app.tv.ChannelInfo;
 import com.droidlogic.app.tv.TvInputBaseSession;
 import com.droidlogic.app.tv.Program;
-import com.droidlogic.app.tv.TVMultilingualText;
-import com.droidlogic.app.tv.TVTime;
+import com.droidlogic.app.tv.TvMultilingualText;
+import com.droidlogic.app.tv.TvTime;
 import com.droidlogic.app.tv.TvStoreManager;
-import com.droidlogic.app.tv.TVInSignalInfo;
+import com.droidlogic.app.tv.TvInSignalInfo;
 import com.droidlogic.app.SystemControlManager;
 import com.droidlogic.tvinput.widget.DTVSubtitleView;
 
@@ -272,17 +272,17 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
     }
 
     @Override
-    public void onSigChanged(TVInSignalInfo signal_info) {
+    public void onSigChanged(TvInSignalInfo signal_info) {
         if (mTvControlManager.GetCurrentSourceInput() == DroidLogicTvUtils.DEVICE_ID_DTV
             || mTvControlManager.GetCurrentVirtualSourceInput() == DroidLogicTvUtils.DEVICE_ID_ADTV) {
 
-            TVInSignalInfo.SignalStatus status = signal_info.sigStatus;
+            TvInSignalInfo.SignalStatus status = signal_info.sigStatus;
 
             Log.d(TAG, "onSigChanged status: id["+status.ordinal()+"]["+status.toString()+"]");
 
             //if a/v runs well, notify
             Log.d(TAG, "video fps:"+mTvControlManager.DtvGetVideoFormatInfo().fps);
-            if (status == TVInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE
+            if (status == TvInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE
                     && mCurrentSession != null
                     && mCurrentSession.mCurrentChannel != null
                     && !mCurrentSession.mCurrentChannel.isAnalogChannel()
@@ -1034,11 +1034,11 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
         }
 
         protected TvContentRating[] getContentRatingsOfCurrentProgram(ChannelInfo channelInfo) {
-            TVTime tvTime = new TVTime(mContext);
+            TvTime TvTime = new TvTime(mContext);
             if (channelInfo == null)
                 return null;
-            Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), tvTime.getTime());
-            Log.d(TAG, "TvTime:"+getDateAndTime(tvTime.getTime())+" ("+tvTime.getTime()+")");
+            Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), TvTime.getTime());
+            Log.d(TAG, "TvTime:"+getDateAndTime(TvTime.getTime())+" ("+TvTime.getTime()+")");
 
             TvContentRating[] ratings = mCurrentProgram == null ? null : mCurrentProgram.getContentRatings();
             TvContentRating[] newparseratings = null;
@@ -1124,14 +1124,14 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
 
             if (mHandler != null) {
                 if (false) {
-                    TVTime tvTime = new TVTime(mContext);
-                    Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), tvTime.getTime());
+                    TvTime TvTime = new TvTime(mContext);
+                    Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), TvTime.getTime());
                     Program mNextProgram = null;
                     if (mCurrentProgram != null)
                         mNextProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), mCurrentProgram.getEndTimeUtcMillis() + 1);
                     mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PARENTAL_CONTROL, this),
-                        (mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - tvTime.getTime()));
-                    Log.d(TAG, "doPC next:"+(mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - tvTime.getTime())+"ms");
+                        (mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - TvTime.getTime()));
+                    Log.d(TAG, "doPC next:"+(mNextProgram == null ? mParentControlDelay : mNextProgram.getStartTimeUtcMillis() - TvTime.getTime())+"ms");
                 } else {
                     mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PARENTAL_CONTROL, this), mParentControlDelay);
                     Log.d(TAG, "doPC next:"+mParentControlDelay);
@@ -1389,9 +1389,9 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
         }
 
         protected List<ChannelInfo.Subtitle> getChannelProgramCaptions(ChannelInfo channelInfo) {
-            TVTime tvTime = new TVTime(mContext);
-            Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), tvTime.getTime());
-            Log.d(TAG, "TvTime:"+getDateAndTime(tvTime.getTime()));
+            TvTime TvTime = new TvTime(mContext);
+            Program mCurrentProgram = mTvDataBaseManager.getProgram(TvContract.buildChannelUri(channelInfo.getId()), TvTime.getTime());
+            Log.d(TAG, "TvTime:"+getDateAndTime(TvTime.getTime()));
             Log.d(TAG, "caption:"+(mCurrentProgram==null?"null":mCurrentProgram.getInternalProviderData()));
             return DroidLogicTvUtils.parseAtscCaptions(mCurrentProgram == null ? null : mCurrentProgram.getInternalProviderData());
         }
@@ -1658,7 +1658,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
             /*default language track*/
             String defaultLanguage = Settings.System.getString(mContext.getContentResolver(), DroidLogicTvUtils.TV_KEY_DEFAULT_LANGUAGE);
             if (defaultLanguage == null)/*system language track*/
-                defaultLanguage = TVMultilingualText.getLocalLang();
+                defaultLanguage = TvMultilingualText.getLocalLang();
 
             Iterator<ChannelInfo.Audio> iter = mCurrentAudios.iterator();
             while (iter.hasNext()) {
@@ -1689,7 +1689,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
 
             String defaultLanguage = Settings.System.getString(mContext.getContentResolver(), DroidLogicTvUtils.TV_KEY_DEFAULT_LANGUAGE);
             if (defaultLanguage == null)
-                defaultLanguage = TVMultilingualText.getLocalLang();
+                defaultLanguage = TvMultilingualText.getLocalLang();
 
             Iterator<ChannelInfo.Subtitle> iter = mCurrentSubtitles.iterator();
             while (iter.hasNext()) {
@@ -2240,7 +2240,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                         monitor = new DTVMonitor(mContext, getInputId(), DEF_CODING, MONITOR_MODE, standard);
                         monitor.reset(MONITOR_FEND, MONITOR_DMX,
                                   new TvControlManager.TvMode(mChannel.getType()).getBase(),
-                                  EPG_LANGUAGE.replaceAll("local", TVMultilingualText.getLocalLang()));
+                                  EPG_LANGUAGE.replaceAll("local", TvMultilingualText.getLocalLang()));
                     }
 
                     monitor.enterChannel(getTVChannelParams(mChannel), false);
@@ -2251,28 +2251,28 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
             }
         }
 
-        protected TVChannelParams getTVChannelParams(ChannelInfo channel) {
-            TVChannelParams params = null;
+        protected TvChannelParams getTVChannelParams(ChannelInfo channel) {
+            TvChannelParams params = null;
             String type = channel.getType();
             if (TextUtils.equals(type, TvContract.Channels.TYPE_DTMB))
-                params = TVChannelParams.dtmbParams(channel.getFrequency(), channel.getBandwidth());
+                params = TvChannelParams.dtmbParams(channel.getFrequency(), channel.getBandwidth());
             else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_C))
-                params = TVChannelParams.dvbcParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());
+                params = TvChannelParams.dvbcParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());
             else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_T))
-                params = TVChannelParams.dvbtParams(channel.getFrequency(), channel.getBandwidth());
+                params = TvChannelParams.dvbtParams(channel.getFrequency(), channel.getBandwidth());
             /*else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_S))
-                params = TVChannelParams.dvbsParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());*/
+                params = TvChannelParams.dvbsParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());*/
             else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_C2))
-                params = TVChannelParams.dvbcParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());
+                params = TvChannelParams.dvbcParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());
             else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_T2))
-                params = TVChannelParams.dvbt2Params(channel.getFrequency(), channel.getBandwidth());
+                params = TvChannelParams.dvbt2Params(channel.getFrequency(), channel.getBandwidth());
             /*else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_S2))
-                params = TVChannelParams.dvbsParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());*/
+                params = TvChannelParams.dvbsParams(channel.getFrequency(), channel.getModulation(), channel.getSymbolRate());*/
             else if (TextUtils.equals(type, TvContract.Channels.TYPE_ATSC_T)
                 ||TextUtils.equals(type, TvContract.Channels.TYPE_ATSC_C))
-                params = TVChannelParams.atscParams(channel.getFrequency(), channel.getModulation());
+                params = TvChannelParams.atscParams(channel.getFrequency(), channel.getModulation());
             else if (TextUtils.equals(type, TvContract.Channels.TYPE_ISDB_T))
-                params = TVChannelParams.isdbtParams(channel.getFrequency(), channel.getBandwidth());
+                params = TvChannelParams.isdbtParams(channel.getFrequency(), channel.getBandwidth());
            return params;
         }
 
@@ -2355,10 +2355,10 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
             private int mMode;
             private String mStandard;
             private DTVEpgScanner epgScanner;
-            private TVChannelParams tvchan = null;
+            private TvChannelParams tvchan = null;
             private ChannelInfo tvservice = null;
             private TvDataBaseManager mTvDataBaseManager = null;
-            private TVTime mTvTime = null;
+            private TvTime mTvTime = null;
 
             private ChannelObserver mChannelObserver;
             private CCStyleObserver mCCObserver;
@@ -2434,7 +2434,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                 mMode = mode;
                 mStandard = standard;
                 mTvDataBaseManager = new TvDataBaseManager(mContext);
-                mTvTime = new TVTime(mContext);
+                mTvTime = new TvTime(mContext);
 
                 int channel_number_start = mSystemControlManager.getPropertyInt(DTV_CHANNEL_NUMBER_START, 1);
                 mMonitorStoreManager = new MonitorStoreManager(mInputId, channel_number_start);
@@ -2574,7 +2574,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                     return;
                 }
 
-                reset(fend, dmx, src, EPG_LANGUAGE.replaceAll("local", TVMultilingualText.getLocalLang()));
+                reset(fend, dmx, src, EPG_LANGUAGE.replaceAll("local", TvMultilingualText.getLocalLang()));
 
                 enterChannel(tvchan, true);
                 enterService(tvservice);
@@ -2632,7 +2632,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                 }
             }
 
-            public void enterChannel(TVChannelParams chan, boolean force) {
+            public void enterChannel(TvChannelParams chan, boolean force) {
                 synchronized (this) {
                     enterChannelLocked(chan, force);
                 }
@@ -2644,7 +2644,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                 }
             }
 
-            private void enterChannelLocked(TVChannelParams chan, boolean force) {
+            private void enterChannelLocked(TvChannelParams chan, boolean force) {
                     if (epgScanner == null)
                         return;
                     if (chan == null)
@@ -2756,8 +2756,8 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                                 Program p = new Program.Builder()
                                     .setProgramId(evt.evt_id)
                                     .setChannelId(ContentUris.parseId(channelUri))
-                                    .setTitle(TVMultilingualText.getText((evt.name == null ? null : new String(evt.name)), languages))
-                                    .setDescription(TVMultilingualText.getText((evt.ext_descr == null ? null : new String(evt.ext_descr)), languages))
+                                    .setTitle(TvMultilingualText.getText((evt.name == null ? null : new String(evt.name)), languages))
+                                    .setDescription(TvMultilingualText.getText((evt.ext_descr == null ? null : new String(evt.ext_descr)), languages))
                                     .setContentRatings(evt.rrt_ratings == null ? null : parseDRatingsT(new String(evt.rrt_ratings), evt.evt_id, mTvDataBaseManager, (evt.name == null ? null : new String(evt.name))))
                                     //.setContentRatings(evt.rrt_ratings == null ? null : DroidLogicTvUtils.parseDRatings(new String(evt.rrt_ratings)))
                                     //.setCanonicalGenres(programInfo.genres)
@@ -2787,8 +2787,8 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                                 Program p = new Program.Builder()
                                     .setProgramId(evt.evt_id)
                                     .setChannelId(ContentUris.parseId(channelUri))
-                                    .setTitle(TVMultilingualText.getText(new String(evt.name), languages))
-                                    .setDescription(TVMultilingualText.getText(new String(evt.desc), languages))
+                                    .setTitle(TvMultilingualText.getText(new String(evt.name), languages))
+                                    .setDescription(TvMultilingualText.getText(new String(evt.desc), languages))
                                     //.setContentRatings(programInfo.contentRatings)
                                     //.setCanonicalGenres(programInfo.genres)
                                     //.setPosterArtUri(programInfo.posterArtUri)
@@ -2849,8 +2849,8 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                                 Program p = new Program.Builder()
                                     .setProgramId(evt.evt_id)
                                     .setChannelId(cid)
-                                    .setTitle(TVMultilingualText.getText((evt.name == null ? null : new String(evt.name)), languages))
-                                    .setDescription(TVMultilingualText.getText((evt.ext_descr == null ? null : new String(evt.ext_descr)), languages))
+                                    .setTitle(TvMultilingualText.getText((evt.name == null ? null : new String(evt.name)), languages))
+                                    .setDescription(TvMultilingualText.getText((evt.ext_descr == null ? null : new String(evt.ext_descr)), languages))
                                     .setContentRatings(evt.rrt_ratings == null ? null : parseDRatingsT(new String(evt.rrt_ratings), evt.evt_id, mTvDataBaseManager, (evt.name == null ? null : new String(evt.name))))
                                     //.setContentRatings(evt.rrt_ratings == null ? null : DroidLogicTvUtils.parseDRatings(new String(evt.rrt_ratings)))
                                     //.setCanonicalGenres(programInfo.genres)
@@ -2876,8 +2876,8 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                     }
 
                     if (mTvDataBaseManager != null && programs.size() != 0) {
-                        TVTime tvTime = new TVTime(mContext);
-                        boolean updated = mTvDataBaseManager.updatePrograms(channelUri, programs, tvTime.getTime(), true);
+                        TvTime TvTime = new TvTime(mContext);
+                        boolean updated = mTvDataBaseManager.updatePrograms(channelUri, programs, TvTime.getTime(), true);
                         if (updated && mCurrentChannel != null && mCurrentChannel.getId() == c.getId()) {
                             if (DEBUG) Log.d(TAG, "epg eit, program updated for current");
                             checkCurrentContentBlockNeeded();
@@ -3057,7 +3057,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                                 for (DTVEpgScanner.Event.ServiceInfosFromSDT.ServiceInfoFromSDT sn : event.services.mServices) {
                                     if (co.getServiceId() == sn.mId) {
                                         co.setOriginalNetworkId(event.services.mNetworkId);
-                                        co.setDisplayName(TVMultilingualText.getText(sn.mName));
+                                        co.setDisplayName(TvMultilingualText.getText(sn.mName));
                                         co.setDisplayNameMulti(sn.mName);
                                         co.setSdtVersion(event.services.mVersion);
                                         mTvDataBaseManager.updateChannelInfo(co);
@@ -3873,7 +3873,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
             if (g == null)
                 continue;
 
-            String ratingDescription = TVMultilingualText.getTextJ(g.optString("rs"));
+            String ratingDescription = TvMultilingualText.getTextJ(g.optString("rs"));
             int region = g.optInt("g", -1);
             if (region > DroidContentRatingsParser.FIXED_REGION_lEVEL_2) {//region > 2, search download rrt
                 Log.d(TAG, "parse ratings rrt5 region = " + region + ", title = " + title);
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java
index 97a4cde..3a994b7 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java
@@ -40,8 +40,8 @@ import com.droidlogic.app.SystemControlManager;
 import android.media.tv.TvContract;
 
 import com.droidlogic.app.tv.DroidLogicTvUtils;
-import com.droidlogic.app.tv.TVChannelParams;
-import com.droidlogic.app.tv.TVMultilingualText;
+import com.droidlogic.app.tv.TvChannelParams;
+import com.droidlogic.app.tv.TvMultilingualText;
 import com.droidlogic.app.tv.ChannelInfo;
 import com.droidlogic.app.tv.TvDataBaseManager;
 import com.droidlogic.tvinput.R;
@@ -1434,8 +1434,8 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
 
     private void doScanCmdForAtscManual (Bundle bundle) {
         mTvControlManager.DtvSetTextCoding("GB2312");
-        int dtvMode = (bundle == null ? TVChannelParams.MODE_DTMB
-                : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB));
+        int dtvMode = (bundle == null ? TvChannelParams.MODE_DTMB
+                : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB));
         TvControlManager.TvMode tvMode = TvControlManager.TvMode.fromMode(dtvMode);
         if ((tvMode.getExt() & 1) != 0) {
             int atvScanType = (bundle == null ? TvControlManager.ScanType.SCAN_ATV_NONE
@@ -1873,7 +1873,7 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
     {
         Log.d(TAG, " delete mode:"+mode.getBase()+" atv:"+deleteAtv+" dtv:"+deleteDtv);
         if (deleteAtv) {
-            if (mode.getBase() == TVChannelParams.MODE_ATSC)
+            if (mode.getBase() == TvChannelParams.MODE_ATSC)
                 mTvDataBaseManager.deleteChannels(mSettingsManager.getInputId(), TvContract.Channels.TYPE_NTSC);
             //else
                 mTvDataBaseManager.deleteChannels(mSettingsManager.getInputId(), TvContract.Channels.TYPE_PAL);
@@ -2002,8 +2002,8 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
             }
         } else if (DroidLogicTvUtils.ACTION_DTV_AUTO_SCAN.equals(action)) {
             mTvControlManager.DtvSetTextCoding("GB2312");
-            int dtvMode = (bundle == null ? TVChannelParams.MODE_DTMB
-                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB));
+            int dtvMode = (bundle == null ? TvChannelParams.MODE_DTMB
+                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB));
             TvControlManager.TvMode tvMode = TvControlManager.TvMode.fromMode(dtvMode);
             if ((tvMode.getExt() & 1) != 0) {//ADTV
                 int atvScanType = (bundle == null ? TvControlManager.ScanType.SCAN_ATV_NONE
@@ -2047,8 +2047,8 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
             }
         } else if (DroidLogicTvUtils.ACTION_DTV_MANUAL_SCAN.equals(action)) {
             mTvControlManager.DtvSetTextCoding("GB2312");
-            int dtvMode = (bundle == null ? TVChannelParams.MODE_DTMB
-                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB));
+            int dtvMode = (bundle == null ? TvChannelParams.MODE_DTMB
+                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB));
             TvControlManager.TvMode tvMode = TvControlManager.TvMode.fromMode(dtvMode);
             if ((tvMode.getExt() & 1) != 0) {//ADTV
                 int atvScanType = (bundle == null ? TvControlManager.ScanType.SCAN_ATV_NONE
@@ -2091,7 +2091,7 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
             //ww//
             mTvControlManager.OpenDevForScan(DroidLogicTvUtils.OPEN_DEV_FOR_SCAN_DTV);
                 mTvControlManager.DtvManualScan(
-                    bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB),
+                    bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB),
                     bundle.getInt(DroidLogicTvUtils.PARA_MANUAL_SCAN, 0)
                 );
             }
@@ -2165,15 +2165,15 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
                 int isNewProgram = 0;
                 Log.d(TAG, "onEvent:"+event.precent + "%\tfreq[" + event.freq + "] lock[" + event.lock + "] strength[" + event.strength + "] quality[" + event.quality + "]");
 
-                if ((event.mode == TVChannelParams.MODE_ANALOG) && (event.lock == 0x11)) { //trick here
+                if ((event.mode == TvChannelParams.MODE_ANALOG) && (event.lock == 0x11)) { //trick here
                     isNewProgram = 1;
                     Log.d(TAG, "Resume Scanning");
                     if ((mTvControlManager.AtvDtvGetScanStatus() & TvControlManager.ATV_DTV_SCAN_STATUS_PAUSED)
                             == TvControlManager.ATV_DTV_SCAN_STATUS_PAUSED)
                         resumeSearch();
-                } else if ((event.mode != TVChannelParams.MODE_ANALOG) && (event.programName.length() != 0)) {
+                } else if ((event.mode != TvChannelParams.MODE_ANALOG) && (event.programName.length() != 0)) {
                     try {
-                        name = TVMultilingualText.getText(event.programName);
+                        name = TvMultilingualText.getText(event.programName);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -2197,7 +2197,7 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
                 else
                     setAutoSearchFrequency(event);
 
-                if ((event.mode == TVChannelParams.MODE_ANALOG) && (optionTag == OPTION_MANUAL_SEARCH)
+                if ((event.mode == TvChannelParams.MODE_ANALOG) && (optionTag == OPTION_MANUAL_SEARCH)
                     && event.precent == 100)
                     stopSearch();
                 break;
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
index 77431bc..49a25c6 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
@@ -42,8 +42,8 @@ import com.droidlogic.app.SystemControlManager;
 import android.media.tv.TvContract;
 
 import com.droidlogic.app.tv.DroidLogicTvUtils;
-import com.droidlogic.app.tv.TVChannelParams;
-import com.droidlogic.app.tv.TVMultilingualText;
+import com.droidlogic.app.tv.TvChannelParams;
+import com.droidlogic.app.tv.TvMultilingualText;
 import com.droidlogic.app.tv.ChannelInfo;
 import com.droidlogic.app.tv.TvDataBaseManager;
 import com.droidlogic.tvinput.R;
@@ -305,8 +305,8 @@ public class OptionUiManagerT implements  OnFocusChangeListener, TvControlManage
 
     private void doScanCmdForAtscManual (Bundle bundle) {
         mTvControlManager.DtvSetTextCoding("GB2312");
-        int dtvMode = (bundle == null ? TVChannelParams.MODE_DTMB
-                : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB));
+        int dtvMode = (bundle == null ? TvChannelParams.MODE_DTMB
+                : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB));
         TvControlManager.TvMode tvMode = TvControlManager.TvMode.fromMode(dtvMode);
         if ((tvMode.getExt() & 1) != 0) {
             int atvScanType = (bundle == null ? TvControlManager.ScanType.SCAN_ATV_NONE
@@ -790,7 +790,7 @@ public class OptionUiManagerT implements  OnFocusChangeListener, TvControlManage
     {
         Log.d(TAG, " delete mode:"+mode.getBase()+" atv:"+deleteAtv+" dtv:"+deleteDtv);
         if (deleteAtv) {
-            if (mode.getBase() == TVChannelParams.MODE_ATSC)
+            if (mode.getBase() == TvChannelParams.MODE_ATSC)
                 mTvDataBaseManager.deleteChannels(mSettingsManager.getInputId(), TvContract.Channels.TYPE_NTSC);
             //else
                 mTvDataBaseManager.deleteChannels(mSettingsManager.getInputId(), TvContract.Channels.TYPE_PAL);
@@ -951,8 +951,8 @@ public class OptionUiManagerT implements  OnFocusChangeListener, TvControlManage
             }
         } else if (DroidLogicTvUtils.ACTION_DTV_AUTO_SCAN.equals(action)) {
             mTvControlManager.DtvSetTextCoding("GB2312");
-            int dtvMode = (bundle == null ? TVChannelParams.MODE_DTMB
-                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB));
+            int dtvMode = (bundle == null ? TvChannelParams.MODE_DTMB
+                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB));
             TvControlManager.TvMode tvMode = TvControlManager.TvMode.fromMode(dtvMode);
             if ((tvMode.getExt() & 1) != 0) {//ADTV
                 int atvScanType = (bundle == null ? TvControlManager.ScanType.SCAN_ATV_NONE
@@ -996,8 +996,8 @@ public class OptionUiManagerT implements  OnFocusChangeListener, TvControlManage
             }
         } else if (DroidLogicTvUtils.ACTION_DTV_MANUAL_SCAN.equals(action)) {
             mTvControlManager.DtvSetTextCoding("GB2312");
-            int dtvMode = (bundle == null ? TVChannelParams.MODE_DTMB
-                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB));
+            int dtvMode = (bundle == null ? TvChannelParams.MODE_DTMB
+                    : bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB));
             TvControlManager.TvMode tvMode = TvControlManager.TvMode.fromMode(dtvMode);
             if ((tvMode.getExt() & 1) != 0) {//ADTV
                 int atvScanType = (bundle == null ? TvControlManager.ScanType.SCAN_ATV_NONE
@@ -1040,7 +1040,7 @@ public class OptionUiManagerT implements  OnFocusChangeListener, TvControlManage
             //ww//
             mTvControlManager.OpenDevForScan(DroidLogicTvUtils.OPEN_DEV_FOR_SCAN_DTV);
                 mTvControlManager.DtvManualScan(
-                    bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TVChannelParams.MODE_DTMB),
+                    bundle.getInt(DroidLogicTvUtils.PARA_SCAN_MODE, TvChannelParams.MODE_DTMB),
                     bundle.getInt(DroidLogicTvUtils.PARA_MANUAL_SCAN, 0)
                 );
             }
@@ -1117,15 +1117,15 @@ public class OptionUiManagerT implements  OnFocusChangeListener, TvControlManage
                 int isNewProgram = 0;
                 Log.d(TAG, "onEvent:"+event.precent + "%\tfreq[" + event.freq + "] lock[" + event.lock + "] strength[" + event.strength + "] quality[" + event.quality + "]");
 
-                if ((event.mode == TVChannelParams.MODE_ANALOG) && (event.lock == 0x11)) { //trick here
+                if ((event.mode == TvChannelParams.MODE_ANALOG) && (event.lock == 0x11)) { //trick here
                     isNewProgram = 1;
                     Log.d(TAG, "Resume Scanning");
                     if ((mTvControlManager.AtvDtvGetScanStatus() & TvControlManager.ATV_DTV_SCAN_STATUS_PAUSED)
                             == TvControlManager.ATV_DTV_SCAN_STATUS_PAUSED)
                         resumeSearch();
-                } else if ((event.mode != TVChannelParams.MODE_ANALOG) && (event.programName.length() != 0)) {
+                } else if ((event.mode != TvChannelParams.MODE_ANALOG) && (event.programName.length() != 0)) {
                     try {
-                        name = TVMultilingualText.getText(event.programName);
+                        name = TvMultilingualText.getText(event.programName);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -1158,7 +1158,7 @@ public class OptionUiManagerT implements  OnFocusChangeListener, TvControlManage
                 else
                     setAutoSearchFrequency(event);
 
-                if ((event.mode == TVChannelParams.MODE_ANALOG) && ((optionTag == OPTION_MANUAL_SEARCH) || isLiveTvScaning)
+                if ((event.mode == TvChannelParams.MODE_ANALOG) && ((optionTag == OPTION_MANUAL_SEARCH) || isLiveTvScaning)
                     && event.precent == 100)
                     stopSearch();
                 break;
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/SettingsManager.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/SettingsManager.java
index 5d17a6b..17db541 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/SettingsManager.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/SettingsManager.java
@@ -34,9 +34,9 @@ import android.media.tv.TvContract.Channels;
 import com.droidlogic.app.tv.ChannelInfo;
 import com.droidlogic.app.tv.TvDataBaseManager;
 import com.droidlogic.app.tv.TvControlManager;
-import com.droidlogic.app.tv.TVInSignalInfo;
+import com.droidlogic.app.tv.TvInSignalInfo;
 import com.droidlogic.app.tv.DroidLogicTvUtils;
-import com.droidlogic.app.tv.TVMultilingualText;
+import com.droidlogic.app.tv.TvMultilingualText;
 import com.droidlogic.tvinput.R;
 
 public class SettingsManager {
@@ -387,18 +387,18 @@ public class SettingsManager {
     }
 
     public boolean isShowTint() {
-        TVInSignalInfo info;
+        TvInSignalInfo info;
         String colorSystem = getColorSystemStatus();
         if (mTvSource == TvControlManager.SourceInput_Type.SOURCE_TYPE_TV
             && colorSystem != null && colorSystem.equals(mResources.getString(R.string.ntsc))) {
             info = mTvControlManager.GetCurrentSignalInfo();
-            if (info.sigStatus == TVInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE) {
+            if (info.sigStatus == TvInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE) {
                 Log.d(TAG, "ATV NTSC mode signal is stable, show Tint");
                 return true;
             }
         } else if (mTvSource == TvControlManager.SourceInput_Type.SOURCE_TYPE_AV) {
             info = mTvControlManager.GetCurrentSignalInfo();
-            if (info.sigStatus == TVInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE) {
+            if (info.sigStatus == TvInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE) {
                 String[] strings = info.sigFmt.toString().split("_");
                 if (strings[4].contains("NTSC")) {
                     Log.d(TAG, "AV NTSC mode signal is stable, show Tint");
@@ -1148,7 +1148,7 @@ public class SettingsManager {
 
         if (!key.equals(KEY_COLOR))
             mTvControlManager.SetSaturation(color, mTvSourceInput,
-                    TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                    TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
         else
             ret = color;
 
@@ -1160,7 +1160,7 @@ public class SettingsManager {
         if (isShowTint()) {
             if (!key.equals(KEY_TINT))
                 mTvControlManager.SetHue(tint, mTvSourceInput,
-                        TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                        TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
             else
                 ret = tint;
         }
@@ -1185,10 +1185,10 @@ public class SettingsManager {
     public void setColor (int step) {
         if (mTvControlManager.GetPQMode(mTvSourceInput) == 3)
             mTvControlManager.SetSaturation(mTvControlManager.GetSaturation(mTvSourceInput) + step,
-                   mTvSourceInput, TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                   mTvSourceInput, TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
         else
             mTvControlManager.SetSaturation(setPictureUserMode(KEY_COLOR) + step,
-                   mTvSourceInput, TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                   mTvSourceInput, TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
     }
 
     public void setSharpness (int step) {
@@ -1202,10 +1202,10 @@ public class SettingsManager {
         if (isShowTint()) {
             if (mTvControlManager.GetPQMode(mTvSourceInput) == 3)
                 mTvControlManager.SetHue(mTvControlManager.GetHue(mTvSourceInput) + step, mTvSourceInput,
-                        TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                        TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
             else
                 mTvControlManager.SetHue(setPictureUserMode(KEY_TINT) + step, mTvSourceInput,
-                        TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                        TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
         }
     }
 
@@ -1228,16 +1228,16 @@ public class SettingsManager {
     public void setAspectRatio(String mode) {
         if (mode.equals(STATUS_AUTO)) {
             mTvControlManager.SetDisplayMode(TvControlManager.Display_Mode.DISPLAY_MODE_NORMAL,
-                    mTvSourceInput, TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                    mTvSourceInput, TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
         } else if (mode.equals(STATUS_4_TO_3)) {
             mTvControlManager.SetDisplayMode(TvControlManager.Display_Mode.DISPLAY_MODE_MODE43,
-                    mTvSourceInput, TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                    mTvSourceInput, TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
         } else if (mode.equals(STATUS_PANORAMA)) {
             mTvControlManager.SetDisplayMode(TvControlManager.Display_Mode.DISPLAY_MODE_FULL,
-                    mTvSourceInput, TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                    mTvSourceInput, TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
         } else if (mode.equals(STATUS_FULL_SCREEN)) {
             mTvControlManager.SetDisplayMode(TvControlManager.Display_Mode.DISPLAY_MODE_169,
-                    mTvSourceInput, TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
+                    mTvSourceInput, TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_NULL/*mTvControlManager.GetCurrentSignalInfo().sigFmt*/, 1);
         }
     }
 
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/shortcut/ShortCutActivity.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/shortcut/ShortCutActivity.java
index d35a86f..08ff51e 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/shortcut/ShortCutActivity.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/shortcut/ShortCutActivity.java
@@ -8,7 +8,7 @@ import com.droidlogic.app.tv.DroidLogicTvUtils;
 import com.droidlogic.app.tv.ChannelInfo;
 import com.droidlogic.app.tv.Program;
 import com.droidlogic.app.tv.TvDataBaseManager;
-import com.droidlogic.app.tv.TVTime;
+import com.droidlogic.app.tv.TvTime;
 import com.droidlogic.app.tv.TvControlManager;
 import com.droidlogic.tvinput.settings.SettingsManager;
 import com.droidlogic.tvinput.shortcut.GuideListView.ListItemSelectedListener;
@@ -94,7 +94,7 @@ public class ShortCutActivity extends Activity implements ListItemSelectedListen
     private int currentChannelIndex = -1;
     private int currentDateIndex = -1;
     private int currentProgramIndex = -1;
-    private TVTime mTvTime = null;
+    private TvTime mTvTime = null;
     private TextView toast_title;
     private TextView toast_status;
     private LinearLayout mToast;
@@ -401,7 +401,7 @@ public class ShortCutActivity extends Activity implements ListItemSelectedListen
     };
 
     private void setGuideView() {
-        mTvTime = new TVTime(this);
+        mTvTime = new TvTime(this);
 
         loadDateTime();
 
diff --git a/DroidLogicTvSource/src/com/droidlogic/tvsource/DroidLogicTv.java b/DroidLogicTvSource/src/com/droidlogic/tvsource/DroidLogicTv.java
index d549c13..8573e3e 100644
--- a/DroidLogicTvSource/src/com/droidlogic/tvsource/DroidLogicTv.java
+++ b/DroidLogicTvSource/src/com/droidlogic/tvsource/DroidLogicTv.java
@@ -15,9 +15,9 @@ import com.droidlogic.app.tv.DroidLogicHdmiCecManager;
 import com.droidlogic.app.tv.DroidLogicTvUtils;
 import com.droidlogic.app.tv.TvDataBaseManager;
 import com.droidlogic.app.tv.ChannelInfo;
-import com.droidlogic.app.tv.TVInSignalInfo;
+import com.droidlogic.app.tv.TvInSignalInfo;
 import com.droidlogic.app.tv.TvControlManager;
-import com.droidlogic.app.tv.TVTime;
+import com.droidlogic.app.tv.TvTime;
 import com.droidlogic.app.tv.Program;
 
 import com.droidlogic.tvsource.ui.ChannelListLayout;
@@ -147,7 +147,7 @@ public class DroidLogicTv extends Activity implements Callback, onSourceInputCli
     private TextView mDtvInfoAge;
     private TextView mDtvInfoProgramSegment;
     private TextView mDtvInfoDescribe;
-    private TVTime mTvTime = null;
+    private TvTime mTvTime = null;
     //thread
     private HandlerThread mHandlerThread;
     private static final String mThreadName = TAG;
@@ -411,7 +411,7 @@ public class DroidLogicTv extends Activity implements Callback, onSourceInputCli
             mSourceInput.getSourceType() == DroidLogicTvUtils.SOURCE_TYPE_HDMI2 ||
             mSourceInput.getSourceType() == DroidLogicTvUtils.SOURCE_TYPE_HDMI3 ||
             mSourceInput.getSourceType() == DroidLogicTvUtils.SOURCE_TYPE_HDMI4 ) {
-            TVInSignalInfo si = mTvControlManager.GetCurrentSignalInfo();
+            TvInSignalInfo si = mTvControlManager.GetCurrentSignalInfo();
             String[] strings = si.sigFmt.toString().split("_");
             if (strings != null && strings.length <= 4)
                 mSourceInput.setChannelVideoFormat(" ");
@@ -424,7 +424,7 @@ public class DroidLogicTv extends Activity implements Callback, onSourceInputCli
             }
         }else if (mSourceInput.getSourceType() == DroidLogicTvUtils.SOURCE_TYPE_AV1 ||
             mSourceInput.getSourceType() == DroidLogicTvUtils.SOURCE_TYPE_AV2) {
-            TVInSignalInfo si = mTvControlManager.GetCurrentSignalInfo();
+            TvInSignalInfo si = mTvControlManager.GetCurrentSignalInfo();
             String[] strings = si.sigFmt.toString().split("_");
             if (strings != null && strings.length <= 4)
                 mSourceInput.setAVType("");
@@ -1233,7 +1233,7 @@ public class DroidLogicTv extends Activity implements Callback, onSourceInputCli
     }
 
     private void initDtvInfo() {
-        mTvTime = new TVTime(this);
+        mTvTime = new TvTime(this);
         String[] dateAndTime = getDateAndTime(mTvTime.getTime());
         String currentTime = dateAndTime[0] + "." + dateAndTime[1] + "." + dateAndTime[2] + "   " + dateAndTime[3] + ":"
                   + dateAndTime[4];