TvInput: sync to google partner, delete useless files [1/1]

PD# NONE

sync to google partner, delete useless files

Change-Id: Iaf5edf8a5c9a63e1788c8efab628fffd82f7b03c

33 files changed, 0 insertions, 4237 deletions

diff --git a/apps/TvInput/DroidLogicExHdmiTvInput/Android.mk b/apps/TvInput/DroidLogicExHdmiTvInput/Android.mk
deleted file mode 100644
index f971733..0000000
--- a/apps/TvInput/DroidLogicExHdmiTvInput/Android.mk
+++ b/dev/null
@@ -1,19 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_CERTIFICATE := platform
-LOCAL_PACKAGE_NAME := DroidLogicExHdmiTvInput
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_JAVA_LIBRARIES := droidlogic droidlogic-tv
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/apps/TvInput/DroidLogicExHdmiTvInput/AndroidManifest.xml b/apps/TvInput/DroidLogicExHdmiTvInput/AndroidManifest.xml
deleted file mode 100644
index 31437f1..0000000
--- a/apps/TvInput/DroidLogicExHdmiTvInput/AndroidManifest.xml
+++ b/dev/null
@@ -1,43 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.droidlogic.DroidLogicExHdmiTvInput"
-    android:sharedUserId="android.uid.system"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="22"
-        android:targetSdkVersion="22"/>
-
-    <uses-permission android:name="droidlogic.permission.SYSTEM_CONTROL" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.TV_INPUT_HARDWARE" />
-    <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />
-    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
-    <uses-permission android:name="com.android.providers.tv.permission.ACCESS_ALL_EPG_DATA" />
-    <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
-    <uses-permission android:name="android.permission.DELETE_CACHE_FILES" />
-    <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
-    <uses-permission android:name="android.permission.REBOOT" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.INJECT_EVENTS" />
-    <uses-permission android:name="android.permission.SET_TIME" />
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="com.android.tv.permission.RECEIVE_INPUT_EVENT" />
-
-    <application
-        android:persistent="true">
-
-        <service
-            android:name=".services.HdmiExtendInputService"
-            android:permission="android.permission.BIND_TV_INPUT" >
-            <intent-filter>
-                <action android:name="android.media.tv.TvInputService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.media.tv.input"
-                android:resource="@xml/hdmiextend_input_service" />
-        </service>
-
-    </application>
-</manifest>
diff --git a/apps/TvInput/DroidLogicExHdmiTvInput/res/xml/hdmiextend_input_service.xml b/apps/TvInput/DroidLogicExHdmiTvInput/res/xml/hdmiextend_input_service.xml
deleted file mode 100644
index d7b11f9..0000000
--- a/apps/TvInput/DroidLogicExHdmiTvInput/res/xml/hdmiextend_input_service.xml
+++ b/dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
-    android:setupActivity="com.droidlogic.tvinput.settings.HdmiExtendSetupActivity" />
\ No newline at end of file
diff --git a/apps/TvInput/DroidLogicExHdmiTvInput/src/com/droidlogic/tvinput/services/HdmiExtendInputService.java b/apps/TvInput/DroidLogicExHdmiTvInput/src/com/droidlogic/tvinput/services/HdmiExtendInputService.java
deleted file mode 100644
index f25720e..0000000
--- a/apps/TvInput/DroidLogicExHdmiTvInput/src/com/droidlogic/tvinput/services/HdmiExtendInputService.java
+++ b/dev/null
@@ -1,258 +0,0 @@
-package com.droidlogic.DroidLogicExHdmiTvInput.services;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.media.tv.TvInputInfo;
-import android.media.tv.TvInputManager;
-import android.media.tv.TvInputService;
-import android.media.tv.TvStreamConfig;
-import android.net.Uri;
-import android.view.KeyEvent;
-import android.view.Surface;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
-import android.media.tv.TvInputManager.Hardware;
-import android.media.tv.TvInputManager.HardwareCallback;
-import android.media.tv.TvInputHardwareInfo;
-import com.droidlogic.app.tv.DroidLogicTvUtils;
-
-
-import android.view.View;
-import android.view.LayoutInflater;
-import com.droidlogic.DroidLogicExHdmiTvInput.R;
-
-public class HdmiExtendInputService extends TvInputService {
-    private static final String TAG = "HdmiExtendInputService";
-    private static final boolean DEBUG = true;
-    private HdmiExtendInputSession mSession;
-    private String mInputId;
-    private Surface mSurface;
-    private Context mContext;
-    public Hardware mHardware;
-    public TvStreamConfig[] mConfigs;
-    private TvInputManager mTvInputManager;
-    private int mDeviceId = -1;
-    private SparseArray<TvInputInfo> mInfoList = new SparseArray<TvInputInfo>();
-
-    private HardwareCallback mHardwareCallback = new HardwareCallback(){
-        @Override
-        public void onReleased() {
-            if (DEBUG)
-                Log.d(TAG, "onReleased");
-
-            mHardware = null;
-        }
-
-        @Override
-        public void onStreamConfigChanged(TvStreamConfig[] configs) {
-            if (DEBUG)
-                Log.d(TAG, "onStreamConfigChanged");
-            mConfigs = configs;
-        }
-    };
-
-    @Override
-    public void onCreate() {
-        Log.d(TAG, "onCreate");
-        super.onCreate();
-        mTvInputManager = (TvInputManager)this.getSystemService(Context.TV_INPUT_SERVICE);
-    }
-
-    @Override
-    public Session onCreateSession(String inputId) {
-        Log.d(TAG, "onCreateSession");
-        if (mHardware != null && mDeviceId != -1) {
-            mTvInputManager.releaseTvInputHardware(mDeviceId,mHardware);
-        }
-        mInputId = inputId;
-        mDeviceId = getHardwareDeviceId(inputId);
-        mHardware = mTvInputManager.acquireTvInputHardware(mDeviceId,mHardwareCallback,mTvInputManager.getTvInputInfo(inputId));
-        mSession = new HdmiExtendInputSession(getApplicationContext());
-        Log.d(TAG, "mHardware :" + mHardware);
-        return mSession;
-    }
-
-    public class HdmiExtendInputSession extends TvInputService.Session{
-
-        public HdmiExtendInputSession(Context context) {
-            super(context);
-            mContext = context;
-            Log.d(TAG, "HdmiExtendInputSession");
-            LayoutInflater inflater = (LayoutInflater)
-                    context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        }
-        @Override
-        public boolean onSetSurface(Surface surface) {
-            Log.d(TAG, "onSetSurface");
-            if ((null == surface) && (mHardware != null)) {
-                onRelease();
-            }
-            mSurface = surface;
-            Log.d(TAG, "mConfigs :" + mConfigs +" mSurface :" + mSurface);
-            if (mConfigs != null && mSurface != null && mHardware != null) {
-                Log.d(TAG, "setSurface start!");
-                mHardware.setSurface(mSurface,mConfigs[0]);
-                mSession.notifyVideoAvailable();
-            }
-            return false;
-        }
-        @Override
-        public boolean onTune(Uri channelUri) {
-            Log.d(TAG, "onTune " );
-            return false;
-        }
-        @Override
-        public void onRelease() {
-            Log.d(TAG, "onRelease");
-            mHardware.setSurface(null, null);
-        }
-        @Override
-        public void onSetStreamVolume(float volume) {
-            Log.d(TAG, "onSetStreamVolume");
-        }
-        @Override
-        public void onSetCaptionEnabled(boolean enabled) {
-            Log.d(TAG, "onSetCaptionEnabled");
-        }
-        @Override
-        public boolean onKeyDown(int keyCode, KeyEvent event) {
-            if (isNavigationKey(keyCode)) {
-                mHardware.dispatchKeyEventToHdmi(event);
-                return true;
-            }
-            return false;
-        }
-        @Override
-        public boolean onKeyUp(int keyCode, KeyEvent event) {
-            if (isNavigationKey(keyCode)) {
-                mHardware.dispatchKeyEventToHdmi(event);
-                return true;
-            }
-            return false;
-        }
-        @Override
-        public void onSurfaceChanged(int format, int width, int height) {
-            super.onSurfaceChanged(format, width, height);
-        }
-
-        @Override
-        public View onCreateOverlayView() {
-            return null;
-        }
-
-        @Override
-        public void onOverlayViewSizeChanged(int width, int height) {
-        }
-
-        @Override
-        public void notifyVideoAvailable() {
-            super.notifyVideoAvailable();
-        }
-
-        @Override
-        public void notifyVideoUnavailable(int reason) {
-            super.notifyVideoAvailable();
-        }
-
-    }
-
-    private int getHardwareDeviceId(String input_id) {
-        int id = 0;
-        for (int i = 0; i < mInfoList.size(); i++) {
-            if (input_id.equals(mInfoList.valueAt(i).getId())) {
-                id = mInfoList.keyAt(i);
-                break;
-            }
-        }
-        if (DEBUG)
-            Log.d(TAG, "device id is " + id);
-        return id;
-    }
-
-    public TvInputInfo onHardwareAdded(TvInputHardwareInfo hardwareInfo) {
-        Log.d(TAG, "onHardwareAdded ," + "DeviceId :" + hardwareInfo.getDeviceId());
-        if (hardwareInfo.getDeviceId() != DroidLogicTvUtils.DEVICE_ID_HDMIEXTEND
-                || hasInfoExisted(hardwareInfo))
-            return null;
-        mDeviceId = hardwareInfo.getDeviceId();
-        TvInputInfo info = null;
-        ResolveInfo rinfo = getResolveInfo(HdmiExtendInputService.class.getName());
-        if (rinfo != null) {
-            try {
-              info = TvInputInfo.createTvInputInfo(getApplicationContext(), rinfo, hardwareInfo, null, null);
-            } catch (XmlPullParserException e) {
-                // TODO: handle exception
-            } catch (IOException e) {
-                // TODO: handle exception
-            }
-        }
-        updateInfoListIfNeededLocked(hardwareInfo, info, false);
-        return info;
-    }
-
-    public String onHardwareRemoved(TvInputHardwareInfo hardwareInfo) {
-        Log.d(TAG, "onHardwareRemoved");
-        if (hardwareInfo.getDeviceId() != mDeviceId)
-            return null;
-        mDeviceId = -1;
-        TvInputInfo info = getTvInputInfo(hardwareInfo);
-        String id = null;
-        if (info != null)
-            id = info.getId();
-        updateInfoListIfNeededLocked(hardwareInfo, info, true);
-        return id;
-    }
-
-    public void updateInfoListIfNeededLocked(TvInputHardwareInfo hinfo, TvInputInfo info, boolean isRemoved) {
-        int Id = hinfo.getDeviceId();
-        if (isRemoved) {
-            mInfoList.remove(Id);
-        } else {
-            mInfoList.put(Id, info);
-        }
-        if (DEBUG)
-           Log.d(TAG, "size of mInfoList is " + mInfoList.size());
-    }
-
-    protected TvInputInfo getTvInputInfo(TvInputHardwareInfo hardwareInfo) {
-        return mInfoList.get(hardwareInfo.getDeviceId());
-    }
-
-    public ResolveInfo getResolveInfo(String cls_name) {
-        if (TextUtils.isEmpty(cls_name))
-            return null;
-        ResolveInfo ret_ri = null;
-        PackageManager pm = getApplicationContext().getPackageManager();
-        List<ResolveInfo> services = pm.queryIntentServices(new Intent(TvInputService.SERVICE_INTERFACE),
-                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
-        for (ResolveInfo ri : services) {
-            ServiceInfo si = ri.serviceInfo;
-            if (!android.Manifest.permission.BIND_TV_INPUT.equals(si.permission)) {
-                continue;
-            }
-            if (DEBUG)
-                Log.d(TAG, "cls_name = " + cls_name + ", si.name = " + si.name);
-            if (cls_name.equals(si.name)) {
-                ret_ri = ri;
-                break;
-            }
-        }
-        return ret_ri;
-    }
-
-    private boolean hasInfoExisted(TvInputHardwareInfo hInfo) {
-        return mInfoList.get(hInfo.getDeviceId()) == null ? false : true;
-    }
-}
diff --git a/apps/TvInput/DroidLogicFactoryMenu/Android.mk b/apps/TvInput/DroidLogicFactoryMenu/Android.mk
deleted file mode 100644
index 5674862..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/Android.mk
+++ b/dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_CERTIFICATE := platform
-LOCAL_PACKAGE_NAME := DroidLogicFactoryMenu
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_JAVA_LIBRARIES := droidlogic droidlogic-tv
-
-include $(BUILD_PACKAGE)
diff --git a/apps/TvInput/DroidLogicFactoryMenu/AndroidManifest.xml b/apps/TvInput/DroidLogicFactoryMenu/AndroidManifest.xml
deleted file mode 100644
index 6fa62d5..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/AndroidManifest.xml
+++ b/dev/null
@@ -1,45 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.amlogic.factory"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
-    <uses-permission android:name="android.permission.REBOOT" />
-    <uses-permission android:name="android.permission.MASTER_CLEAR" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="droidlogic.permission.SYSTEM_CONTROL" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="com.amlogic.factory.FactoryMainActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.FactoryMainActivity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="com.amlogic.factory.FavoriteChannelActivity"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.FavoriteChannelActivity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/bar_bg.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/bar_bg.png
deleted file mode 100644
index 3b328e5..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/bar_bg.png
+++ b/dev/null
@@ -1,9 +0,0 @@
-�PNG

-
-
-�~����������6�
-�!l|"��
-�} <�w��P�f�P�z�P�6G(x5C(X�"��!,M
-G�^
-�
-��}���=�2]���ƒ�h �.x
ƣ����L��D���`2�Gx�8?@��tr14�O��F��Y��L�GF�;u96���!�A_'����E
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/facmenu_item_bg.xml b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/facmenu_item_bg.xml
deleted file mode 100644
index 257a00d..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/facmenu_item_bg.xml
+++ b/dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#00000000" />
-	<stroke android:width="4dp" android:color="#FF0000" />
-	<padding android:left="8dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
-</shape>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/facmenu_item_bg_default.xml b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/facmenu_item_bg_default.xml
deleted file mode 100644
index 1f4f07a..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/facmenu_item_bg_default.xml
+++ b/dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
->
-    <solid android:color="#00000000" />
-	<stroke android:width="2dp" android:color="#FFFFFFFF" />
-	<padding android:left="8dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
-</shape>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/factory_selector.xml b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/factory_selector.xml
deleted file mode 100644
index 352e8cc..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/factory_selector.xml
+++ b/dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- 默认时的背景图片
-    <item android:drawable="@drawable/pic1"/>-->
-    <!-- 没有焦点时的背景图片 -->
-    <item android:drawable="@drawable/facmenu_item_bg_default" android:state_window_focused="false"/>
-    <!-- 非触摸模式下获得焦点并单击时的背景图片 -->
-    <item android:drawable="@drawable/facmenu_item_bg" android:state_focused="true" android:state_pressed="true"/>
-    <!-- 触摸模式下单击时的背景图片 -->
-    <item android:drawable="@drawable/facmenu_item_bg" android:state_focused="false" android:state_pressed="true"/>
-    <!-- 选中时的图片背景 -->
-    <item android:drawable="@drawable/facmenu_item_bg" android:state_selected="true"/>
-    <!-- 获得焦点时的图片背景 -->
-    <item android:drawable="@drawable/facmenu_item_bg" android:state_focused="true"/>
-</selector>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/ic_launcher.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 288b665..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/ic_launcher.png
+++ b/dev/null
@@ -1,33 +0,0 @@
-�PNG

-
-
-�������/�9X�nz+<W�����1��:�맙
_����
f�Zr�H�7d�P
�ɋZ��L��p
8�X���ܱ��y8�v�Yh�cs�n�ps�\���?�s
�*OQ��>�^�����-��	��������"@wHQ�/1'�/�����y�������ꜝ�������,�Y)�$�<B��[�:��D6W���!@x�Y���%(w���dWO��P(��@~�Ϟzc�wl�銍W����=�O�t��gq�z��W[��/�988��wކ\��0
-����HP��uu�dqdӻ�q��.!��it�+���b�cv����n�py8)�
�'l��s�z�ɩ���R9�~���:S�|A���5��N�����B0Y(N�0���Eś(7����TRNN�p�Lp���:���qs46^q��s�Xv�K�Z���j;L��U����}'�WϱA.��'_
-1��s�����/�p��V�y�����qL���,�`��p�I!�	����Ǐ��G�-/l�6�.����b\���OG�i�)jw���5�WyK�re���fH|w}=z��gQ�Ovų�O|��N>Ά�^P p��
�{4��G
-����)�<�L6���ϟ�G����������t��.�Ćs����0օ'�n`Ѿ� C�Z#��bx3y���[�y��+ݎ��C<�x����qg��t���e�𰗸����=�c�É���/>#��Џn�����@.5[�ya�e�sa$V}�e'\����H��'�P��U��Q��y-�WI���e���V���g�5�?o�6n��[���k��WŬ��'��j������h�]��C��}�n��vn7d�z���za�W���ώ��S.h?�vh9���k��1�m��\o��U&�o1f���*�He�[hͩQZ�/x=�pɓ����5�8;b�N��9���F`��Q�:�E��*�H�ᒇp�yf$V�v��.h��	T�`�綘��
-u;�1{�	f�3Ŭ��([iA
-2a	��/C3T�y
�V�\ˎ�'7`�N:�:�N�b�i;�V�v��V�q"wq&
-[uƍ��b�I�N�
-0G���=���`�+4�D�vs��lF�LD��� �Y�fi
-SRU澕�+�zdt��C6B�a+����/��z�mǹّْ�P�w�R�	'J�܆��
-k?>\��z��q�,<`��Y���4�@]�9���b�F
-�k�P��K
!o���ru�0x�LFq�Gb�%��gzܪ��|�o��^5��0�9[�ߜrXt��Y)�5�2[`Gf/��n��	���J��m	�
��%8��"��3To%8��I=F(]%Ea�
r�!�N1%��'V����ʧ�>�_/�����[>��?��\�h���{�)�i�3�;�ok�m�w�ю��6o�9�%��ZТ-���"UXw�
���؊n$B�g-ƚ�Nr�ݖ��٭��f��L��\.�G����^�Hqe�lr��y'�O������7�P�I-L�eaZ��W��7��z������]���aY_�B��S��o|v?p��S�*7���J��[��6�>+n�
Ԅb�	-Ό��Y��-	���" V�y>�"��c��j8�Z�S�͌����+��x�r"��I�F��c�*0I{Gp�b��r��#��V]_�by��l�=7��K��T\Δ��U���?���~�2���˘�g_$���g2�p��n]���*l�:��m��Z�,�xx�Ȯ�c�ppW�����Q�,T���.At��J�<�)U�Ȩ3�����
fȨ7CZ��f� ���ERDd�cr��j�#P�cU`�:�*��ׂ�(+�c��%W�p�L闵�R��t|�y�O�� �m�>��8�������KFhj�J9�}v��1���]���Z�pD��Xr�
v(h5�J��l�����6|0U��̪6Z"��!���V�ݘ����ch��Tu>��1p���������;�}����^ۀ��W�=��>>�
��~�!Z��������w_x
�O� �At����v�~�ߔg�/]a(�wXb^�-�V�My�b3f�^���zc
-�F���c��YkM��5�l�Z#Q�+����TP�͂RU�V�}R�����ϭ�v̞jG*�\�E�u�T,�;7��xc�qo,?ⅶϽ�d�'uz�y����n�j�8b�&;2[To�fM��
-5[��lA�f��M���x�hDq�g1}$Vj
IC.;z)��hm�]��x)��T�7A�J#
-��lz�s�E@�O^�܄���v}�`
��D��uA��OT�"1ý_q�Mg�j6{���1�)��P,1Ec�"p���x�S7�T<�/<@�|?74ﳧ�e'�z�n����z�Yw�1��P��e�FY�zHo�ÌJ=L-�f�)_�5P+*OcGv�.+���p*(�����b�%�#p`/Zf�
-Z�����mч|�.�+4�_��cP~����ez�l�!]��ұ�n1a�PSY��5�V��L4|E�j�����`D�P(����
����R��R;-����><��M�)^	�b4����/���pq��E�b�$lT�@?��zТ�!�K�MY�]��T�\K�T{d4ꈀ|��Jt�=�vw�RV��@l g��Ү�B�ŦRa&o�iLĚf�Gl>���RQ�ƚ\G�Y�(�0�Ȳ���.�i�ͩ"�gP��R���r}D�j�q���Vd�־��:�����S�ʘ�+�@��B4Y٫��
/3cy(����!{!I�*�b~q*g�͐
�n�ݝ�"ݰt�!�*
-H\�7���qEpw)[�K,��H!��9�.�%^����Ī�I(ZF@�������ĀR<��}ѽR�y
���-6.J
(L�F�t��(b��\��w�{�
Z�+¼�͌�谼]�8=��.��%H��Nr!,�cPf�����
K��
-?̨0ô|c6�
-qyNغ�O�>�Lׅ�{�)���b	P�.9�rKL�5b^��ge>V���\L��x�j@��D�
;5O���7�5@-{b�Jڬ^�9�P
����b-61f�

ʨ�4	����xM��}����/��?Ɔ=�W`E����mx��Ax����6Ӳl�e�<<{�"DnKg3�_�H%���X�
-q��z̫nT<��L���j���JJ����2+De��'�M2�
Q�x�)"8�R�~�KFeK[���zm�Ѷ/I����)��e4i�z�1�N3�p@��'f�m�q��5�m�u" 1)T�/��/o��t��Z�<���2G�Ν@��q�҄��x��f�\$W�F�*�Pd�
W�($C���:	�q���7�9�E�EfJ�Q}�z
��IC�[m�d��
�q@����Z�Z�A�� QO�R
-@5��2��n�
-Fۦh��9ܵE@�R�
�-���]�o��
-)��L��x[��D*ίy�\��Bӌ��1��_{
Ў����:\M���fTiR��@d�*Ru�]����Σ�6�����q�{@
��TA�(���HA	��z��*��Xb�9�`�C
S�����s��Z�"C��N��g�i&OmG��K�
:U�{DiSK 
-Aʇe����P<�R��xS��XJ�e(V�I��Bd��u3�������,r8:�V�+�Z��X��Z[����a�,b�UGِ�9�#	�D��j�g�*␒+
1�)
W����z����
�S �9�2��0.BU�bq�Z"��2)��\����*�
���S�Pa�rXw�.����5F]	%v]a3����m՛oQ��^`��%�1-Ϩ+2[OI�%�W����q�sڃ�g7� QA�-Q�Hѻg(c����nNŹ���x�S�����ի�8v�
-�LèI06J�ijTu+�L�
-��+��!H1
��o���@�\i�X���<�/�@�Xw1�3���ݯ��R�I���O��,uJ
-����@l	
*Ӣ��P�����NW���>+@>��J��zO��Z���K�te�������>=����m�G�S�N�ဪWD�6�D
o�������AI�L� X>!ɆX����\GY�"H_����c|���Z�).�3��p0ܽ�}�K��R�(uEl�6��j��A��}�7>q��w|�����z�rq蘼��]3kt�j;�C����)ΐ$"$��R �I<��">��vȩ��x��:�9�,�Bޱ�V�=b�����b9�S$���Tg��X]���� H>/ࣴJ��q�/�
a|^�A��HF7��FŨD�qlˁƖRM��N��DD���������Ϝ�;��o'��8�ôB�:�zF
-~1Ǽ�U�(��_n�N�g45��tD��@(�Rq�(�y'�ZK��UX����>�n
-4������ؿ2�	}y����T����,�8Qz&@s��g׌��[��(���QaS�ӂF��d׎'�c�HY*Bn	��:������0s�X����C���Q���,\.�nLh?���	�?��G_�~����1��=X��՛Wb�Pj�0��-6kD�(�a�:z�g���p;@a�
�7���1O?�k��}��{[�_GE��NB�Ƀ)���_�2��bT�
-0�ld��
�z�1�-@�2��~T�0*�����3�����G��
-��Z�_�R�[��(y�
K(3�^b�_b-�س�3��
:II��>�{:�_E����>M������u���z�R��"2�g}g��+���q�Ͷ# I�6Rn���|:�`�Ģ�'cr�W�02�)��O/50M��P_�`����)'JN�L�Y������8J�a��/|������,K�h��&����*���T0u����������*����|�|�|�|���
�ΚE��
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/icon.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/icon.png
+++ b/dev/null
@@ -1,17 +0,0 @@
-�PNG

-
-
-�
-�
B�4�
-�w�OP�OP���B����������	�*
-W$�m���x/JW�uC�X����)�c�i�c�:��u1FK�I�U�Ζu\{��;��:$�d���ә��@9�n'���j�\�(��9���0�X���k����݉V�,:T��J��a*�� (Q����|�D�
���R
FCV�
-J����X��gl�9ge.cE�d���e_bב�)�H<�	�H��EK?O���ɕ��j�w���������������w�)1�����P��7���c�9�n����:��3ւ5�
-��$�p�ϑ��Y޶	GİVsxl/���J�Â�r��������!�J,��ܛ<��.��LW�����ދ����HE�e+��J�����K�2�ěT�ieB���7%Q�v1
-�\�s�-�$��X��b^W&�����#��4��}5
,.>�ow��=AZ��?��AX����Z��A`uhmj�Zk��U�>���
muX}�Zku5�c�����J�2Q~ط��L�M˪m���`FTFѺ�UT0�o��?e'��@��������'�M�Ǘ?ǡ�6����#�
0#
:�P��©�}F�j!��R���X̸�c0��V}fB�kь4�ڵ�1�6����~�5��G�3a���(*z:�[��4f���l-<�.�:h:�����s��M�D��S�KJ���x�7m��E�k���h��Q���.�R�x<޶y��n&DŽ�Čm���"�đ	�	��T<i-�㠔�СC��e�٬uh2�8#��C��
km��
ºH\.��X̱t'{�q*�
-�v�"CR��Z��fU5YC-����W&p���eS$�E��J{b5�L�pۈ9i��(S�X}\�����T*�HLӪ�on�y�����X���k�=���.FJ�)�G,��#\-�:S`y�GX���i��	�.�ˌ��㺓�)Ą���ē�8"�+c��^d���{���.������X�w2��ʶ��J���%_dE��(-	!PJ
��o��v�� �+�H��B�2�œ)����f���ж��w���XtUA���
-�bx��޾!��}H�몢: 9�gK����]IOz#����Gر}'zq��rqv4�� P��@ra��Y����u+C�7��n]
¡/�"`�Ԥ{�Tt�E�sX�u-^�T8R��8��6F��{�@a���Gir>6�S
c5J�	T����duk��-2S�'�x2U���Ps8���ҿ�ڳ�k-�����
Io1���%+�un"$�8U��8#ü�c���+ �ft
cB<'�#���	 ���}�K�|���w{���c/`���ǧ�}�mW����&�p2�3e�s�8�A�g�ő	���*s=��2p?�`)���
-�2�wk�Gx{����0�ü1!)���lbǑ_�q�WX�~
}c/��_d�҇/S�~�!����qF�)]fm�gY�~
�T�힯�?�\���տw�]����;�9��1
-յ�ӆE`�"1:��D�.���M�F'/$�$�
-�A`'0
-U�n2m7k� Uͼ����8Gh��S�e�ܠ���r��f��D�],`���X���SCM��X
-�8����R+Dq�1]0I�w�!u������
��L%,�
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/item_icon2_def.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/item_icon2_def.png
deleted file mode 100644
index ae50b16..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/item_icon2_def.png
+++ b/dev/null
@@ -1,29 +0,0 @@
-�PNG

-
-
-
@
-D�
-d������͈A+ҁ!���A��{��{/0�;��ޏ�l,?�j��7����
@�j�
�5��
}�
Li�ƪ*������2��s3(��3�21�<x����pV�k��
-�,+�S �N�{x����?���J��?FP����?D
-3(�vs�G����'���_���Zx�GT$ ���^Ѡx
-lp����\���@����x��a������O�)V|}C�`@c�
-lpc`Ԓc�dc�fg�돀Z������*��H����
����"�J�^[�_����_�����簹��t7t
-�����3hx�22�p2p���p��O&`C�	�
-V�@���|�d�ߠ?��+O虓a�RHYր5]�����i�?j�
-��00
-����{�9�P+F��V XW�x̠@��Њd0 <K22���π:��40���0$����]K�Q?Ě�������-�ӠA6`)
-�0��p��S�[ ��>4��
	@,�i�L������p
-)� �;P�1
-�O�������7{��i&&V ��>�		<&,����@�
nCj���
-���0V�gpђb�d�5w�1Т�W����54�`�����
-F��Rq�A�P�g�ɽ�քFњ��b�fg;-h;��;�
�:�<;���_�_?}gx���__��'�@�
�:P�F�#� ����΅ 0)�g�/6�;�1����٘�O`B�G��*�
*�A�p�6(��e0�
�[��
�-�g�R����;ߕ�g�
{�y8>s���)����
-����)�����e��o8Y~|�txs.�
-̶^���^�帴�æ���
-����? e��h
���
-�o[O3�a����U
��_��X�0�^�M���Lq��bG�f8��/�`�fec`9��R��~���m��vfHSF����KW��ZU���S�S[N3���
-?7�����@F���
-t4h(
-�����q3DXH0hK��:w�m���G�b���9���
-<�D@,����
-
-⃎w����(�Ӓ
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/item_icon_def.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/item_icon_def.png
deleted file mode 100644
index 81c5312..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-hdpi/item_icon_def.png
+++ b/dev/null
@@ -1,41 +0,0 @@
-�PNG

-
-
-"���4�&1F�ۤ'ݝI���9�93̙qz�t'}�$��j����pAY��(
-�ȾUT��ݞe�x��x)
-5��3���Tq�{�����Xg<����!��?ӿm���l&��߆��`�~:�߇�԰����m�|e
-0B';��Z��I)�2�j@"�"�S��[SƗV@Jp'%l�y�{��;3L	����|� L)�+W�V��g��Y���2.�=��EGWm
9�U��Q9��鏏q��:PM��y�7ʐ����`���\��<�<�>��(-@+�r}/3��4L�U�EF�
����!cC�^��N��3[X��c��Ye��RD��ƗU�{�����1�ݔ�cB�n_ȭ���C˩:�)A�4(m�^žl[��)�j`J��������
>ڶ�W�z�ׁ~����K)�z�=���»&���ہ��<=��ĝ�^�͇�p�[�P	 T ��Re�e[&s�К�2�	z; �س�S�{|/E���/��e�$���@'0揾�=�zYs�o�M��A�b�EjI+AZ
-l�
�eQ
��M)��l�w�,z'�f���?���Ib�R/W��^|ᜲ�?
-=���w\ϝ3&�r�ت��c�C�H��=� �:*���t��$6۱pm�u�d2�,��K��p��ͬ1��~��]���ۏo`�ٓ��p�z�+�y����ױ�;7�ga�g�j~��B	�2	OA
-d���˨��-|\�Eεhm�2���)��G!�$ԪP�\��[%��j��Ӌw?��wR�[_&���Ikˏ]��o����;?Ӕ8Y�zgw?Q�
-�d2���3X�'k��;Oj��p�5�^�/Ax5�z	镰D��-y�o.���I���W[�@���A}��.u	L��w��˔�
ޅ����V�D
9��`܍�Y�A��t���.�3���W^镰�:
.t4�����>���}��Кc�irj��"e}+��j���C�9I�����!�T%��^}q(�%��
-t�h
���bއ��h%���'!LН_#�*(���i����x�v�ly�Y��R‡)��e;����Z�Ҷ��Rm!&}D���K�F�
i�/���b�iܼ�洧�EP��Z>P �WQ~+��w���ᇷ��m����_�q�0p
-8c��++@�����Y���VB�9���d5��O�?�6<�����^NIUPk�|�<RH[��q�>���#M%�]�7V�(D�2�AX#�@G��_��˻��7��
��)ˇI�����K������(�o�������'5�X<���u;y���J���J��S�t�K�$�F���X����Kq�'��|Tࡃ:K�VpX�d{����y
'��$0v�*-W��:���'�*�����6W�{�
-�$�(DD
*�c�����i���v?��۟��b�*}�$���!�3�\4���v�n�qRs���{�Wh�Na�uWr�e<���S���R-nh�����L?T�q���H)�"D	-2t3�2w<v�
-p�̸}=)u�Vi�F��F؋ki6}Ǹk�p��㚁@S����f�Q���|�xA��L>E�\(4��lY��|��5ͫ�eš�Ə �4��W$5Bi��Q
-�\pw[o���wM�4‡�Zz��Zk.�R{I#��?���BW�;Z֔M5�T"͠��v\0�K��W��c��熂��+v��h2�k:�Lf�~M%�*v��trJI��h-��$cCg1K{cK�/�r�����W�Ƥ�'��6��嬙5���N�֯Gg�Q-�
O������X�dקB��b�`#5��Ǵ511������BmZZ
R)���r]��b��\����Me_'U�R�~��R����a��:��u>�z��b���p��j�Ⳛ�
7\�͗
-vJ�N���W�0���)
��@+�ظn�BC����ӛ�7L��Fc��Q�}��Z_�ӄKB�t�h5����'��"{�H�Zd�㸠�U����Ph2�y��3'����5��z@�2&��8��S���C��ħ6G�,���32�ż�M��
GǎbL���gp9��:�
G���		X�s!���+e�$돹o%w�Nb�3�(�@�&����Aa�K����=>?\а�k���vR5�������,���x7��l4��a������25ma�.�m��h1��@w=s��c��4i�u �"�7���E��D�B�mML�i�|i�b���H�d?q�h���"����O���ߴn'�R�;�8�
-��8V$���B'�z?0JSY�ec[ʱ���>M�+ɺ�Z1㫵��|����9�6��X��U����;�]�}�J��Q��dUS��.4^�C���X$�m�D�wO��#�����ڟ��GRe820Y?� ����݌�VkցAM_�:�>P
-5���M$��4���6XRʼn�����J�a�9]�N�����4��
�39�-�k��
�<��{�������>T���w�2�J��{�y�XI�fvf��V��cI
Z$��ބ��ͣ��hY{�
-�0����b�WTM=ԄB)�L�k
-E�,�l ��1�o�h��c
W�ؚ�(�~��*u��V&
I	��x~�W-��T��������[O����5�u�9�/A|�w���ݧ5'�P
-b^���*��Cib�(���0�x���I�= 3Ѥ?���V�m�'^���q�d(�::
-B�����5+Ji�q+\/#*�Z?Mv�-��8z����gxj��W��|wN�m:&9Uה|M9�k @�X�s'�QJ��@�
"�=����W��O;��9Q-�g9�LYΥP
��i�މ�3GA��e�H��R����$B�Da
�W�A���ےe��n�|�gMTN����eR���錟?��^:���Ş��(�PC��}�%�KdPE�U�z�^��T�W;N3+
��W@p|�G�v�UE�s��%ptJ���5�ĚR�e��|TPG�U����`���i�����>����*C*����
�;����W��5~(��*�8QGz�H,�P�Ľ�%��T�~;���KD^�}��9Y������AB�&9�n�SϿú]�����Lk�����C��1�K��R�(B�>Du2Z�^pX=o�N�����y�t��)D]�L�t�J��obz�Q��|$@�� �v���؂`L�E1ga�6��*��2)Q"D�>VX���ݠ[��n��(
-	��P�-�e��P"BE>uܰN>g1�=���n����0$
-�Y�j��=�7���!%%ZD��ǎ|��)r��I�s}�Eƶ�z&l�k���
-��M{Xw��ⴽ��	+"�
ڊ=
-���
�����X��ٳ�'G�+�"��@��討#|\�)����x¸�����Z��8����m݄c5��߹�)G��L���R�~et6��k3�������8���j�$k[�%d��L9�
-o}���g�j��a��(�
-A���i+8|�4^��/���li��?|ͼ!ԩ19'�4,�Y8���T����
-���E�0
-J
-�
-���>��]�vJ'Ͻ�#x�@�c�<)���䈡���<���5M��������w�g���'H�bk_,��:r��zV�ᖷ�IN��V؋bn"H�)ŵ?�eD[�avO��}��8<|]�`d�!/�� %��֏غ�S��?Z�è���&�{O����+��Ϥ
-�����_>�ϼz��z���UdҨ��z�����S�UNZ��ߛ�O6g�O6gӧ̆��?�kgN��Qĩ�����'������
-븄�k�2ob+AP|�ml�>/z��B$t�4U̿÷?��]9�V?R���?ᓒ54�;�9g
L\}��-9+��3�,�L��׸�����w�#N���aB�k�С�kXa
Wx47:2�{���7�r��
�".������֜J���u;پm�5kJ�Ӵ�ReK�&���ܒc���I�m41�	����z�^��G˚
�a��"�it�AP�
-�8Q�|�����ycy������lI������Up������;y��bx����?� Cbё1�T�禄o:-�q?���N���⽈��`s
-��A��ޣz��<���s�)Ň}
-���ٖ����Z2�w,�UM��x�[�`��Z3ʕ*�F�����v�ᨀ��5�hpX<������z��zn+/��@���t���:�������o\�����qD��JG�zhj��	��U�TC�)�����>�
-ⳅ
6W�-"e�K�0PjY���y�
>1
-v��^!5boFݹ�e�sskQ\�q_�����D�4�m����J����<�Nng��v�K{���[x��)�7x��������
-��Q��H���frZ�u0����+G53֋�B5�j���qhk��֐�Xp�Z��?����m���6�b ���/pY�b��[c氁3�Lk۔Z
@a�8��t��\��T�P�O�8�O��>�DbH������N�����B_嵹�u���Qr].�:�K!Ť)��5�Ï�����T�L
P�3�a��.N�y���g�:�����%(#��\��~�����^�R���9������Z����e�����
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-mdpi/ic_launcher.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 6ae570b..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-mdpi/ic_launcher.png
+++ b/dev/null
@@ -1,19 +0,0 @@
-�PNG

-
-
-�!xh_B��]Ȟ_a�q��r\C8y~���М�B0��.�����#���/ٳ
-��"������v��ݫ���
X������x���l�?�I<�*T���4�{����ݗ8�d�<��	��sot>]����c�}/��-W�a���U��LJ�P�n�`���J�����/N������o{0�n:���<\|Ќ�����;�ܛ�������,ʸ;oz���l��u�9c�	t\��eo,�6�"k�$*���
-�1�qןw��xqZok�Z/ځ�]�tt��+��e7l�Lo�2
�.�aC�T�=h:�5��Q}؆�c����-�/�W��������ǧE��U�9i���6�fl<#D�Y{4�sD�9'��h>;Yt�)GM�G��<hM�O"꘣����j��5�r��ѥ��~����Ym��!}K-m)��̫�o�T��lZ���$��F�1��%j�&�N[T�
��^6xn7C�f�7AV�Gt>�Y5z�P�5�2�t���#��ȓ�~3�{H��{��T~w���m�E�e��>�o�4L��:�����
f(�e��j�A+dM
�n��
-8����V�k��X�xK3�5� q�
-�2�+���w�Q�p�}Sd�7&
-A^kq��
�١�{�ؔz>��&��1�����`{R�`�(��!�F���0^!������,��
ʦ1eB�h���i�`���]�ήJT	&w�)�7� s�$�d>�����|�)��Y����'魔�09쵭&�8C&P�wn���2 
-��5;�){��pJ�>�\g@�Gt�CF��V	�����fC�U��d���Bl;&���Z&��7���y�
-WoF��((ט�|�
-5��ʅ(P�- �#K�ҧ�諔���ӎ�� �(�!9*�ѧ�#*���X��.KV�cҚ��%#a��FOt�Mk"F�����{{{����|G��!V�
-QШ-����v�:�-�t
~	�M�>��

h:�IV��>y-�a3"Y�Cd���[����L��1�>-�����_B��4�����x��&������‘����
-E��<`
-s
�%���X�*)�ԵZf
-�A�J�g��Y>���
-�5�D��P�Ọ��!"[#�<��\DeY"J��x,椱��l^�]���#k�z���ʗ+)������X��켠��C�z�\�KHz��(Z�JVqH6��<���7���L."�m,qzIr�����*D+���Ef�3+��I-�4�zq��/Wº��^��kL�)�Wl��<S��
-��� �����������u�ܬ�Oʟ!�����T�IS�]��E_�+d"��4A�\�Y���=��˼���v'� Λ�ȴ)�����@.#�5��s�uPbO(tM]=�_�y���u`��,�t*��ZH��§.2u�Lm5u8<u��5S�t�M�i@�Ӡ�PT�%�*Ǒ,����Ѥ庘<{$l�}]��y�m���6Ӈ��f}�i�ti`}w�o0��t�
d�ϐF�N���%O���q��=F� (f��d��{ݗ����cI�&�,��
� ��=>�`"�;���hZ�Q�0uΘ�~M���{x��]=�vW4ѥ\���aa�� ������p�Q�N��<x��1���Ϗ�4�E1�zho�P�>”�&��xG���"������×�n�δy�i��Jw�]g�W����pHX� CR��,y���Z��fsxA�؉�/���8ه�8�-Kqt�^��'����K�����f
-c��������O�ъjD
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-xhdpi/ic_launcher.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index d4fb7cd..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-xhdpi/ic_launcher.png
+++ b/dev/null
@@ -1,78 +0,0 @@
-�PNG

-
-
-�����Q[o�5�;`�$s��v�4�<y.�^s���B�a�ޏe=E������cx�c��v7z#�WE��n
-�33��?�Z�	�`��֭|%W@棇�)x��c({��{�\�邓� 8v�#`+�l��a
-s��xzLx��@��C��	�nE��pթ�s��`Fo�o��*�Q�%�w{~�ݡ�׼A���k΃�����,�OE��=H�;�w��
-�{��!�A:<�r`���l�N�=�C��`�<�+g��8��
;����>�`6�2f6ޱ`W\0a�7��^al?{���}»
$/_
��Q|��P��>�=�
1�}6��������*��v}.Z7�|j�x�m�E
-��`�IXxT���?IкE�z���71��W\"�	�V�9܆B���!
-�>=9�j8\���
-�
���|
'F�?�_��H?�c8���A���{���n���#l�m�Y�ʋf��cX�!,8�sLb�wh
-�֩�(]��M��7��5�؎'�G�������9a�2NE!㨈Ga:��D4
-��M X�u(C'v��x�q�vsP0�
L�]�=a�W�|�������V���z?�T�փ�}:о]֫	ʗ*�,�R4|�S��-`���𚋐�����tF��aA
-w����w�ܭ��x��l�$
-�aa��hޠ
��ԡ�W��0����j���:
-[�bAu��⁆���z�א����`�
W�S�X}a2�8k����%',��4�U��ѳk
-�}�V�!����/�.��n��׿��4v�[l
��L`�s�w��FD:r�
���]��T2s�z�3l�Բ	=��Ml�u��kΰ�����.8�����6��+X|�1��C�е���*����K�NB��p(_���G�C��I���Q<��VE
�����UV�sܳ����d���1�冴7�=�v��NEºӡ(�5������
�;���B��@=|�%����9S�9��v����.9n	����(�A#�
-%�5�b�*z��Ѐ��@�����^ ����|�VD
M?{x/:j����ɏ����.=i�-���N`�4D3�E'a�qҫ��ғ���V��
���lij!b/?C�;I3��'m�˱��Tx����`�!�����w�a˩m[t�iI;��P��T.�D
-�+��+
-��W,S��%$�0�+B�,Hm�gc����9es��"'(��E^�IA��y6e�Uȸr���>������[����2\ٱKۺ�O�7���#���:��_��ːv�:\b��ݏ]���`�iwr�^ۨ�;̿&@^HJ��Ȕj��"�k��lR�.�թA�L�W�-a�j-�<@�%^ݱ�D�.���-4r�+��<^�
��n������i#-,����5�t�:�u�Bz�2�U*AT��f�@@�!����Ɲ;�z����n����c��k/:����s��4x��b=a�n�	��1`C�_�Vu�|E���5�tC�?�8������{�	v?x����]sg�����o�Ԯ��h��o�}��Lj��Bfw����)�8U4
&���8L��&rG�,o$(j�5�1�k)Fc��e�N��)�2�,�!��)���-�Xj�Q��yp
-��)�9`�%
fN��o;���@Ewp�F������?ø	#@Rf4�Ԥ��J=���My����bT�����f�l�`�
�� �zO�і�8F[8���\�_��_����ف,)����}��#f����Npԟ��������P�RK��
{j�0���=��5�.{_�{/��=��4aWR8WbJ�aj�$���
=�_@���U�$�
��_èq_¯b���?��~��0�S���Oở?��~��2r����/��c>��~
-?��~���F��;�I}
����
(�:V?���`�?ܢ��'EBr'��Ӥ����
�|�o�*�w`�b��j2����oч��DxM�IagS����	��ƌ{�
-����б��V�B�R#(��Es� w�$�l҂�:MH�ր�J5�+�AL��"D#��R.Ės!�J� �N
Қɀ��I�H�S��E�-V�s@�R�,P0���S�B,��H2v�c��B�~�(�ݛ9S��Dz3��V�qd��x�,�񌙰���

-[իF�'g�h>�Pd�*
-ϗe��Dz���	��l���Ya�sW��<��kW��	
Da��1
-,���s����F.U*�zƌC
-
����3P�*�r�Px"X�Be�D|�,�0=�T��&�
j�&)AX�C
-Q�H �]��)�2�Q�C
-PܣM+����
-�b_���#��N�"�]��B������g�h`��~����(A(��ǚ��Ȗ9��$�b�gi�XFҏ*��$}e�Td��0�ђ=v���o$D
-�lr
���#G�v
-���7���T��9\!
-ld1
0^��u��;C~�뵫(����vr�\"~�<�̒�<����(���KoT���!�b�X���/���B"�a-��YB�n�?Pg�lC��Rq������+Q �'`(��Ϯ�%[�`F��.��e��i
-�
-�7t�����ss�w����
-�]8
{�,~�
-'G�Ù
�
$��Ax�
-z�X��q��qz�}S'�N��|O:!���
-�.��xUH��������7�K
-
d�
-
$�
-��JWD�ئ]=Sƒ�ZY�~�eƈ�'
-�4(
-
Q���P��t7�n2�N��8�ڈ
-8�(]�W?��<7� �P'_;6�2!�\��V�0�\q�P �U
-X��Y�N����
-�*��5��k�w��Y�
-���.�{(>�1����$�s(��Ri ��$Y{��ˮ��N��>�� �b� u
-J���M�0H
t(��
- G�q
-�rM~y
-
�
-M�.��
-B
- s@���]�.e
-+7
-# ����_����2�Rb��!��N��
-7
 JC��l��qi�s��ݢ�s
- �
-�oUd�;��g��sV���#[��AD��1�(=�7�>�T���o��-��#@�gfȰCⳑ��lp��(����9g� �)m���k��=�^�A�aȲ�
-�yү���!��RK��1�
-�
��T
-�D�l��-a�5|㔠�=���{��)�j!
-�}j� a:{�`>���L��J���3��(�z����NZ����|���,�����o�]2LKR��+Z��;V��	����h���P���|������M�_�r�w�&�K�$��)�eͤ7)���^@����s!y��{� "SZ����c�h��\�rJ`
��o�t<H���`���Pј�5�T>Iؕ�t�+M���WG�rhD�"��S�A
-�s�a�8s�8�Q&]���8|t7T6%��6xDM
-��*lP�:럪:���=;5���%9���D]����ᙓ��;�R���g�@D�-�iU��^�Vki5��R��`&!-�N�
-�Z?	�Ձ�=�����M&��d
-��f��h
�^o
i��2�+L!��b
-
!2O�
��d�ʷ��q{��e=Hk=�m�$uQ�Q�=&2[7�/���+

�\��GO-3���ɐY�H�_3ҫm��K6�Ίɨ�f3l٬F;6�i2��iv��fg�mq��w��A-���\�_��3l ��"�u���i��U��S�!o�}����C~�A��(N@��}3�_��s� ^1��΃�mH,3��*+
-!��mp��z7�m�d�Ba�4(j����P6+
-��N?(j��
-fn���S���Q��[�	���Ơ���{
-��0�&��k���I�^�Z�����
-)��U"
��
-i����O�$8�`$�J�����J4�0s.������?\�ƂG��/����
-�\�U*C7OB�8ȗ
�I�#B�t�����(�����N!��ac��q��*	
|��lY49ʒE����e��t���V�*���N˽�5��k��J@�
-���B��z��h�*���3
-S�2�kò��G噬��7m	�6��������_/� ����
-�&U����f��T�;�t��e4�z%W�����s� ��B>�ߝ/�?��c_�G��o��$>J9�Q�er-O|��W�6�oI���=�w�/�?���������x�W������
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-xxhdpi/ic_launcher.png b/apps/TvInput/DroidLogicFactoryMenu/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 85a6081..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/drawable-xxhdpi/ic_launcher.png
+++ b/dev/null
@@ -1,118 +0,0 @@
-�PNG

-
-
-
1T�H���-,�
-'a���2�7P��J'��
-�.(�*F��R�P4�!,��
J~׭F���p���E����g�;�:3
-�/׻U�����Տ����
-�8���}�g1p�j�S���;��um֧�v���4����ݻE|j*�@!Vj%�r��<�wP���������–7Ppo�wAщ�Pt�5�����`����,�z
-�!��x҆=��o�A�w ��>�:�1�q�#��D����G�֭�<VL�gn�����V:::��Z<��8� Y�6~���k
O��1c��~���ن�}&
-�)�,ҕ@�7F�J����7� ��Tx"�Dx	4�B<<�(���G�w!
-��p�"s����F��Z�����⻯�J:!���h���d1/ �U"��y4�a��"
:h
-���7`\��p	��y�X��p�S0�1c�V�=s��(��;�`�{�{���W�z<�|k��ś�Q����d��~�t~��|��O/������0��S����z���kg�>3�y
,z�5,wA
�M*�	��t@4�����J�G-Ũ���Ae���z�+0
rC�&�Y��4Bt�u�c�����	�t��C�����%�[I�<�e�=s`�v�K*ZL �yIJ�B3[�8KJH���aߺ��tv��m�e�rj_�W:��77Y�1ɾd3�5�#,	h�g�C�KU��a�A���ChVb��h��,�#X%���6��U����	�
rC���)v"��Ѯ�p��|9�=��=OF���v��G�����k���s��V�;P{p�lQ����r�Æ>���F�܇��܇�`�+Ƚ�R�<�H��6a���3��9ЎUQ�7�(8+0h�2���a��J�P�����4S�tLa�p���޹"@.�88��-O�Ѱ��o[�ZÆ�l�%Kf�ˎ�cV*�ZM��g� t���迢<��!�<�L3����aaB{�
d_@&’�
-���{���#<�1]q��`���2LU5K�TI�-���s�t����Y�?\D��!Dg�i�;4	
�
-�TO$,��A���a�{�k���E�ҽ�-O!��1��� ������T5"�d�!DA�@s�h�%��0n#$w�[��Q�ޏ[Ty��g�"<���f�� <~�>>pJ�'�M��7�p��d8���?u�=��`�1��G{L_�`�M[Xw��/Y���#��d��!)o1�,ڪ5w�����F?�xS�����Հ�s\?��ԯBH�#�|���]�a΁;K��]4˷PQ.!<��sT)`�� E��DIf� p]G0n  7�>7!8��k�+�=��Q}�c:<������p�k:y��^L��\a_��~��y��=l�5
-6\�����`�ő�, T�㦀
-�O�/�z�"���IẌjB��5j�C(,�q����
-Xw\���}g�Y���N�g"8ި<ϫ�p��;x:�=�{�'��ΰ��#l�=6^E}O�YX{�V�v@�1��:P{��
-FP�ː]�I��Y��*c�f��JM���>S��G�on�bs^��
-��6�J.����w��n���!(]�p�m�o�'�Cp�]\�J��]>��nhz=&/8�z#L3���b�ĉ���8���NK�Pq|�� <]ި:3��K�|�-�'ÞG��<.���x�v�	6ݰ�
W`�U78s�nvl�k�7�ɻ���7T4��FP�b�
-t��Ûw���%8wo����5��"
-;�������
l�g
GDó���*g�)����q��*�w�v=rĔ3	��ɰ��_��>s��r���SMK�T
-������8�����g�|cf���,�����h�V���M����O�B,�`��0(�4
-�h’mF����f�j�e���%q%j����g�]�$/l��W�y�6]��	n{�wz�/>��ö���;�;��Qy~��[�%��fu;�|�_�����Gp��68z?����ǡ_�@
��vR5M�xߓ����Ô���{ۉ��L��u��mw&��[�:7�Sx6\u��W�K<���!<�Pb$�:�
-�ʋ�.f�7��O����-���o�᜹��<� H,�skL\ @wla�8|3n��g�o­�]��Fl�6��c����H�K��Xv1ce��ū�]���� 8��sPu�9!8�4e5_@x�#<g���
�<iu�F²���
�����	�o����a^�:d�&��C�F=�?�}�
-^yb��',نS�╧�a�)3Xy�Θ�aNc�Y����H�4�:�VE�4֜����F�;��(.($ܭ�1�q!���(�1�
�i��!~��9,=HT��1��1Fx�#
-O���=T=L]��B�у��t!i�6�k0!��o������]]���_�@
�]r���/,k�`���������c&Pw܄���XqҌ��#��w�)Kh8m	��Xa��	q֚VL�gl���mz1�$0+���4u�R^qq�T��T 8�-d�b�����X�I�+������ԥ�+u �NRj�!�B�U�ଡ����=T~���ʷ������A�_�
-�K~����<P[[��V�M,�;�p���H���	�=:=F�1S.�����q�L�Y�R1A�D��V��q�����aEF�5�Ǹ ����Nqxx��T�7��C�)���ó��j -�I߇TbV��h��h�y�B��
-����� <=����r��G��FR���>�W��qفq�K�ي��K*Z�
-�(2�^{��eGM����B�Z�h,k5�[ٰ�Q����
-��
�5�cu ,١+,ٞ��j�Fd�C�B�-ԅ�2L
�:��ڐvv�`*�AN0�DMHc��(���?��p�A��'A���ؖ�@$p�Lg&�	m�� @#�4C^�d�2�R�
-l�>֞Ǯ<1��>hɔ�2c�ėh��X��B^UU���G���9�Z�c7��4�BB��N��E��:���=�oA��k��%T����1|?��V^�O�;����A�C��An� ?�������	
-����ݡ@㫟�o�p�a��_� ?�����'�|;�S�k�O�/?|B�$����6���a��0L�+P���~�v߃��<8N
-S�X�p-�>G�ŤY�w���N�¢�o���$��d��b1͊��Z�
'��=4�
+��b�h��kN�*�_X�1iuڒ�uvZ���mN5����o{��WC��\�q�2+N��7gꏍdWHs��������-T채�-&ln��8����j�B3��Hìn��?���~�]�'G;f���%k.���x�nSX��R�����JE|��� �-�������`b�-�[}�f
�?���W���'M���B�9��)B�)������
-�G�Ʒ�\|'�}��Џ���|�~r�>Ax?�AJ��`����a��砤��~
��]˯���k0�W���-ػ���w
- r}BP��IJ5{�Eo'cz���1�;��,݅�`�)�l7Eo�
-���$�
LV�p�M�|<+��F^���l\1��
-}z7Xy܎���6[X�j
�*�5�F" �P�� +�c��;��s+��P��[�_@W�u�s1��DL(�Dx4!j���ր�%�;n0;i��M�����2��Ãӕ��+�s����c	0�U�h�>���*v#�R�H�	HV��ޘ¦��V�c氥;�S��$����I���5I랍]���yF
y8%H!��Q���;S�WX��^eЙӤI$�)بK6��W���`*ٍ@a`�J7�c���B׺r�L?�o r�3�,�u�-��0Y��Ap���9�P$�t$T���Q�bN����S��Kv��b���E���	cM��)NZ�U�d|!�*5!�Tb�4!2_�%ML�ʌW�`vb��
3���|�U��Ҕ��,Q"?��i�c	0�6p3F�������z5@[��A�V"@+����f���e����r���a0=b�
s�]~ۼ7g@�r�]�+_d5j��,Euh'W
-� r�6�fjS�f�p
-�X�	��fc�&�t��p�(0\�p���j5��2���H�����4���ы� <�4��
-�zM
-��J�x��F�!@
-�����R+mv�,��L]�J�7&}��r���W�DR��9E�	Hܢ�4�
-aH�4�8�k��`�	Tm������p��z�}*Z�x��(k4�c���uݯ�<�:M���<���s
-[Zӡ|�+�1��
-�r�Ƥ*ĥ2b�)H<D$
-����Y�x�!�ec�Jk�FB�� h��:_=	#����s��ƃ�˰�X.Tl���I���
-S������Tu~O=M_�\*�O	>E<@94_�
-��>0f���r/�D�T���;w5T��̯Sc8�Ѡ!���
-5|��I�
-��u	���9�?�FUi�T�o��/���Jx�٫����S�(<|�ԇ��՜�I���B�S �� �*
HS�H
�a��x�K��4���E��su�,
��<<���H#�Bs
-��
-Tj�;�L�S�O�
-�&({5�BZt(�B��[��!��{0:��I�G�vË7ڣ�	�]'s��͍���x�@0���rK��#�G�D�?�w�.��!�~x���u�r��2G@��{��||��I������}�l��E�
(v	$C��9��
-���
�'�r��)

����)���G'�F.HŧR}���
-��:�Xuz��n�g:t�V�D��5��^��� A�!�Z����i��Ü@�R�� ��#�#3�>����4�)�N�%)�x�
-FL�p*�IhIO�'DXF7k�����k���<�
-A!�IA��C��a�Wz��%ܼ{
�7��E�+Th�0y���
-�bjDR��r��S�Q�
-�AT��l�#��*����0-��5��,��T�i�9�9����D���@���[#_�	������}l]�ԫ
-{��+_?�e�:����KG7ŗ�#@���
-��6�@j,�2����6�&2���Qóg&�'
-��m��5+�d#�4��q ��P�v_��&[��e�lr�*����GH_	�d�*D����,H~���C�8�C��Ǖ*�*�!i��P���V	��
-�\�$�~X������A�,f���~��ˆ��S�#Xf�Յ�%
�n[%\�rG���^	KL!�x8��
��
-�.cH
�E�� �U�!@ìCC=����8�yx�"��
j�T����U 
-���ojw��	P
��n�
-�#�!(�*W%±�;���]�a���lυ��Z2��y���O
-H�	Px��_��U
-}E�_�Rj5Y2#PV��

-�"(
J�6���'���E^�����yP,H�!���z
Z�g�
-ޛ����׼z��.���	��
-����s;e�H�[��q�w��M�TZ�0�,��L�Dԡ�K��q%X����<=�n�7N��|۫��!Mam�?/�h��4�%*��
-P5Mc���R�6]
O�C�6� @�R��}c�R[,y�j�>�-��|u(�����HE��	E�)X�m���G�{nݹ�6�CRV L��S��Ct�T4�¡�렽�6�~���H�	���;�Vmʁ�,c��)Yʉ)R�= N�� 
-(<�f%�
-���\#�oDKlV"@b���.	,#>HP!ay����
-,�HKxU���=��@.~V۸Х?�تv��c�Y4�Y��4&�2���[
-Y0�6I�"�C
-M�5^�� ��� �Q=
"UX2H���t���
ѩ�jA��`n�.xG�06�����m�T�-PCK�yA��S
-P�
-$U�Q�(<@�2
-P�R
���\I�w�@c�T���a�=
ۺ~c�o��׽�
���T�?�
z��Y��
-�*R�\n�lE
*�	I��DK�Zd�˿
-���#P�BM�
-?]s$Lcq�Í��.��R�I�U�2b���*T赐��!4K	���H���
-T�����ɯV5r<j�U
�0+QB��Q�"�S�+�yF�c����/
(���ZQ�7�Znz��ʙ�C���
J���E;��5Q }vF��;���#@_�f��45;�L!
-���)��<%4����,�(�
Zb�@j��R��1ai����;��T�
-�tt�3	�#
-[�Z�I�
�<Y��U�1L �d�R�B���ZuL��G���P����<@5���"�{��
-e
-��*,QF���(0@��&h�:]�dže�x7c����j
-**�]z!@�����S�ֺ�@�^b��
-�Zhqv_0�r�Y�2:2X<fZ�6�ÿ���8�;V��WD
-D�������/T�
dtda�4m-���6�bq�x���/C����_g���=o�u��[!=?��F��8>e�1"rEVZ�G�YBt�h���
-�rn�Y,iݧ���g������s��m�Of��a��
����o�y�N�?
-�k�`n�$p���(h(`���U�ՇW P.
�
-�sGCT�#;[dS����򭆣��L����, E�K�ٔ*3��s��ZS�M�1a��3��LL��8*ϔ	ϴ'�]�j8�u��G�D���E��
-�đ*��E�LD�
-���"8,�Æf+�K���"JX�2ns�q�/;xȧ�8'2�o�2���
-��q�:l|��/$Medu-Y"^�����i.PY?��
-�?��7�߼��-k1e�ou0w�\����ȡ����I�Q��C.�E
��=
5
-Pd��=P2����:��̥.����<$,[�=6�27�tܖ̥SΤWN:�T�| 6߮18� �[4X�M���B����p��������4�#Tu��0���aFW<�ݝbpj���I��\��k�
�q�?���/�ҷt�-�
-W��2gøbG��|[հT�
��|"�����[��@�4�a?��Rp��>kj��<� ���:�S�tb\}4}]<�����}�K
������3O��O�
W��ili�jL��z)�B�l�>|2��0�����Ӈ��s`���hxC��T�HR
-�-C���I��p�m'ԭYI��-H
&�nsR���F��V�*S�BC���
-�:a<@d
���dn����&�mQ�P�Tƻ|�
!}���}^$x��ާWz�"� ��
��}n����>_��p�����d���R
-I(l�=N
*3�
-
HBf[HZ a*K������n%"�h��HqŪts�H^��Ä����W�G0����d"1���Z
�.쇭�VC@�X9��`��WTyN'�[%`k[BХ�|Uz��8��!<s�y�rL *����If��N��{�ڵ������<@Vz�&���khq����i��x�f-�"N(1e▨Q��_P".��9
-? O���%���D�.s��d!�
-�'�}r��V��C!h�K��-�\�g�57GK�O<�'�%�dD��ĩQw�Q6~ "�g���5�C5�[��Ւ"���� @e
��ah��D�S���Q��]!�#�0��R��!
-���wL_��*���Y�@����(񍶀I
ʇ��
�u�U�����D�
�&/�8"v��Š�z���$!�Jb2�FR��b���1�XLoq�2�
-az��tsj+50xd[��t��
9Є���"�S
�{��
`z' �n.#ҜG�����|��|�]>�g
#�n!��u��i���US��`�(d
-�L��:y�s�v!F����YJi�|��L1��Υ�,�?�H��H��JӞ<1��_�ܛLM�
�
<a_�M,�����C��20�D
;��QwmX�g���M
ض�(.��%@�6�T>#��#�����ٻ��.
�����{E��b|]��Q��%��RT��qQ<|�����y`���y�|\��RUo)L����)�Q�qR��Bjh�C��Qjk�O��2o�[Җ����8S�ņ����x�퓞s�I���=�l�?�l�h�?&56�"fwf�f���`f[� 	���u!�"`�0  �E
-��-D�}GB9.J���V�ȉZ�oC�S�K��A'�x ��ܗ�PJ�\+��>F�+�
]&�ſ�׾�m0��HO]ӆ%�S�=�R���N�'7��.��������o�Y�r����W{Aƅ���Ƣ�j��P�B7��A:]�I�9h0��8E.��u+�0��a~[��I�x(�n'J�2ڵ��ݗ�Pݴ砇^��K���O�\U��_V��k���P@���F���v]���`�j7,���ۊ!�!�㪣�fKi�d�ԗ�B�9������
��&�0����<_2D��t}�{[�����i,%w��Bz�Iς�3j��dwSh��X����l��te�
-�?�V�wӾʿ%�mV���W�����zW�u��G� �y�cʂ.C�FS�m0	�b�F�(o
~S0��!ܒ�Q^HK��PVYO��$��rvd
@�yo��[^�X���2FA�h8-���P�)�d! jAx��A�6����BiMWC��pkb�H�/��vNaXy߼�SO�IO=I�ң���9�E"Th���	�������<K�	������:�=��`4�A�$�
��H�lG��B�:E2��[H���}©
-�	�
b	!@���g�%��5�OT3��m����RS��5]aP���md`Ù
�7�BY]�7�"T��bq�͜�
-I���~�����
-��m	L%�|<���E����u�cQ��/�jB�NE���r���U-���ph��:�
-Ѝ7���m�ј�oUv�;����d�T}O(9Q�Y����!4	L�b�)z���UiL�N}�ς��R�k�wOP�t"
-���G#A1��X}S�L2hf�s��{�-�����
��Ku��?4�
-�ZHX��h&4�$�t�~�X��+ց�����	g����C�`%�FP2Cz�8L��lIG
-��<���˒�^K��Js��{2گ��C@��&D�<8��b��d2 �,���ˣ�fJ?��'��_s�Sl��p=��o��V������W,�l�ٗJ6��L�4I��9�;`����Lf`��,zp>�귦v�&�-긷�1*ҫ�@���a%�bM���JK�ƚ�C�-�BH
;3�ZW)�g�
+���|r�	#r�������Á�lJ5���!�W�����
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/layout/factory_menu_item.xml b/apps/TvInput/DroidLogicFactoryMenu/res/layout/factory_menu_item.xml
deleted file mode 100644
index 9c9223c..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/layout/factory_menu_item.xml
+++ b/dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/factory_menu_list_text"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:textSize="25sp"
-	android:textColor="#FFFFFF"
-	android:background="@drawable/factory_selector"
-	android:paddingLeft="6dp"/>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/layout/factory_submenu_item.xml b/apps/TvInput/DroidLogicFactoryMenu/res/layout/factory_submenu_item.xml
deleted file mode 100644
index 27ba128..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/layout/factory_submenu_item.xml
+++ b/dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal" >
-	<TextView android:id="@+id/sub_name"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:textColor="#FFFFFF"
-		android:textSize="23sp"/>
-	<TextView android:id="@+id/sub_value"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:textColor="#FFFFFF"
-		android:textSize="23sp"/>
-</LinearLayout>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/layout/factorymain.xml b/apps/TvInput/DroidLogicFactoryMenu/res/layout/factorymain.xml
deleted file mode 100644
index db02485..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/layout/factorymain.xml
+++ b/dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/factory_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/factory_menu_title"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="8"
-        android:gravity="center"
-        android:paddingTop="17dp"
-        android:text="@string/factory_menu"
-        android:textColor="#FFFFFF"
-        android:textSize="30sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:paddingLeft="56dp"
-        android:paddingRight="56dp"
-        android:paddingTop="23dp" >
-
-        <ListView
-            android:id="@+id/left_listView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="29dp"
-            android:layout_weight="5"
-            android:divider="#00000000"
-            android:dividerHeight="20dp" >
-        </ListView>
-
-        <ListView
-            android:id="@+id/right_listView"
-            android:layout_marginTop="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="4"
-            android:divider="#00000000"
-            android:dividerHeight="6dp" >
-        </ListView>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/layout/favoritechannel.xml b/apps/TvInput/DroidLogicFactoryMenu/res/layout/favoritechannel.xml
deleted file mode 100644
index b582817..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/layout/favoritechannel.xml
+++ b/dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/bar_bg"
-        android:gravity="center"
-        android:orientation="horizontal" >
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/icon" />
-
-        <TextView
-            android:id="@+id/text_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:textSize="30sp"
-            android:textStyle="bold" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/list_center"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/text_bottom"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/bar_bg"
-        android:gravity="center"
-        android:text="@string/choosedb"
-        android:textSize="20sp"
-        android:textStyle="bold" />
-
-</LinearLayout>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/layout/favoritechannel_list.xml b/apps/TvInput/DroidLogicFactoryMenu/res/layout/favoritechannel_list.xml
deleted file mode 100644
index cb2ebdd..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/layout/favoritechannel_list.xml
+++ b/dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
-
-	<ImageView
-		android:id="@+id/item_icon"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:paddingLeft="5dp"/>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:layout_weight="1">
-
-		<TextView android:layout_weight="1"
-			android:id="@+id/item_name"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:paddingLeft="5dp"
-			android:gravity="bottom"
-			android:textSize="25sp"
-			android:textStyle="bold"
-			android:textColor="@color/item_text_color"/>
-
-		<LinearLayout android:layout_weight="2"
-			android:orientation="horizontal"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent">
-
-			<TextView android:layout_weight="1"
-				android:id="@+id/item_path"
-				android:layout_width="fill_parent"
-				android:layout_height="fill_parent"
-				android:paddingLeft="5dp"
-				android:gravity="left"
-				android:textSize="15sp"
-				android:textColor="@color/item_text_color"
-			/>
-			<TextView
-				android:id="@+id/item_date"
-				android:layout_width="wrap_content"
-				android:layout_height="fill_parent"
-				android:paddingRight="10dp"
-				android:textSize="15sp"
-				android:textColor="@color/item_text_color"/>
-		</LinearLayout>
-	</LinearLayout>
-
-	<ImageView
-		android:id="@+id/item_icon2"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:paddingRight="5dp"
-		android:src="@drawable/item_icon2_def"/>
-
-</LinearLayout>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/layout/mdialog.xml b/apps/TvInput/DroidLogicFactoryMenu/res/layout/mdialog.xml
deleted file mode 100644
index e8474a1..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/layout/mdialog.xml
+++ b/dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/facui_nolinear_osd0" />
-
-    <EditText
-        android:id="@+id/editText1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/facui_nolinear_osd25" />
-
-    <EditText
-        android:id="@+id/editText2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/textView3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/facui_nolinear_osd50" />
-
-    <EditText
-        android:id="@+id/editText3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/facui_nolinear_osd75" />
-
-    <EditText
-        android:id="@+id/editText4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/textView5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/facui_nolinear_osd100" />
-
-    <EditText
-        android:id="@+id/editText5"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/confirm"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/confirm" />
-
-        <Button
-            android:id="@+id/cancel"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/cancel" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/layout/softwareinfo.xml b/apps/TvInput/DroidLogicFactoryMenu/res/layout/softwareinfo.xml
deleted file mode 100644
index b7b8678..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/layout/softwareinfo.xml
+++ b/dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal" >
-	<TextView android:id="@+id/soft_name"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="2"
-		android:textColor="#FFFFFF"
-		android:textSize="23sp"/>
-	<TextView android:id="@+id/soft_value"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:textColor="#FFFFFF"
-		android:textSize="23sp"/>
-</LinearLayout>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/values/colors.xml b/apps/TvInput/DroidLogicFactoryMenu/res/values/colors.xml
deleted file mode 100644
index 2d8f88a..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/values/colors.xml
+++ b/dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="item_text_color">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/values/strings.xml b/apps/TvInput/DroidLogicFactoryMenu/res/values/strings.xml
deleted file mode 100644
index aa2076c..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/values/strings.xml
+++ b/dev/null
@@ -1,267 +0,0 @@
-<resources>
-
-    <string name="app_name">DroidLogicFactoryMenu</string>
-
-    <string name="factory_menu">Factory Menu</string>
-    <string name="Start">Start</string>
-    <string name="choosedb">请选择db文件</string>
-    <string name="AutoADC">ADC自动校正</string>
-    <string name="setsuccess">设置成功</string>
-    <string name="setfail">设置失败</string>
-    <string name="ADCProgressing">ADC校正进行中，请稍候……</string>
-    <string name="sureadc">确定进行ADC自动校正，请拔掉所有信号线，然后点击确定</string>
-    <string name="ADCSuccess">校正成功！</string>
-    <string name="ADCFailure">校正失败！</string>
-    <string name="factorymenu_title">Factory Menu</string>
-    <string name="designmenu_title">Design Menu</string>
-    <string name="button_ok">OK</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="dialog_info_title">Attention</string>
-    <string name="dialog_input_title">Please input value:</string>
-    <string name="synbol_qianfenhao">‰</string>
-    <string name="symbol_macmaohao">:</string>
-    <string name="cannotskipall">can not skip all programs</string>
-    <string name="nopro">The booked program dose not exist or has been deleted </string>
-    <string name="ResetSuccess">复位成功,重启系统!</string>
-    <string name="ResetInfo">重启系统...!</string>
-    <string name="ResetFailure">操作失败!</string>
-    <string name="facui_adc">ADC校正</string>
-    <string name="facui_adc_port">端口</string>
-    <string name="facui_adc_port_rgb">RGB</string>
-    <string name="facui_adc_port_ypbpr">YPBPR</string>
-    <string name="facui_adc_auto">自动校正</string>
-    <string name="facui_picmode">图像模式</string>
-    <string name="facui_picmode_port">端口</string>
-    <string name="facui_picmode_port_tv">ATV</string>
-    <string name="facui_picmode_port_av">AV</string>
-    <string name="facui_picmode_port_ypbpr">YPBPR</string>
-    <string name="facui_picmode_port_hdmi">HDMI</string>
-    <string name="facui_picmode_port_vga">VGA</string>
-    <string name="facui_picmode_port_mpeg">MPEG</string>
-    <string name="facui_picmode_port_dtv">DTV</string>
-    <string name="facui_picmode_mode">模式</string>
-    <string name="facui_picmode_mode_standard">标准</string>
-    <string name="facui_picmode_mode_light">明亮</string>
-    <string name="facui_picmode_mode_soft">柔和</string>
-    <string name="facui_picmode_mode_user">用户</string>
-    <string name="facui_picmode_brightness">亮度</string>
-    <string name="facui_picmode_contrast">对比度</string>
-    <string name="facui_picmode_color">色饱和度</string>
-    <string name="facui_picmode_definition">清晰度</string>
-    <string name="facui_picmode_tone">色调</string>
-    <string name="facui_picmode_restoration">恢复</string>
-    <string name="facui_fbcpicmode_mode">FBC模式</string>
-    <string name="facui_fbcpicmode_mode_standard">标准</string>
-    <string name="facui_fbcpicmode_mode_light">明亮</string>
-    <string name="facui_fbcpicmode_mode_soft">柔和</string>
-    <string name="facui_fbcpicmode_mode_movie">电影</string>
-    <string name="facui_fbcpicmode_mode_user">用户</string>
-    <string name="facui_fbcpicmode_brightness">FBC亮度</string>
-    <string name="facui_fbcpicmode_contrast">FBC对比度</string>
-    <string name="facui_fbcpicmode_color">FBC色饱和度</string>
-    <string name="facui_fbcpicmode_tone">FBC色调</string>
-    <string name="facui_fbcpicmode_backlight">FBC背光</string>
-    <string name="facui_whtblan">白平衡</string>
-    <string name="facui_whtblan_port">端口</string>
-    <string name="facui_whtblan_port_atv">ATV</string>
-    <string name="facui_whtblan_port_av">AV</string>
-    <string name="facui_whtblan_port_ypbpr">YPBPR</string>
-    <string name="facui_whtblan_port_hdmi">HDMI</string>
-    <string name="facui_whtblan_port_media">MEDIA</string>
-    <string name="facui_whtblan_mode">模式</string>
-    <string name="facui_whtblan_mode_standard">标准</string>
-    <string name="facui_whtblan_mode_cool">冷色</string>
-    <string name="facui_whtblan_mode_warm">暖色</string>
-    <string name="facui_whtblan_mode_user">用户</string>
-    <string name="facui_whtblan_mode_max">最大</string>
-    <string name="facui_whtblan_gain_r">R_GAIN</string>
-    <string name="facui_whtblan_gain_g">G_GAIN</string>
-    <string name="facui_whtblan_gain_b">B_GAIN</string>
-    <string name="facui_whtblan_offset_r">R_OFFSET</string>
-    <string name="facui_whtblan_offset_g">G_OFFSET</string>
-    <string name="facui_whtblan_offset_b">B_OFFSET</string>
-    <string name="facui_whtblan_restoration">恢复</string>
-    <string name="facui_fbcwhtblan_init">FBC白平衡初始化状态</string>
-    <string name="facui_fbcwhtblan_mode">FBC模式</string>
-    <string name="facui_fbcwhtblan_gain_r">FBC_R_GAIN</string>
-    <string name="facui_fbcwhtblan_gain_g">FBC_G_GAIN</string>
-    <string name="facui_fbcwhtblan_gain_b">FBC_B_GAIN</string>
-    <string name="facui_fbcwhtblan_offset_r">FBC_R_OFFSET</string>
-    <string name="facui_fbcwhtblan_offset_g">FBC_G_OFFSET</string>
-    <string name="facui_fbcwhtblan_offset_b">FBC_B_OFFSET</string>
-    <string name="facui_ssc">SSC</string>
-    <string name="facui_ssc_lvds_ddr_ssc">SSC</string>
-    <string name="facui_ssc_lvds_on">开</string>
-    <string name="facui_ssc_lvds_off">关</string>
-    <string name="facui_ssc_ddr">DDR SSC</string>
-    <string name="facui_ssc_lvds">LVDS SSC</string>
-    <string name="facui_dym_bl">dynamic backlight</string>
-    <string name="facui_dym_bl_ATV">ATV</string>
-    <string name="facui_dym_bl_DTV">DTV</string>
-    <string name="facui_dym_bl_YPBPR">YPBPR</string>
-    <string name="facui_dym_bl_AV">AV</string>
-    <string name="facui_dym_bl_HDMI">HDMI</string>
-    <string name="facui_nolinear">非线性</string>
-    <string name="facui_nolinear_port">端口</string>
-    <string name="facui_nolinear_port_tv">TV</string>
-    <string name="facui_nolinear_port_av">AV</string>
-    <string name="facui_nolinear_port_svideo">SVIDEO</string>
-    <string name="facui_nolinear_port_ypbpr">YPBPR</string>
-    <string name="facui_nolinear_port_hdmi">HDMI</string>
-    <string name="facui_nolinear_brightness">亮度</string>
-    <string name="facui_nolinear_contrast">对比度</string>
-    <string name="facui_nolinear_saturation">色度</string>
-    <string name="facui_nolinear_definition">清晰度</string>
-    <string name="facui_nolinear_tone">色调</string>
-    <string name="facui_nolinear_volumn">音量</string>
-    <string name="facui_nolinear_osd0">OSD_0</string>
-    <string name="facui_nolinear_osd25">OSD_25</string>
-    <string name="facui_nolinear_osd50">OSD_50</string>
-    <string name="facui_nolinear_osd75">OSD_75</string>
-    <string name="facui_nolinear_osd100">OSD_100</string>
-    <string name="facui_chongxian">重显率</string>
-    <string name="facui_chongxian_port">端口</string>
-    <string name="facui_chongxian_port_tv">TV</string>
-    <string name="facui_chongxian_port_av">AV</string>
-    <string name="facui_chongxian_port_svideo">SVIDEO</string>
-    <string name="facui_chongxian_port_ypbpr">YPBPR</string>
-    <string name="facui_chongxian_port_hdmi">HDMI</string>
-    <string name="facui_chongxian_timing">Timing</string>
-    <string name="facui_chongxian_tvin_3d_status">TVIN_3D_STATUS</string>
-    <string name="facui_chongxian_status3d_disable">STATUS3D_DISABLE</string>
-    <string name="facui_chongxian_status3d_auto">STATUS3D_AUTO</string>
-    <string name="facui_chongxian_status3d_2d_to_3d">STATUS3D_2D_TO_3D</string>
-    <string name="facui_chongxian_status3d_lr">STATUS3D_LR</string>
-    <string name="facui_chongxian_status3d_bt">STATUS3D_BT</string>
-    <string name="facui_chongxian_status3d_line_alternative">STATUS3D_LINE_ALTERNATIVE</string>
-    <string name="facui_chongxian_status3d_frame_alternative">STATUS3D_FRAME_ALTERNATIVE</string>
-    <string name="facui_chongxian_status3d_max">STATUS3D_MAX</string>
-    <string name="facui_chongxian_tvin_trans_fmt">TVIN_TRANS_FMT</string>
-    <string name="facui_chongxian_tvin_tfmt_2d">TVIN_TFMT_2D</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_lrh_olor">TVIN_TFMT_3D_LRH_OLOR</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_lrh_oler">TVIN_TFMT_3D_LRH_OLER</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_lrh_elor">TVIN_TFMT_3D_LRH_ELOR</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_lrh_eler">TVIN_TFMT_3D_LRH_ELER</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_tb">TVIN_TFMT_3D_TB</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_fp">TVIN_TFMT_3D_FP</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_fa">TVIN_TFMT_3D_FA</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_la">TVIN_TFMT_3D_LA</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_lrf">TVIN_TFMT_3D_LRF</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_ld">TVIN_TFMT_3D_LD</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_ldgd">TVIN_TFMT_3D_LDGD</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_det_tb">TVIN_TFMT_3D_DET_TB</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_det_lr">TVIN_TFMT_3D_DET_LR</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_det_interlace">TVIN_TFMT_3D_DET_INTERLACE</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_det_chessboard">TVIN_TFMT_3D_DET_CHESSBOARD</string>
-    <string name="facui_chongxian_tvin_tfmt_3d_max">TVIN_TFMT_3D_MAX</string>
-    <string name="facui_chongxian_hstart">H Start</string>
-    <string name="facui_chongxian_vstart">V Start</string>
-    <string name="facui_chongxian_hpos">H Pos</string>
-    <string name="facui_chongxian_vpos">V Pos</string>
-    <string name="facui_gongneng">功能设置</string>
-    <string name="facui_gongneng_kaiji">开机</string>
-    <string name="facui_gongneng_kaiji_direct">直接开机</string>
-    <string name="facui_gongneng_kaiji_wait">直接待机</string>
-    <string name="facui_gongneng_kaiji_remember">记忆</string>
-    <string name="facui_gongneng_ceshitu">测试图</string>
-    <string name="facui_gongneng_ceshitu_off">关</string>
-    <string name="facui_gongneng_ceshitu_red">红</string>
-    <string name="facui_gongneng_ceshitu_green">绿</string>
-    <string name="facui_gongneng_ceshitu_blue">蓝</string>
-    <string name="facui_gongneng_ceshitu_white">白</string>
-    <string name="facui_gongneng_ceshitu_black">黑</string>
-    <string name="facui_gongneng_beiguang">背光调节</string>
-    <string name="facui_gongneng_beiguang_polar">背光极性</string>
-    <string name="facui_gongneng_beiguang_polar_up">同向</string>
-    <string name="facui_gongneng_beiguang_polar_down">反向</string>
-    <string name="facui_gongneng_export_bin_file">一键做BIN</string>
-    <string name="facui_laohua">老化模式</string>
-    <string name="facui_laohua_on">开</string>
-    <string name="facui_laohua_off">关</string>
-    <string name="facui_pindaoyushe">工厂频道预设</string>
-    <string name="facui_pindaoyushe_on">开</string>
-    <string name="facui_pindaoyushe_off">关</string>
-    <string name="facui_3dmode">设置3D开关</string>
-    <string name="facui_Search_enhance">增强搜台功能</string>
-    <string name="facui_3d_demo_mode">3D演示模式</string>
-    <string name="facui_burn">工厂烧写</string>
-    <string name="facui_macburn">MAC烧写</string>
-    <string name="facui_idburn">ID号烧写</string>
-    <string name="facui_userreset">用户复位</string>
-    <string name="facui_facreset">工厂复位</string>
-    <string name="facui_softinfo">软件信息</string>
-    <string name="facui_softinfo_androidversion">Android版本</string>
-    <string name="facui_softnum">软件版本号</string>
-    <string name="facui_softinfo_bootversion">Boot版本</string>
-    <string name="facui_softinfo_kernelversion">内核版本</string>
-    <string name="facui_softinfo_tvversion">TV版本</string>
-    <string name="facui_softinfo_dvbversion">DVB版本</string>
-    <string name="facui_softinfo_fbcversion">FBC版本</string>
-    <string name="facui_hdcpkey">HDMI HDCP DemoKey</string>
-    <string name="facui_hdcp">HDCP</string>
-    <string name="facui_hdmi">HDMI</string>
-    <string name="facui_hdcp_demokey_on">开</string>
-    <string name="facui_hdcp_demokey_off">关</string>
-    <string name="facui_hdmi_demokey_on">开</string>
-    <string name="facui_hdmi_demokey_off">关</string>
-    <string name="facui_upgrade_fbc">Upgrade FBC</string>
-    <string name="facui_fbc_version">FBC Version</string>
-    <string name="facui_cmdswitch">Serial cmd switch</string>
-    <string name="facui_serial_cmd_switch_on">开</string>
-    <string name="facui_serial_cmd_switch_off">关</string>
-    <string name="facui_portprint_switch">串口打印开关</string>
-    <string name="facui_portprint_on">开</string>
-    <string name="facui_portprint_off">关</string>
-    <string name="sure_portprint_off">确定关闭串口打印吗？选择后系统将会重启</string>
-    <string name="sure_portprint_on">确定开启串口打印吗？选择后系统将会重启</string>
-    <string name="facui_remotecontrol">选择遥控器</string>
-    <string name="facui_remotecontrol_haier">海尔</string>
-    <string name="facui_remotecontrol_haiermtc">海尔和兆驰</string>
-    <string name="facui_remotecontrol_haiercvt">海尔和CVT</string>
-    <string name="facui_remotecontrol_haieraml">海尔和AML</string>
-    <string name="sure_remotecontrol">确定选择该遥控器吗？选择后系统将会重启</string>
-    <string name="facui_adbswitch">adb switch</string>
-    <string name="facui_adbswitch_on">开</string>
-    <string name="facui_adbswitch_off">关</string>
-    <string name="facui_autosavelog">自动存log到U盘</string>
-    <string name="facui_autosavelog_on">开</string>
-    <string name="facui_autosavelog_off">关</string>
-    <string name="facui_upgrade">软件升级</string>
-    <string name="facui_setdemoparam">设置demo环境变量参数</string>
-    <string name="facui_dym_bl_value">动态背光阀值</string>
-    <string name="facui_screen">设置屏幕方向</string>
-    <string name="facui_screen_up">屏幕正</string>
-    <string name="facui_screen_down">屏幕倒</string>
-    <string name="facui_writekey">HDCP And MAC Writing</string>
-    <string name="facui_write_key">Wirte HDCP key and MAC </string>
-    <string name="writekey">Sure to write HDCP key and MAC address?</string>
-    <string name="iswriting">Writing, please wait...</string>
-    <string name="writefail">Write Failed!</string>
-    <string name="writesuccess">Write Success!</string>
-    <string name="sure_screen_up">确认正转屏幕吗？选择后系统将重启</string>
-    <string name="sure_screen_down">确认倒转屏幕吗？选择后系统将重启</string>
-    <string name="output_mode">HDMI输出模式</string>
-    <string name="output_mode1">4k2k30hz</string>
-    <string name="output_mode2">4k2k50hz</string>
-    <string name="output_mode3">4k2k60hz</string>
-    <string name="output_mode4">1080p</string>
-	<string name="output_mode5">1080p50hz</string>
-	<string name="sure_confirm">确认选择吗？选择后系统将重启</string>
-	<string name="surereset">确定进行工厂复位吗？复位后系统会重启</string>
-    <string name="isresetting">正在复位中……请稍后</string>
-    <string name="resetsuccess">复位成功</string>
-    <string name="resetfail">复位失败</string>
-    <string name="enterdata">请输入数据                 </string>
-    <string name="wrongdata">输入数据不符合规范</string>
-    <string name="suredb">确定选择该db文件吗？</string>
-    <string name="ispresetting">正在预设中……请稍后</string>
-    <string name="finishpresetting">预设完毕</string>
-    <string name="file">文件</string>
-    <string name="noexist">不存在,请确认!</string>
-    <string name="alreadyexist">已存在文件</string>
-    <string name="onlyread">只读,无法删除,请手动删除</string>
-    <string name="notstandard">不是一个标准的文件,有可能为目录,请确认!</string>
-    <string name="config_recovery_usb_path">/udisk</string>
-	<string name="confirm">confirm</string>
-	<string name="cancel">cancel</string>
-</resources>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/res/values/styles.xml b/apps/TvInput/DroidLogicFactoryMenu/res/values/styles.xml
deleted file mode 100644
index 6ce89c7..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/res/values/styles.xml
+++ b/dev/null
@@ -1,20 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Light">
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        -->
-    </style>
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
-    </style>
-
-</resources>
diff --git a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/Constant.java b/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/Constant.java
deleted file mode 100644
index 5b82eb6..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/Constant.java
+++ b/dev/null
@@ -1,249 +0,0 @@
-/**
- * some constant used in factory menu
- *
- * @author ice.fu
- */
-package com.amlogic.factory;
-
-import android.R.integer;
-
-public class Constant {
-    /* constant used to identify father ListView's content when change son ListView's content */
-    public static final int PAGE_CALIBRATE = 0;
-    public static final int PAGE_PICTUREMODE = 1;
-    public static final int PAGE_WHITEBALANCE = 2;
-    public static final int PAGE_SSC = 3;
-    // public static final int PAGE_NOLINEAR = 4;
-    public static final int PAGE_OVERSCAN = 4;
-    public static final int PAGE_TESTPATTERN = 5;
-    public static final int PAGE_AGINGMODE = 6;
-    public static final int PAGE_FACTORYCHANNEL = 7;
-    public static final int PAGE_FACRESET = 8;
-    public static final int PAGE_SOFTINFO = 9;
-    public static final int HDMI_HDCP_DEMOKEY = 10;
-    public static final int PAGE_WRITE_KEY = 11;
-    //public static final int PAGE_UPGRADE_FBC = -1;
-    //public static final int PAGE_FBC_VERSION = -2;
-    public static final int PAGE_SERIAL_CMD_SWITCH = 12;
-    public static final int PAGE_PORTPRINT_SWITCH = 13;
-    //public static final int PAGE_REMOTECONTROL = 14;
-    //public static final int PAGE_ADB_SWITCH = 15;
-    public static final int PAGE_UPGRADE = 14;
-    //public static final int PAGE_SETDEMOPARAM = 17;
-    //public static final int PAGE_AUTOSAVELOG_SWITCH = 18;
-    public static final int PAGE_DYNAMIC_BACKLIGHT_VALUE = 15;
-    public static final int PAGE_SCREEN = 16;
-    //public static final int PAGE_OUTPUTMODE = 21;
-
-    public static String CS_UPGRADE_FBC_FILE_NAME = "/storage/external_storage/udisk0/spi.bin";
-    public static final int FACUI_START = R.string.Start;
-
-    public static final int FACUI_ADC = R.string.facui_adc;
-    public static final int FACUI_ADC_PORT = R.string.facui_adc_port;
-    public static final int FACUI_ADC_PORT_RGB = R.string.facui_adc_port_rgb;
-    public static final int FACUI_ADC_PORT_YPBPR = R.string.facui_adc_port_ypbpr;
-    public static final int FACUI_ADC_AUTO = R.string.facui_adc_auto;
-
-    public static final int FACUI_PICMODE = R.string.facui_picmode;
-    public static final int FACUI_PICMODE_PORT = R.string.facui_picmode_port;
-    public static final int FACUI_PICMODE_PORT_TV = R.string.facui_picmode_port_tv;
-    public static final int FACUI_PICMODE_PORT_AV = R.string.facui_picmode_port_av;
-    public static final int FACUI_PICMODE_PORT_YPBPR = R.string.facui_picmode_port_ypbpr;
-    public static final int FACUI_PICMODE_PORT_HDMI = R.string.facui_picmode_port_hdmi;
-    public static final int FACUI_PICMODE_PORT_VGA = R.string.facui_picmode_port_vga;
-    public static final int FACUI_PICMODE_PORT_MPEG = R.string.facui_picmode_port_mpeg;
-    public static final int FACUI_PICMODE_PORT_DTV = R.string.facui_picmode_port_dtv;
-    /*picture mode mode's int[]*/
-    public static final int[] mInputPortList = {FACUI_PICMODE_PORT_TV, FACUI_PICMODE_PORT_AV, FACUI_PICMODE_PORT_YPBPR, FACUI_PICMODE_PORT_HDMI,
-                                                FACUI_PICMODE_PORT_VGA, FACUI_PICMODE_PORT_MPEG, FACUI_PICMODE_PORT_DTV
-                                               };
-    public static final int FACUI_PICMODE_MODE = R.string.facui_picmode_mode;
-    public static final int FACUI_PICMODE_MODE_STANDARD = R.string.facui_picmode_mode_standard;
-    public static final int FACUI_PICMODE_MODE_LIGHT = R.string.facui_picmode_mode_light;
-    public static final int FACUI_PICMODE_MODE_SOFT = R.string.facui_picmode_mode_soft;
-    public static final int FACUI_PICMODE_MODE_USER = R.string.facui_picmode_mode_user;
-    /*picture mode mode's int[]*/
-    public static final int[] mShowModeList = {FACUI_PICMODE_MODE_STANDARD, FACUI_PICMODE_MODE_LIGHT, FACUI_PICMODE_MODE_SOFT,
-                                               FACUI_PICMODE_MODE_USER
-                                              };
-    public static final int FACUI_PICMODE_BRIGHTNESS = R.string.facui_picmode_brightness;
-    public static final int FACUI_PICMODE_CONTRAST = R.string.facui_picmode_contrast;
-    public static final int FACUI_PICMODE_COLOR = R.string.facui_picmode_color;
-    public static final int FACUI_PICMODE_DEFINITION = R.string.facui_picmode_definition;
-    public static final int FACUI_PICMODE_TONE = R.string.facui_picmode_tone;
-    public static final int FACUI_PICMODE_RESTORATION = R.string.facui_picmode_restoration;
-
-    public static final int FACUI_WHTBLAN = R.string.facui_whtblan;
-    public static final int FACUI_WHTBLAN_PORT = R.string.facui_whtblan_port;
-    public static final int FACUI_WHTBLAN_PORT_TV = R.string.facui_whtblan_port_atv;
-    public static final int FACUI_WHTBLAN_PORT_AV = R.string.facui_whtblan_port_av;
-    public static final int FACUI_WHTBLAN_PORT_YPBPR = R.string.facui_whtblan_port_ypbpr;
-    public static final int FACUI_WHTBLAN_PORT_HDMI = R.string.facui_whtblan_port_hdmi;
-    public static final int FACUI_WHTBLAN_PORT_MPEG = R.string.facui_whtblan_port_media;
-    public static final int FACUI_WHTBLAN_MODE = R.string.facui_whtblan_mode;
-    public static final int FACUI_WHTBLAN_MODE_STANDARD = R.string.facui_whtblan_mode_standard;
-    public static final int FACUI_WHTBLAN_MODE_COOL = R.string.facui_whtblan_mode_cool;
-    public static final int FACUI_WHTBLAN_MODE_WARM = R.string.facui_whtblan_mode_warm;
-    public static final int FACUI_WHTBLAN_MODE_USER = R.string.facui_whtblan_mode_user;
-    public static final int FACUI_WHTBLAN_MODE_MAX = R.string.facui_whtblan_mode_max;
-    public static final int[] mColorTemperatureList = {FACUI_WHTBLAN_MODE_STANDARD, FACUI_WHTBLAN_MODE_WARM, FACUI_WHTBLAN_MODE_COOL};
-    public static final int FACUI_WHTBLAN_GAIN_R = R.string.facui_whtblan_gain_r;
-    public static final int FACUI_WHTBLAN_GAIN_G = R.string.facui_whtblan_gain_g;
-    public static final int FACUI_WHTBLAN_GAIN_B = R.string.facui_whtblan_gain_b;
-    public static final int FACUI_WHTBLAN_OFFSET_R = R.string.facui_whtblan_offset_r;
-    public static final int FACUI_WHTBLAN_OFFSET_G = R.string.facui_whtblan_offset_g;
-    public static final int FACUI_WHTBLAN_OFFSET_B = R.string.facui_whtblan_offset_b;
-    public static final int FACUI_WHTBLAN_FBC_MODE = R.string.facui_fbcwhtblan_mode;
-    public static final int[] mFbcColorTemperatureList = {FACUI_WHTBLAN_MODE_COOL, FACUI_WHTBLAN_MODE_STANDARD, FACUI_WHTBLAN_MODE_WARM, FACUI_WHTBLAN_MODE_USER, FACUI_WHTBLAN_MODE_MAX};
-    public static final int FACUI_WHTBLAN_FBC_INIT = R.string.facui_fbcwhtblan_init;
-    public static final int FACUI_WHTBLAN_FBC_GAIN_R = R.string.facui_fbcwhtblan_gain_r;
-    public static final int FACUI_WHTBLAN_FBC_GAIN_G = R.string.facui_fbcwhtblan_gain_g;
-    public static final int FACUI_WHTBLAN_FBC_GAIN_B = R.string.facui_fbcwhtblan_gain_b;
-    public static final int FACUI_WHTBLAN_FBC_OFFSET_R = R.string.facui_fbcwhtblan_offset_r;
-    public static final int FACUI_WHTBLAN_FBC_OFFSET_G = R.string.facui_fbcwhtblan_offset_g;
-    public static final int FACUI_WHTBLAN_FBC_OFFSET_B = R.string.facui_fbcwhtblan_offset_b;
-
-    public static final int FACUI_SSC = R.string.facui_ssc;
-    public static final int FACUI_LVDS_LVDS = R.string.facui_ssc_lvds;
-
-    public static final int FACUI_NOLINEAR = R.string.facui_nolinear;
-    public static final int FACUI_NOLINEAR_PORT = R.string.facui_nolinear_port;
-    public static final int FACUI_NOLINEAR_BRIGHTNESS = R.string.facui_nolinear_brightness;
-    public static final int FACUI_NOLINEAR_CONTRAST = R.string.facui_nolinear_contrast;
-    public static final int FACUI_NOLINEAR_SATURATION = R.string.facui_nolinear_saturation;
-    public static final int FACUI_NOLINEAR_DEFINITION = R.string.facui_nolinear_definition;
-    public static final int FACUI_NOLINEAR_TONE = R.string.facui_nolinear_tone;
-    public static final int FACUI_NOLINEAR_VOLUMN = R.string.facui_nolinear_volumn;
-    public static final int FACUI_NOLINEAR_OSD0 = R.string.facui_nolinear_osd0;
-    public static final int FACUI_NOLINEAR_OSD25 = R.string.facui_nolinear_osd25;
-    public static final int FACUI_NOLINEAR_OSD50 = R.string.facui_nolinear_osd50;
-    public static final int FACUI_NOLINEAR_OSD75 = R.string.facui_nolinear_osd75;
-    public static final int FACUI_NOLINEAR_OSD100 = R.string.facui_nolinear_osd100;
-
-    public static final int FACUI_CHONGXIAN = R.string.facui_chongxian;
-    public static final int FACUI_CHONGXIAN_PORT = R.string.facui_chongxian_port;
-    public static final int FACUI_CHONGXIAN_TIMING = R.string.facui_chongxian_timing;
-    public static final int FACUI_CHONGXIAN_TVIN_3D_STATUS = R.string.facui_chongxian_tvin_3d_status;
-    public static final int FACUI_CHONGXIAN_STATUS3D_DISABLE = R.string.facui_chongxian_status3d_disable;
-    public static final int FACUI_CHONGXIAN_STATUS3D_AUTO = R.string.facui_chongxian_status3d_auto;
-    public static final int FACUI_CHONGXIAN_STATUS3D_2D_TO_3D = R.string.facui_chongxian_status3d_2d_to_3d;
-    public static final int FACUI_CHONGXIAN_STATUS3D_LR = R.string.facui_chongxian_status3d_lr;
-    public static final int FACUI_CHONGXIAN_STATUS3D_BT = R.string.facui_chongxian_status3d_bt;
-    public static final int FACUI_CHONGXIAN_STATUS3D_LINE_ALTERNATIVE = R.string.facui_chongxian_status3d_line_alternative;
-    public static final int FACUI_CHONGXIAN_STATUS3D_FRAME_ALTERNATIVE = R.string.facui_chongxian_status3d_frame_alternative;
-    public static final int FACUI_CHONGXIAN_STATUS3D_MAX = R.string.facui_chongxian_status3d_max;
-    public static final int[] mChongxianTvIn3Dstatus = {FACUI_CHONGXIAN_STATUS3D_DISABLE, FACUI_CHONGXIAN_STATUS3D_AUTO,
-                                                        FACUI_CHONGXIAN_STATUS3D_2D_TO_3D, FACUI_CHONGXIAN_STATUS3D_LR, FACUI_CHONGXIAN_STATUS3D_BT, FACUI_CHONGXIAN_STATUS3D_LINE_ALTERNATIVE,
-                                                        FACUI_CHONGXIAN_STATUS3D_FRAME_ALTERNATIVE, FACUI_CHONGXIAN_STATUS3D_MAX
-                                                       };
-    public static final int FACUI_CHONGXIAN_TVIN_TRANS_FMT = R.string.facui_chongxian_tvin_trans_fmt;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_2D = R.string.facui_chongxian_tvin_tfmt_2d;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_OLOR = R.string.facui_chongxian_tvin_tfmt_3d_lrh_olor;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_OLER = R.string.facui_chongxian_tvin_tfmt_3d_lrh_oler;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_ELOR = R.string.facui_chongxian_tvin_tfmt_3d_lrh_elor;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_ELER = R.string.facui_chongxian_tvin_tfmt_3d_lrh_eler;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_TB = R.string.facui_chongxian_tvin_tfmt_3d_tb;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_FP = R.string.facui_chongxian_tvin_tfmt_3d_fp;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_FA = R.string.facui_chongxian_tvin_tfmt_3d_fa;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LA = R.string.facui_chongxian_tvin_tfmt_3d_la;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LRF = R.string.facui_chongxian_tvin_tfmt_3d_lrf;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LD = R.string.facui_chongxian_tvin_tfmt_3d_ld;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_LDGD = R.string.facui_chongxian_tvin_tfmt_3d_ldgd;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_TB = R.string.facui_chongxian_tvin_tfmt_3d_det_tb;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_LR = R.string.facui_chongxian_tvin_tfmt_3d_det_lr;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_INTERLACE = R.string.facui_chongxian_tvin_tfmt_3d_det_interlace;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_CHESSBOARD = R.string.facui_chongxian_tvin_tfmt_3d_det_chessboard;
-    public static final int FACUI_CHONGXIAN_TVIN_TFMT_3D_MAX = R.string.facui_chongxian_tvin_tfmt_3d_max;
-    public static final int[] mChongxianTvInTransFmt = {FACUI_CHONGXIAN_TVIN_TFMT_2D, FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_OLOR,
-                                                        FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_OLER, FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_ELOR, FACUI_CHONGXIAN_TVIN_TFMT_3D_LRH_ELER,
-                                                        FACUI_CHONGXIAN_TVIN_TFMT_3D_TB, FACUI_CHONGXIAN_TVIN_TFMT_3D_FP, FACUI_CHONGXIAN_TVIN_TFMT_3D_FA, FACUI_CHONGXIAN_TVIN_TFMT_3D_LA,
-                                                        FACUI_CHONGXIAN_TVIN_TFMT_3D_LRF, FACUI_CHONGXIAN_TVIN_TFMT_3D_LD, FACUI_CHONGXIAN_TVIN_TFMT_3D_LDGD,
-                                                        FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_TB, FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_LR, FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_INTERLACE,
-                                                        FACUI_CHONGXIAN_TVIN_TFMT_3D_DET_CHESSBOARD, FACUI_CHONGXIAN_TVIN_TFMT_3D_MAX
-                                                       };
-
-    public static final int FACUI_CHONGXIAN_HSTART = R.string.facui_chongxian_hstart;
-    public static final int FACUI_CHONGXIAN_VSTART = R.string.facui_chongxian_vstart;
-    public static final int FACUI_CHONGXIAN_HPOS = R.string.facui_chongxian_hpos;
-    public static final int FACUI_CHONGXIAN_VPOS = R.string.facui_chongxian_vpos;
-
-    public static final int FACUI_GONGNENG_CESHITU = R.string.facui_gongneng_ceshitu;
-    public static final int FACUI_GONGNENG_CESHITU_OFF = R.string.facui_gongneng_ceshitu_off;
-    public static final int FACUI_GONGNENG_CESHITU_RED = R.string.facui_gongneng_ceshitu_red;
-    public static final int FACUI_GONGNENG_CESHITU_GREEN = R.string.facui_gongneng_ceshitu_green;
-    public static final int FACUI_GONGNENG_CESHITU_BLUE = R.string.facui_gongneng_ceshitu_blue;
-    public static final int FACUI_GONGNENG_CESHITU_WHITE = R.string.facui_gongneng_ceshitu_white;
-    public static final int FACUI_GONGNENG_CESHITU_BLACK = R.string.facui_gongneng_ceshitu_black;
-    public static final int[] CESHITUARRAY_STRINGS = {FACUI_GONGNENG_CESHITU_OFF, FACUI_GONGNENG_CESHITU_RED, FACUI_GONGNENG_CESHITU_GREEN,
-                                                      FACUI_GONGNENG_CESHITU_BLUE, FACUI_GONGNENG_CESHITU_WHITE, FACUI_GONGNENG_CESHITU_BLACK
-                                                     };
-
-    public static final int FACUI_LAOHUA = R.string.facui_laohua;
-    public static final int FACUI_LAOHUA_ON = R.string.facui_laohua_on;
-    public static final int FACUI_LAOHUA_OFF = R.string.facui_laohua_off;
-
-    public static final int FACUI_PINDAOYUSHE = R.string.facui_pindaoyushe;
-
-    public static final int FACUI_FACRESET = R.string.facui_facreset;
-
-    public static final int FACUI_SOFTINFO = R.string.facui_softinfo;
-    public static final int FACUI_SOFTINFO_ANDROIDVERSION = R.string.facui_softinfo_androidversion;
-    public static final int FACUI_SOFTINFO_NUMBER = R.string.facui_softnum;
-    public static final int FACUI_SOFTINFO_BOOTVERSION = R.string.facui_softinfo_bootversion;
-    public static final int FACUI_SOFTINFO_KERNELVERSION = R.string.facui_softinfo_kernelversion;
-    public static final int FACUI_SOFTINFO_TVVERSION = R.string.facui_softinfo_tvversion;
-    public static final int FACUI_SOFTINFO_DVBVERSION = R.string.facui_softinfo_dvbversion;
-    public static final int FACUI_SOFTINFO_FBCVERSION = R.string.facui_softinfo_fbcversion;
-
-    public static final int FACUI_HDMI_HDCP_DEMOKEY = R.string.facui_hdcpkey;
-    public static final int FACUI_HDCP = R.string.facui_hdcp;
-    public static final int FACUI_HDMI = R.string.facui_hdmi;
-    public static final int FACUI_HDCP_DEMOKEY_ON = R.string.facui_hdcp_demokey_on;
-    public static final int FACUI_HDCP_DEMOKEY_OFF = R.string.facui_hdcp_demokey_off;
-    public static final int FACUI_HDMI_DEMOKEY_ON = R.string.facui_hdmi_demokey_on;
-    public static final int FACUI_HDMI_DEMOKEY_OFF = R.string.facui_hdmi_demokey_off;
-
-    public static final int FACUI_UPGRADE_FBC = R.string.facui_upgrade_fbc;
-    public static final int FACUI_FBC_VERSION = R.string.facui_fbc_version;
-
-    public static final int FACUI_SERIAL_CMD_SWITCH = R.string.facui_cmdswitch;
-    public static final int FACUI_SERIAL_CMD_SWITCH_ON = R.string.facui_serial_cmd_switch_on;
-    public static final int FACUI_SERIAL_CMD_SWITCH_OFF = R.string.facui_serial_cmd_switch_off;
-
-    public static final int FACUI_PORTPRINT_SWITCH = R.string.facui_portprint_switch;
-    public static final int FACUI_PORTPRINT_SWITCH_ON = R.string.facui_portprint_on;
-    public static final int FACUI_PORTPRINT_SWITCH_OFF = R.string.facui_portprint_off;
-
-    public static final int FACUI_REMOTECONTROL = R.string.facui_remotecontrol;
-    public static final int FACUI_REMOTECONTROL_HAIER = R.string.facui_remotecontrol_haier;
-    public static final int FACUI_REMOTECONTROL_HAIERMTC = R.string.facui_remotecontrol_haiermtc;
-    public static final int FACUI_REMOTECONTROL_HAIERCVT = R.string.facui_remotecontrol_haiercvt;
-    public static final int FACUI_REMOTECONTROL_HAIERAML = R.string.facui_remotecontrol_haieraml;
-
-    public static final int FACUI_ADB_SWITCH = R.string.facui_adbswitch;
-    public static final int FACUI_ADB_SWITCH_ON = R.string.facui_adbswitch_on;
-    public static final int FACUI_ADB_SWITCH_OFF = R.string.facui_adbswitch_off;
-
-    public static final int FACUI_AUTOSAVELOG_SWITCH = R.string.facui_autosavelog;
-    public static final int FACUI_AUTOSAVELOG_SWITCH_ON = R.string.facui_autosavelog_on;
-    public static final int FACUI_AUTOSAVELOG_SWITCH_OFF = R.string.facui_autosavelog_off;
-
-    public static final int FACUI_UPGRADE = R.string.facui_upgrade;
-
-    public static final int FACUI_SETDEMOPARAM = R.string.facui_setdemoparam;
-
-    public static final int FACUI_DYNAMIC_BACKLIGHT_VALUE = R.string.facui_dym_bl_value;
-
-    public static final int FACUI_SCREEN = R.string.facui_screen;
-    public static final int FACUI_SCREEN_UP = R.string.facui_screen_up;
-    public static final int FACUI_SCREEN_DOWN = R.string.facui_screen_down;
-
-    public static final int FACUI_WRITE_HDCP_MAC_KEY = R.string.facui_write_key;
-
-    public static final int FACUI_OUTPUT_MODE = R.string.output_mode;
-    public static final int FACUI_OUTPUT_MODE1 = R.string.output_mode1;
-    public static final int FACUI_OUTPUT_MODE2 = R.string.output_mode2;
-    public static final int FACUI_OUTPUT_MODE3 = R.string.output_mode3;
-    public static final int FACUI_OUTPUT_MODE4 = R.string.output_mode4;
-    public static final int FACUI_OUTPUT_MODE5 = R.string.output_mode5;
-}
diff --git a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FactoryMainActivity.java b/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FactoryMainActivity.java
deleted file mode 100644
index a9f044d..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FactoryMainActivity.java
+++ b/dev/null
@@ -1,986 +0,0 @@
-/**
- * Factory Menu MainActivity
- *
- * @author ice.fu
- */
-package com.amlogic.factory;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.droidlogic.app.SystemControlManager;
-import com.droidlogic.app.tv.TvControlManager;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.PowerManager;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnFocusChangeListener;
-import android.view.View.OnKeyListener;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-import android.widget.Toast;
-
-public class FactoryMainActivity extends Activity implements TvControlManager.UpgradeFBCListener {
-    /* father ListView's adapter */
-    private ArrayAdapter<String> fAdapter;
-    /* son ListView's adapter */
-    public static SimpleAdapter sAdapter;
-    /* software infomation's adapter */
-    public static SimpleAdapter softAdapter;
-    /* father ListView's item save to this ArrayList */
-    private ArrayList<String> mListMenuData = null;
-    /* son ListView's item save to this List */
-    private List<Map<String, String>> mListSubMenuData = null;
-    /* software infomation's item save to this List */
-    private List<Map<String, String>> softData = null;
-    /* father listView and son listView's quote */
-    private ListView flv;
-    public static ListView slv;
-    /* father item's position */
-    public static int mPage = -1;
-    /* son item's position */
-    public static int mSubMenuPos = -1;
-    // private View mPreMenu = null;
-    /* picture mode port's current position */
-    public static int mCurInputPortPos = 0;
-    /* picture mode mode's current position */
-    public static int mCurShowModePos = 0;
-    /* white balance mode's current position */
-    public static int mColorTemperaturePos = 0;
-    /* test picture's current position */
-    public static int ceshituPos = 0;
-    /* ReShow rate TVIN_3D_STATUS's current position */
-    public static int reshowTvinPos = 0;
-    /* ReShow rate TvinTransFmt's current position */
-    public static int reshowTvinTransFmtPos = 0;
-    public static TvControlManager tv = TvControlManager.getInstance();
-    private SystemControlManager mSystemControlManager;
-
-    public AlertDialog.Builder aBuilder;
-    public Dialog mydialog;
-    private PowerManager pm;
-    private EditText demoparam;
-
-    private Handler uiHandler = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        setContentView(R.layout.factorymain);
-        mSystemControlManager = new SystemControlManager(this);
-        /* father ListView's quote */
-        flv = (ListView) findViewById(R.id.left_listView);
-        flv.setSelection(0);
-        mListMenuData = new ArrayList<String>();
-        mListMenuData.clear();
-        /* add father ListView's item to this adapter */
-        fAdapter = new ArrayAdapter<String>(this, R.layout.factory_menu_item, mListMenuData);
-        /* add ListView's content to mListMenuData */
-        setListFactoryData();
-        /* set adapter to ListView */
-        flv.setAdapter(fAdapter);
-        /* son ListView's quote */
-        slv = (ListView) findViewById(R.id.right_listView);
-        mListSubMenuData = new ArrayList<Map<String, String>>();
-        softData = new ArrayList<Map<String, String>>();
-        /* add son ListView's item to this adapter */
-        sAdapter = new SimpleAdapter(this, mListSubMenuData, R.layout.factory_submenu_item, new String[] {"sub_name", "sub_value"}, new int[] {
-                                         R.id.sub_name, R.id.sub_value
-                                     });
-        softAdapter = new SimpleAdapter(this, softData, R.layout.softwareinfo, new String[] {"soft_name", "soft_value"}, new int[] {R.id.soft_name,
-                                        R.id.soft_value
-                                                                                                                                   });
-        slv.setAdapter(sAdapter);
-        /* Listener when father listView's item is selected */
-        flv.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-                if (arg2 == Constant.PAGE_SOFTINFO/* || arg2 == Constant.PAGE_FBC_VERSION*/) {
-                    slv.setAdapter(softAdapter);
-                } else {
-                    slv.setAdapter(sAdapter);
-                }
-                // mPreMenu = arg1;
-                setFactorySubmenu(arg2);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> arg0) {
-            }
-        });
-        /* Listener when father ListView's item is clicked */
-        flv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-                fokbutton(arg2);
-            }
-        });
-        /* Listener when son listView's item is selected */
-        slv.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-                mSubMenuPos = arg2;
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> arg0) {
-                mSubMenuPos = -1;
-            }
-        });
-        /* Listener when son listView's item is clicked */
-        slv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-                sokbutton(arg2);
-            }
-        });
-
-        tv.SetUpgradeFBCListener(this);
-
-        uiHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                // TODO Auto-generated method stub
-                if (msg.what == 1) {
-                    mydialog.dismiss();
-                    aBuilder.setTitle(getString(R.string.facui_writekey)).setMessage(getString(R.string.writesuccess))
-                    .setPositiveButton(getString(R.string.confirm), null).show();
-                } else if (msg.what == 2) {
-                    mydialog.dismiss();
-                    aBuilder.setTitle(getString(R.string.facui_writekey)).setMessage(getString(R.string.writefail))
-                    .setPositiveButton(getString(R.string.confirm), null).show();
-                }
-            }
-
-        };
-    }
-
-    @Override
-    protected void onStart() {
-        // TODO Auto-generated method stub
-        super.onStart();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mCurInputPortPos = 0;
-        mCurShowModePos = 0;
-        mColorTemperaturePos = 0;
-        ceshituPos = 0;
-        reshowTvinPos = 0;
-        reshowTvinTransFmtPos = 0;
-    }
-
-    @Override
-    protected void onStop() {
-        // TODO Auto-generated method stub
-        super.onStop();
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_DPAD_LEFT:
-                if (slv.hasFocus() == true) {
-                    processSubMenuDirection(true);
-                    return true;
-                }
-                break;
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
-                if (slv.hasFocus() == true) {
-                    processSubMenuDirection(false);
-                    return true;
-                } else if (flv.hasFocus() == true) {
-                    slv.requestFocus();
-                    slv.setSelection(0);
-                    return true;
-                }
-                break;
-            case KeyEvent.KEYCODE_BACK:
-                if (slv.hasFocus() == true) {
-                    flv.requestFocus();
-                    flv.setSelection(mPage);
-                    return true;
-                }
-                break;
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-                if (flv.hasFocus() == true && mPage < mListMenuData.size() - 1) {
-                    flv.setSelection(++mPage);
-                }
-                if (flv.hasFocus() == true && mPage == mListMenuData.size() - 1) {
-                    flv.setSelection(0);
-                }
-                if (slv.hasFocus() == true) {
-                    slv.requestFocus();
-                    return true;
-                }
-                break;
-            case KeyEvent.KEYCODE_DPAD_UP:
-                if (flv.hasFocus() == true && mPage > 0) {
-                    flv.setSelection(--mPage);
-                }
-                if (flv.hasFocus() == true && mPage == 0) {
-                    flv.setSelection(mListMenuData.size() - 1);
-                }
-                break;
-            default:
-                break;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    /* confirm dialog */
-    public void ConfirmDialog(String msg, OnClickListener listener) {
-        new AlertDialog.Builder(FactoryMainActivity.this).setTitle(getString(R.string.confirm)).setMessage(msg)
-        .setPositiveButton(getString(R.string.confirm), listener).setNegativeButton(getString(R.string.cancel), null).show();
-    }
-
-    private void fokbutton(int mPage) {
-        switch (mPage) {
-            case Constant.PAGE_FACRESET:
-                String msg = getString(R.string.surereset);
-                OnClickListener listener = new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        tv.SSMInitDevice();
-                        tv.FactoryCleanAllTableForProgram();
-                        sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
-                    }
-                };
-                ConfirmDialog(msg, listener);
-                break;
-            case Constant.PAGE_FACTORYCHANNEL:
-                // Intent intent = new Intent();
-                // intent.setAction("android.intent.action.FavoriteChannelActivity");
-                // this.startActivity(intent);
-               /* if (tv.TvMiscChannelImport(FileUtil.getUdiskPath() + "tv.db") == 0) {
-                    Toast.makeText(getApplicationContext(), "set success", Toast.LENGTH_LONG).show();
-                } else {
-                    Toast.makeText(getApplicationContext(), "set fail", Toast.LENGTH_LONG).show();
-                }*/
-                break;
-            case Constant.PAGE_UPGRADE:
-                Intent upgradeintent = new Intent();
-                upgradeintent.setClassName("com.droidlogic.otaupgrade", "com.droidlogic.otaupgrade.MainActivity");
-                FactoryMainActivity.this.startActivity(upgradeintent);
-                break;
-            // case Constant.PAGE_SETDEMOPARAM:
-            // demoparam = new EditText(FactoryMainActivity.this);
-            // OnClickListener demolistener = new OnClickListener()
-            // {
-            // @Override
-            // public void onClick(DialogInterface dialog, int which)
-            // {
-            // if (demoparam.getText().toString().equals("8878") || demoparam.getText().toString().equals("8880"))
-            // {
-            // mSystemControlManager.setBootenv("ubootenv.var.demod", (demoparam.getText().toString()));
-            // Toast.makeText(getApplicationContext(), getString(R.string.setsuccess), Toast.LENGTH_LONG).show();
-            // }
-            // else
-            // {
-            // Toast.makeText(getApplicationContext(), getString(R.string.setfail), Toast.LENGTH_LONG).show();
-            // }
-            //
-            // }
-            // };
-            // new
-            // AlertDialog.Builder(this).setTitle(getString(R.string.enterdata)).setIcon(android.R.drawable.ic_dialog_info).setView(demoparam)
-            // .setPositiveButton(getString(R.string.confirm),
-            // demolistener).setNegativeButton(getString(R.string.cancel), null).show();
-            // break;
-
-            case Constant.PAGE_WRITE_KEY:
-                Log.d("TEST", "--------------- Constant.PAGE_WRITE_KEY is pressed ------------");
-                String msg2 = getString(R.string.writekey);
-                OnClickListener listener2 = new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        aBuilder = new AlertDialog.Builder(FactoryMainActivity.this);
-                        aBuilder.setTitle(getString(R.string.facui_writekey)).setMessage(getString(R.string.iswriting));
-                        mydialog = aBuilder.show();
-                        Thread writeThread = new Thread() {
-                            @Override
-                            public void run() {
-                                // TODO Auto-generated method stub
-                                if (FileUtil.process(tv)) {
-                                    Message msg = uiHandler.obtainMessage(1);
-                                    uiHandler.sendMessage(msg);
-                                } else {
-                                    Message msg2 = uiHandler.obtainMessage(2);
-                                    uiHandler.sendMessage(msg2);
-                                }
-                            }
-                        };
-                        writeThread.start();
-                    }
-                };
-                ConfirmDialog(msg2, listener2);
-                break;
-            default:
-                break;
-        }
-    }
-
-    /* cursor's position in noLiner's son dialog */
-    int j = 0;
-
-    protected int showAddDialog(final TvControlManager.SourceInput source, final TvControlManager.noline_params_t noline_params) {
-        LayoutInflater factory = LayoutInflater.from(this);
-        View textEntryView = factory.inflate(R.layout.mdialog, null);
-        /* EditText backspace's listener */
-        OnKeyListener listener = new OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                int i = ((EditText) v).getText().toString().length();
-                switch (keyCode) {
-                    case KeyEvent.KEYCODE_0:
-                    case KeyEvent.KEYCODE_1:
-                    case KeyEvent.KEYCODE_2:
-                    case KeyEvent.KEYCODE_3:
-                    case KeyEvent.KEYCODE_4:
-                    case KeyEvent.KEYCODE_5:
-                    case KeyEvent.KEYCODE_6:
-                    case KeyEvent.KEYCODE_7:
-                    case KeyEvent.KEYCODE_8:
-                    case KeyEvent.KEYCODE_9:
-                        if (event.getAction() == KeyEvent.ACTION_UP)
-                            j++;
-                        break;
-                    case KeyEvent.KEYCODE_CLEAR:
-                        if (event.getAction() == KeyEvent.ACTION_DOWN && j > 0 && !"".equals(((EditText) v).getText().toString().trim())) {
-                            String str1 = new String(((EditText) v).getText().toString());
-                            String str2 = new String(((EditText) v).getText().toString());
-                            str1 = str1.substring(0, j - 1);
-                            str2 = str2.substring(j, i);
-                            String str = str1 + str2;
-                            ((EditText) v).setText(str);
-                            /*author:fuhao::set cursor position*/
-                            ((EditText) v).setSelection(--j);
-                        }
-                        break;
-                    case KeyEvent.KEYCODE_DPAD_LEFT:
-                        if (event.getAction() == KeyEvent.ACTION_DOWN)
-                            if (j > 0)
-                                j--;
-                        break;
-                    case KeyEvent.KEYCODE_DPAD_RIGHT:
-                        if (event.getAction() == KeyEvent.ACTION_DOWN)
-                            if (j < i)
-                                j++;
-                        break;
-                    default:
-                        break;
-                }
-                return false;
-            }
-        };
-        final EditText editText1 = (EditText) textEntryView.findViewById(R.id.editText1);
-        final EditText editText2 = (EditText) textEntryView.findViewById(R.id.editText2);
-        final EditText editText3 = (EditText) textEntryView.findViewById(R.id.editText3);
-        final EditText editText4 = (EditText) textEntryView.findViewById(R.id.editText4);
-        final EditText editText5 = (EditText) textEntryView.findViewById(R.id.editText5);
-        Button confirmButton = (Button) textEntryView.findViewById(R.id.confirm);
-        Button cancelButton = (Button) textEntryView.findViewById(R.id.cancel);
-        cancelButton.requestFocus();
-        /*listener when EditText's focus change,to set j as 0*/
-        OnFocusChangeListener listener2 = new OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                j = ((EditText) v).getText().toString().length();
-            }
-        };
-        editText1.setOnFocusChangeListener(listener2);
-        editText2.setOnFocusChangeListener(listener2);
-        editText3.setOnFocusChangeListener(listener2);
-        editText4.setOnFocusChangeListener(listener2);
-        editText5.setOnFocusChangeListener(listener2);
-        /* set listener to editText */
-        editText1.setOnKeyListener(listener);
-        editText2.setOnKeyListener(listener);
-        editText3.setOnKeyListener(listener);
-        editText4.setOnKeyListener(listener);
-        editText5.setOnKeyListener(listener);
-        /* cut soft keyboard */
-        Class<EditText> cls = EditText.class;
-        try {
-            Method setShowSoftInputOnFocus = cls.getMethod("setShowSoftInputOnFocus", boolean.class);
-            setShowSoftInputOnFocus.setAccessible(false);
-            setShowSoftInputOnFocus.invoke(editText1, false);
-            setShowSoftInputOnFocus.invoke(editText2, false);
-            setShowSoftInputOnFocus.invoke(editText3, false);
-            setShowSoftInputOnFocus.invoke(editText4, false);
-            setShowSoftInputOnFocus.invoke(editText5, false);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        final AlertDialog.Builder ad1 = new AlertDialog.Builder(FactoryMainActivity.this);
-
-        ad1.setTitle(getString(R.string.enterdata));
-        ad1.setView(textEntryView);
-        final Dialog dialog = ad1.show();// show dialog
-        confirmButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (editText1.length() != 0 && editText2.length() != 0 && editText3.length() != 0 && editText4.length() != 0
-                    && editText5.length() != 0) {
-                    noline_params.osd0 = Integer.parseInt(editText1.getText().toString());
-                    noline_params.osd25 = Integer.parseInt(editText2.getText().toString());
-                    noline_params.osd50 = Integer.parseInt(editText3.getText().toString());
-                    noline_params.osd75 = Integer.parseInt(editText4.getText().toString());
-                    noline_params.osd100 = Integer.parseInt(editText5.getText().toString());
-                    if (noline_params.osd0 >= 0 && noline_params.osd0 < 256 && noline_params.osd25 >= 0 && noline_params.osd25 < 256
-                        && noline_params.osd50 >= 0 && noline_params.osd50 < 256 && noline_params.osd75 >= 0 && noline_params.osd75 < 256
-                        && noline_params.osd100 >= 0 && noline_params.osd100 < 256) {
-                        tv.FactorySetNolineParams(TvControlManager.NOLINE_PARAMS_TYPE.values()[mSubMenuPos - 1], source, noline_params);
-                        for (int io = mListSubMenuData.size() - 1; io > 0; io--)
-                            mListSubMenuData.remove(io);
-                        ShowSubView ssv = new ShowSubView(mListSubMenuData, FactoryMainActivity.this);
-                        ssv.setNoLine(source);
-                        sAdapter.notifyDataSetChanged();
-                        dialog.dismiss();
-                    } else {
-                        new AlertDialog.Builder(FactoryMainActivity.this).setMessage(getString(R.string.wrongdata))
-                        .setPositiveButton(getString(R.string.confirm), null).show();
-                    }
-                } else {
-                    new AlertDialog.Builder(FactoryMainActivity.this).setMessage(getString(R.string.wrongdata))
-                    .setPositiveButton(getString(R.string.confirm), null).show();
-                }
-            }
-        });
-        cancelButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-            }
-        });
-        return 1;
-    }
-
-    /* ADC auto calibration dialog's confirm listener */
-    OnClickListener adclistener = new OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-        }
-    };
-    public EditText whitebalanceEditText;
-    /* White Balance input dialog's confirm listener */
-    OnClickListener whitebalancelistener = new OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            Map<String, String> map = mListSubMenuData.get(mSubMenuPos);
-            int value = Integer.parseInt(whitebalanceEditText.getText().toString());
-            TvControlManager.SourceInput_Type source = TvControlManager.SourceInput_Type.values()[mCurInputPortPos];
-            // TODO Auto-generated method stub
-            switch (mSubMenuPos) {
-                case 2:
-                    if (value >= 0 && value < 2047) {
-                        tv.FactoryWhiteBalanceSetRedGain(source.toInt(), mColorTemperaturePos, value);
-                        map.put("sub_value", "" + value);
-                        sAdapter.notifyDataSetChanged();
-                    }
-                    break;
-                case 3:
-                    if (value >= 0 && value < 2047) {
-                        tv.FactoryWhiteBalanceSetGreenGain(source.toInt(), mColorTemperaturePos, value);
-                        map.put("sub_value", "" + value);
-                        sAdapter.notifyDataSetChanged();
-                    }
-                    break;
-                case 4:
-                    if (value >= 0 && value < 2047) {
-                        tv.FactoryWhiteBalanceSetBlueGain(source.toInt(), mColorTemperaturePos, value);
-                        map.put("sub_value", "" + value);
-                        sAdapter.notifyDataSetChanged();
-                    }
-                    break;
-                case 5:
-                    if (value >= -1023 && value < 1024) {
-                        tv.FactoryWhiteBalanceSetRedOffset(source.toInt(), mColorTemperaturePos, value);
-                        map.put("sub_value", "" + value);
-                        sAdapter.notifyDataSetChanged();
-                    }
-                    break;
-                case 6:
-                    if (value >= -1023 && value < 1024) {
-                        tv.FactoryWhiteBalanceSetGreenOffset(source.toInt(), mColorTemperaturePos, value);
-                        map.put("sub_value", "" + value);
-                        sAdapter.notifyDataSetChanged();
-                    }
-                    break;
-                case 7:
-                    if (value >= -1023 && value < 1024) {
-                        tv.FactoryWhiteBalanceSetBlueOffset(source.toInt(), mColorTemperaturePos, value);
-                        map.put("sub_value", "" + value);
-                        sAdapter.notifyDataSetChanged();
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    };
-
-    public void sokbutton(int mSubMenuPos) {
-        /* ADC auto calibration */
-        if (mPage == Constant.PAGE_CALIBRATE && mSubMenuPos == 1) {
-            ConfirmDialog(getString(R.string.sureadc), adclistener);
-        }
-        if (mPage == Constant.PAGE_WHITEBALANCE) {
-            whitebalanceEditText = new EditText(FactoryMainActivity.this);
-            new AlertDialog.Builder(this).setTitle(getString(R.string.enterdata)).setIcon(android.R.drawable.ic_dialog_info)
-            .setView(whitebalanceEditText).setPositiveButton(getString(R.string.confirm), whitebalancelistener)
-            .setNegativeButton(getString(R.string.cancel), null).show();
-        }
-        if (mPage == Constant.PAGE_PORTPRINT_SWITCH) {
-            switch (mSubMenuPos) {
-                case 0:
-                    ConfirmDialog(getString(R.string.sure_portprint_off), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mSystemControlManager.setBootenv("ubootenv.var.UART", "off");
-                            pm.reboot(null);
-                        }
-                    });
-                    break;
-                case 1:
-                    ConfirmDialog(getString(R.string.sure_portprint_on), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mSystemControlManager.setBootenv("ubootenv.var.UART", "on");
-                            pm.reboot(null);
-                        }
-                    });
-                    break;
-                default:
-                    break;
-            }
-        }
-        // if (mPage == Constant.PAGE_REMOTECONTROL)
-        // {
-        // switch (mSubMenuPos)
-        // {
-        // case 0:
-        // ConfirmDialog(getString(R.string.sure_remotecontrol), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.remoteid", "0");
-        // mSystemControlManager.setBootenv("ubootenv.var.factoryid", "0");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // case 1:
-        // ConfirmDialog(getString(R.string.sure_remotecontrol), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.remoteid", "1");
-        // mSystemControlManager.setBootenv("ubootenv.var.factoryid", "1");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // case 2:
-        // ConfirmDialog(getString(R.string.sure_remotecontrol), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.remoteid", "1");
-        // mSystemControlManager.setBootenv("ubootenv.var.factoryid", "2");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // case 3:
-        // ConfirmDialog(getString(R.string.sure_remotecontrol), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.remoteid", "1");
-        // mSystemControlManager.setBootenv("ubootenv.var.factoryid", "3");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // default:
-        // break;
-        // }
-        // }
-        if (mPage == Constant.PAGE_SCREEN) {
-            switch (mSubMenuPos) {
-                case 0:
-                    ConfirmDialog(getString(R.string.sure_screen_up), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mSystemControlManager.setBootenv("ubootenv.var.osd_reverse", "n");
-                            mSystemControlManager.setBootenv("ubootenv.var.video_reverse", "n");
-                            pm.reboot(null);
-                        }
-                    });
-                    break;
-                case 1:
-                    ConfirmDialog(getString(R.string.sure_screen_down), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mSystemControlManager.setBootenv("ubootenv.var.osd_reverse", "all,true");
-                            mSystemControlManager.setBootenv("ubootenv.var.video_reverse", "1");
-                            pm.reboot(null);
-                        }
-                    });
-                    break;
-                default:
-                    break;
-            }
-        }
-        // if (mPage == Constant.PAGE_UPGRADE_FBC)
-        // {
-        // if (mUpgradeFBCDoing == 0)
-        // {
-        // mUpgradeFBCDoing = 1;
-        // int up_mode = 0, up_block_size = 0;
-        // String path_str, mode_str, up_blk_size_str;
-        //
-        // Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        // if (FactoryMainActivity.mSubMenuPos == 0)
-        // {
-        // map.put("sub_value", getString(Constant.FACUI_START));
-        // FactoryMainActivity.sAdapter.notifyDataSetChanged();
-        // path_str = getUpdateFBCPath();
-        // mode_str = mSystemControlManager.getPropertyString("tv.upgradefbc.mode", "null");
-        // if (mode_str.equalsIgnoreCase("null"))
-        // {
-        // up_mode = 2;
-        // }
-        // else
-        // {
-        // up_mode = Integer.parseInt(mode_str);
-        // }
-        //
-        // if (up_mode < 0 || up_mode > 17)
-        // {
-        // up_mode = 2;
-        // }
-        //
-        // up_blk_size_str = mSystemControlManager.getPropertyString("tv.upgradefbc.blksize", "null");
-        // if (up_blk_size_str.equalsIgnoreCase("null"))
-        // {
-        // up_block_size = 0x10000;
-        // }
-        // else
-        // {
-        // up_block_size = Integer.parseInt(up_blk_size_str, 16);
-        // }
-        //
-        // Log.d("upgradeFBCSetValue: ", "path_str = " + path_str);
-        // Log.d("upgradeFBCSetValue: ", "mode_str = " + mode_str);
-        // Log.d("upgradeFBCSetValue: ", "up_mode = " + up_mode);
-        // Log.d("upgradeFBCSetValue: ", "up_block_size = " + up_block_size);
-        // tv.StartUpgradeFBC(path_str, up_mode, up_block_size);
-        // }
-        // }
-        // else
-        // {
-        // Toast.makeText(getApplicationContext(), "Upgrade FBC doing...", Toast.LENGTH_LONG).show();
-        // }
-        // }
-        // if (mPage == Constant.PAGE_OUTPUTMODE)
-        // {
-        // switch (mSubMenuPos)
-        // {
-        // case 0:
-        // ConfirmDialog(getString(R.string.sure_confirm), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.outputmode", "4k2k30hz");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // case 1:
-        // ConfirmDialog(getString(R.string.sure_confirm), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.outputmode", "4k2k50hz");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // case 2:
-        // ConfirmDialog(getString(R.string.sure_confirm), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.outputmode", "4k2k60hz");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // case 3:
-        // ConfirmDialog(getString(R.string.sure_confirm), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.outputmode", "1080p");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // case 4:
-        // ConfirmDialog(getString(R.string.sure_confirm), new OnClickListener()
-        // {
-        // @Override
-        // public void onClick(DialogInterface dialog, int which)
-        // {
-        // mSystemControlManager.setBootenv("ubootenv.var.outputmode", "1080p50hz");
-        // pm.reboot(null);
-        // }
-        // });
-        // break;
-        // default:
-        // break;
-        // }
-        // }
-    }
-
-    private String getUpdateFBCPath() {
-        String UpdateFBCPath = Constant.CS_UPGRADE_FBC_FILE_NAME;
-        File[] files = new File("/storage/external_storage").listFiles();
-        if (files != null) {
-            for (File file : files) {
-
-                if (file.getPath().startsWith("/storage/external_storage/sd")) {
-                    File[] myfiles = new File(file.getPath()).listFiles();
-                    if (myfiles != null) {
-                        for (File myfile : myfiles) {
-                            if (myfile.getName().equals("spi.bin")) {
-                                UpdateFBCPath = myfile.getAbsolutePath();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return UpdateFBCPath;
-    }
-
-    private void setListFactoryData() {
-        mListMenuData.add(getString(Constant.FACUI_ADC));
-        mListMenuData.add(getString(Constant.FACUI_PICMODE));
-        mListMenuData.add(getString(Constant.FACUI_WHTBLAN));
-        mListMenuData.add(getString(Constant.FACUI_SSC));
-        mListMenuData.add(getString(Constant.FACUI_CHONGXIAN));
-        mListMenuData.add(getString(Constant.FACUI_GONGNENG_CESHITU));
-        mListMenuData.add(getString(Constant.FACUI_LAOHUA));
-        mListMenuData.add(getString(Constant.FACUI_PINDAOYUSHE));
-        mListMenuData.add(getString(Constant.FACUI_FACRESET));
-        mListMenuData.add(getString(Constant.FACUI_SOFTINFO));
-        mListMenuData.add(getString(Constant.FACUI_HDMI_HDCP_DEMOKEY));
-        mListMenuData.add(getString(Constant.FACUI_WRITE_HDCP_MAC_KEY));
-        // mListMenuData.add(getString(Constant.FACUI_UPGRADE_FBC));
-        // mListMenuData.add(getString(Constant.FACUI_FBC_VERSION));
-        mListMenuData.add(getString(Constant.FACUI_SERIAL_CMD_SWITCH));
-        mListMenuData.add(getString(Constant.FACUI_PORTPRINT_SWITCH));
-        // mListMenuData.add(getString(Constant.FACUI_REMOTECONTROL));
-        // mListMenuData.add(getString(Constant.FACUI_ADB_SWITCH));
-        mListMenuData.add(getString(Constant.FACUI_UPGRADE));
-        // mListMenuData.add(getString(Constant.FACUI_SETDEMOPARAM));
-        // mListMenuData.add(getString(Constant.FACUI_AUTOSAVELOG_SWITCH));
-        mListMenuData.add(getString(Constant.FACUI_DYNAMIC_BACKLIGHT_VALUE));
-        mListMenuData.add(getString(Constant.FACUI_SCREEN));
-        // mListMenuData.add(getString(Constant.FACUI_OUTPUT_MODE));
-    }
-
-    private void setFactorySubmenu(int position) {
-        mListSubMenuData.clear();
-        softData.clear();
-        ShowSubView ssv = new ShowSubView(mListSubMenuData, FactoryMainActivity.this);
-        switch (position) {
-            case Constant.PAGE_CALIBRATE:
-                ssv.show_calibate_submenu();
-                break;
-            case Constant.PAGE_PICTUREMODE:
-                ssv.show_picture_submenu();
-                break;
-            case Constant.PAGE_WHITEBALANCE:// white balance
-                ssv.show_whitebalance_submenu();
-                break;
-            case Constant.PAGE_SSC:
-                ssv.show_ssc_submenu();
-                break;
-            case Constant.PAGE_OVERSCAN:
-                ssv.show_reshow_submenu();
-                break;
-            case Constant.PAGE_TESTPATTERN:
-                ssv.show_ceshitu_submenu();
-                break;
-            case Constant.PAGE_AGINGMODE:
-                ssv.show_agingmode_submenu();
-                break;
-            case Constant.PAGE_FACRESET:
-                mPage = Constant.PAGE_FACRESET;
-                break;
-            case Constant.PAGE_SOFTINFO:
-                ssv = new ShowSubView(softData, FactoryMainActivity.this);
-                ssv.show_softinfo_submenu();
-                break;
-            case Constant.HDMI_HDCP_DEMOKEY:
-                ssv.show_hdcp_submenu();
-                break;
-            case Constant.PAGE_WRITE_KEY:
-                mPage = Constant.PAGE_WRITE_KEY;
-                break;
-            // case Constant.PAGE_UPGRADE_FBC:
-            // ssv.show_upgrade_fbc();
-            // break;
-            // case Constant.PAGE_FBC_VERSION:
-            // ssv = new ShowSubView(softData, FactoryMainActivity.this);
-            // ssv.show_fbc_version();
-            // break;
-            case Constant.PAGE_SERIAL_CMD_SWITCH:
-                ssv.show_serial_submenu();
-                break;
-            case Constant.PAGE_PORTPRINT_SWITCH:
-                ssv.show_portprint_submenu();
-                break;
-            // case Constant.PAGE_REMOTECONTROL:
-            // ssv.show_remotecontrol();
-            // break;
-            // case Constant.PAGE_ADB_SWITCH:
-            // ssv.show_adb_submenu();
-            // break;
-            case Constant.PAGE_UPGRADE:
-                mPage = Constant.PAGE_UPGRADE;
-                break;
-            // case Constant.PAGE_SETDEMOPARAM:
-            // mPage = Constant.PAGE_SETDEMOPARAM;
-            // break;
-            // case Constant.PAGE_AUTOSAVELOG_SWITCH:
-            // ssv.show_autosavelog_submenu();
-            // break;
-            case Constant.PAGE_DYNAMIC_BACKLIGHT_VALUE:
-                ssv.show_dynamicbacklight_submenu();
-                break;
-            case Constant.PAGE_SCREEN:
-                ssv.show_screen_submenu();
-                break;
-            // case Constant.PAGE_OUTPUTMODE:
-            // ssv.show_outputmode();
-            // mPage = Constant.PAGE_OUTPUTMODE;
-            // break;
-            default:
-                break;
-        }
-        sAdapter.notifyDataSetChanged();
-    }
-
-    private void processSubMenuDirection(boolean left) {
-        KeyDown kDown = new KeyDown(mListSubMenuData, FactoryMainActivity.this);
-        int step = 0;
-        if (left == true) {
-            step = -1;
-        } else {
-            step = 1;
-        }
-        switch (mPage) {
-            case Constant.PAGE_CALIBRATE:
-                kDown.adjustCalibrate(left, step);
-                break;
-            case Constant.PAGE_PICTUREMODE:
-                kDown.adjustPicMode(left, step);
-                break;
-            case Constant.PAGE_WHITEBALANCE:
-                kDown.adjustWhiteBalance(left, step);
-                break;
-            case Constant.PAGE_SSC:
-                kDown.adjustSSC(left, step);
-                break;
-            case Constant.PAGE_OVERSCAN:
-                kDown.adjustReshow(left, step);
-                break;
-            case Constant.PAGE_TESTPATTERN:
-                kDown.adjustFunction(left, step);
-                break;
-            case Constant.PAGE_AGINGMODE:
-                kDown.adjustAging(left, step);
-                break;
-            case Constant.HDMI_HDCP_DEMOKEY:
-                kDown.hdcpSetValue();
-                break;
-            case Constant.PAGE_SERIAL_CMD_SWITCH:
-                kDown.serialSetValue();
-                break;
-            // case Constant.PAGE_ADB_SWITCH:
-            // kDown.adbSetValue();
-            // break;
-            // case Constant.PAGE_AUTOSAVELOG_SWITCH:
-            // kDown.autosavelogSetValue();
-            // break;
-            case Constant.PAGE_DYNAMIC_BACKLIGHT_VALUE:
-                kDown.dynamicbacklightSetValue(left, step);
-                break;
-            default:
-                break;
-        }
-    }
-
-    private int mUpgradeFBCDoing = 0;
-
-    @Override
-    public void onUpgradeStatus(int state, int param) {
-        String tmp_str = "";
-
-        if (state == TvControlManager.FBCUpgradeState.STATE_RUNNING.toInt()) {
-            tmp_str = "Upgrade FBC running: progress = " + String.valueOf(param) + " %";
-            Toast.makeText(getApplicationContext(), tmp_str, Toast.LENGTH_LONG).show();
-        } else if (state == TvControlManager.FBCUpgradeState.STATE_FINISHED.toInt()) {
-            tmp_str = "Upgrade FBC finished";
-            Toast.makeText(getApplicationContext(), tmp_str, Toast.LENGTH_LONG).show();
-            mUpgradeFBCDoing = 0;
-        } else if (state == TvControlManager.FBCUpgradeState.STATE_ABORT.toInt()) {
-            if (param == TvControlManager.FBCUpgradeErrorCode.ERR_SERIAL_CONNECT.toInt()) {
-                tmp_str = "Upgrade FBC error: Please check serial connect!";
-                Toast.makeText(getApplicationContext(), tmp_str, Toast.LENGTH_LONG).show();
-            } else if (param == TvControlManager.FBCUpgradeErrorCode.ERR_OPEN_BIN_FILE.toInt()) {
-                tmp_str = "Upgrade FBC error: Open upgrade bin file failed!";
-                Toast.makeText(getApplicationContext(), tmp_str, Toast.LENGTH_LONG).show();
-            } else if (param == TvControlManager.FBCUpgradeErrorCode.ERR_BIN_FILE_SIZE.toInt()) {
-                tmp_str = "Upgrade FBC error: upgrade bin file size error!";
-                Toast.makeText(getApplicationContext(), tmp_str, Toast.LENGTH_LONG).show();
-            }
-            mUpgradeFBCDoing = 0;
-        }
-    }
-}
diff --git a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FavoriteChannelActivity.java b/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FavoriteChannelActivity.java
deleted file mode 100644
index 68df97d..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FavoriteChannelActivity.java
+++ b/dev/null
@@ -1,177 +0,0 @@
-/**
- * Factory channel preset's Activity
- *
- * @author ice.fu
- */
-package com.amlogic.factory;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-
-public class FavoriteChannelActivity extends Activity {
-    private FileUtil mFileUtils;
-    private ListView mListCenter;
-    private String mRecoveryPath;// file path and file name
-    private String mDbName;// file name
-    public AlertDialog.Builder aBuilder;
-    public Dialog mydialog;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.favoritechannel);
-        mFileUtils = new FileUtil();
-
-        mListCenter = (ListView) findViewById(R.id.list_center);
-        mListCenter.setAdapter(newListAdapter());
-
-        mListCenter.setOnItemClickListener(new OnItemClickListener() {
-            public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-                Map<String, Object> item = (Map<String, Object>) arg0.getItemAtPosition(arg2);
-                mRecoveryPath = (String) item.get("item_path");
-                mDbName = (String) item.get("item_name");
-                String msg = getString(R.string.suredb);
-                OnClickListener listener = new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        try {
-                            aBuilder = new AlertDialog.Builder(FavoriteChannelActivity.this);
-                            aBuilder.setTitle(getString(R.string.facui_pindaoyushe)).setMessage(getString(R.string.ispresetting));
-                            mydialog = aBuilder.show();
-                            File newFile = new File("/data/data/com.android.providers.tv/databases/" + mDbName);
-                            if (newFile.exists())
-                                delFile(newFile);
-                            String commands = "cp -rf " + mRecoveryPath + " /data/data/com.android.providers.tv/databases/" + mDbName;
-                            /* do the copy command */
-                            Runtime.getRuntime().exec(commands);
-                            BufferedReader input = new BufferedReader(new FileReader(newFile));
-                            if (input.read() != -1) {
-                                mydialog.dismiss();
-                                mydialog.dismiss();
-                                aBuilder.setTitle(getString(R.string.facui_pindaoyushe)).setMessage(getString(R.string.finishpresetting))
-                                .setPositiveButton(getString(R.string.confirm), null).show();
-                            }
-                            input.close();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                };
-                ConfirmDialog(msg, listener);
-            }
-        });
-    }
-
-    /**
-    * delete file,only support delete file,not support delete path
-    * @param file
-    * @throws Exception
-    */
-    private void delFile(File file) throws Exception {
-        if (!file.exists()) {
-            throw new Exception(getString(R.string.file) + file.getName() + getString(R.string.noexist));
-        }
-        if (file.isFile()) {
-            if (file.canWrite()) {
-                file.delete();
-            } else {
-                mydialog.dismiss();
-                aBuilder.setTitle(getString(R.string.facui_pindaoyushe))
-                .setMessage(getString(R.string.alreadyexist) + file.getName() + getString(R.string.onlyread))
-                .setPositiveButton(getString(R.string.confirm), null).show();
-                throw new Exception(getString(R.string.file) + file.getName() + getString(R.string.onlyread));
-            }
-        } else {
-            mydialog.dismiss();
-            aBuilder.setTitle(getString(R.string.facui_pindaoyushe))
-            .setMessage(getString(R.string.file) + file.getName() + getString(R.string.notstandard))
-            .setPositiveButton(getString(R.string.confirm), null).show();
-            throw new Exception(getString(R.string.file) + file.getName() + getString(R.string.notstandard));
-        }
-    }
-
-    /* confirm dialog */
-    public void ConfirmDialog(String msg, OnClickListener listener) {
-        new AlertDialog.Builder(FavoriteChannelActivity.this).setTitle(getString(R.string.confirm)).setMessage(msg)
-        .setPositiveButton(getString(R.string.confirm), listener).setNegativeButton(getString(R.string.cancel), null).show();
-    }
-
-    private List<Map<String, Object>> getListData() {
-        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-        Map<String, Object> map;
-        String recovery_path = getResources().getString(R.string.config_recovery_usb_path);
-
-        File dir = new File("/storage/external_storage");
-        String regex_usb = "udisk([0-9])*";
-        String regex = ".+\\.[Dd][Bb]";
-
-        if (dir.exists() && dir.isDirectory()) {
-            File[] files = dir.listFiles(new MyFilenameFilter(regex_usb));
-            if (files != null && files.length > 0) {
-                for (File file : files) {
-                    if (file.exists() && file.isDirectory()) {
-                        File[] files4 = file.listFiles(new MyFilenameFilter(regex));
-                        if (files4 != null && files4.length > 0) {
-                            for (File file4 : files4) {
-                                map = new HashMap<String, Object>();
-                                map.put("item_icon", R.drawable.item_icon_def);
-                                map.put("item_name", file4.getName());
-                                map.put("item_path", file4.getAbsolutePath());
-                                map.put("item_recovery_path", recovery_path + "/" + file4.getName());
-
-                                String date = new SimpleDateFormat("yyyy/MM/dd HH:mm").format(new Date(file4.lastModified()));
-                                map.put("item_date", date);
-
-                                map.put("item_icon2", R.drawable.item_icon2_def);
-                                list.add(map);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return list;
-    }
-
-    private SimpleAdapter newListAdapter() {
-        return new SimpleAdapter(FavoriteChannelActivity.this, getListData(), R.layout.favoritechannel_list, new String[] {"item_icon", "item_name",
-                                 "item_path", "item_date", "item_icon2"
-                                                                                                                          }, new int[] {R.id.item_icon, R.id.item_name, R.id.item_path, R.id.item_date, R.id.item_icon2});
-    }
-
-    private class MyFilenameFilter implements FilenameFilter {
-        private Pattern p;
-
-        public MyFilenameFilter(String regex) {
-            p = Pattern.compile(regex);
-        }
-
-        public boolean accept(File file, String name) {
-            return p.matcher(name).matches();
-        }
-
-    }
-}
diff --git a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FileUtil.java b/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FileUtil.java
deleted file mode 100644
index 1420d6b..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/FileUtil.java
+++ b/dev/null
@@ -1,317 +0,0 @@
-/**
- * operate file's class
- *
- * @author ice.fu
- */
-package com.amlogic.factory;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.droidlogic.app.tv.TvControlManager;
-
-public class FileUtil {
-    private static final String TAG = "WriteKey";
-    private static final int MAC_LENTH = 6;
-    private static final int HDCP_LENTH = 368;
-    private static final String UDISK_PATH = getUdiskPath();
-    private static final String MAC_DIR = "/storage/external_storage/" + UDISK_PATH + "/MAC";
-    private static final String MAC_BANK_DIR = "/storage/external_storage/" + UDISK_PATH + "/MAC_BANK";
-    private static final String HDCP_DIR = "/storage/external_storage/" + UDISK_PATH + "/HDCP";
-    private static final String HDCP_BANK_DIR = "/storage/external_storage/" + UDISK_PATH + "/HDCP_BANK";
-    private static File hdcpFile = null;
-    private static File macFile = null;
-    private static Runtime run = Runtime.getRuntime();
-    static byte[] macKeyData = new byte[MAC_LENTH];
-    static byte[] hdcpKeyData = new byte[HDCP_LENTH];
-
-    static int[] data_1 = new int[MAC_LENTH];
-    static int[] data_2 = new int[HDCP_LENTH];
-
-    static final int HDCP_TYPE = 1;
-    static final int MAC_TYPE = 2;
-
-    public static String getUdiskPath() {
-        File[] files = new File("/storage/external_storage").listFiles();
-        if (files != null) {
-            for (File file : files) {
-                if (!file.getName().startsWith("sdcard")) {
-                    return file.getName();
-                }
-            }
-        }
-        return "udisk0";
-    }
-
-    private static boolean ReadKey(String key_path, int type) {
-        File keyFileDir = null;
-        File[] keyFileList = null;
-        keyFileDir = new File(key_path);
-        if (keyFileDir.exists()) {
-            keyFileList = keyFileDir.listFiles();
-            if (keyFileList.length > 0) {
-                File curFile = keyFileList[0];
-                if (curFile.exists()) {
-                    FileInputStream fStream = null;
-                    if (type == MAC_TYPE) {
-                        macFile = curFile;
-                    } else if (type == HDCP_TYPE) {
-                        hdcpFile = curFile;
-                    }
-                    try {
-                        fStream = new FileInputStream(curFile);
-                        if (fStream != null) {
-                            try {
-                                if (type == HDCP_TYPE) {
-                                    fStream.read(hdcpKeyData, 0, hdcpKeyData.length);
-                                } else {
-                                    fStream.read(macKeyData, 0, macKeyData.length);
-                                }
-                            } catch (IOException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                                Log.d(TAG, "=========== Read file error ! ===========");
-                            }
-                            return true;
-                        }
-                    } catch (FileNotFoundException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    } finally {
-                        if (fStream != null)
-                            try {
-                                fStream.close();
-                            } catch (IOException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                            }
-                    }
-                }
-                Log.d(TAG, "=========== key file not exit ===========");
-            }
-            Log.d(TAG, "=========== path " + key_path + "  not exit ===========");
-            return false;
-        } else {
-            return false;
-        }
-    }
-
-    private static int writeKey(TvControlManager tv, int[] buffer, int type) {
-        if (type == HDCP_TYPE)
-            return tv.SSMSaveHDCPKey(buffer);
-        else
-            return tv.SSMSaveMacAddress(buffer);
-    }
-
-    public static boolean moveFile(byte[] buffer, int type) {
-        File bankDir = null;
-        File newFile = null;
-        File oldFile = null;
-        String newFileName = null;
-        FileOutputStream outStream = null;
-        if (type == HDCP_TYPE) { //hdcp
-            bankDir = new File(HDCP_BANK_DIR);
-            if (hdcpFile.exists()) {
-                newFileName = hdcpFile.getName();
-                oldFile = hdcpFile;
-            }
-        } else { // mac
-            bankDir = new File(MAC_BANK_DIR);
-            if (macFile.exists()) {
-                newFileName = macFile.getName();
-                oldFile = macFile;
-            }
-        }
-
-        if (!bankDir.exists()) {
-            if (!bankDir.mkdir()) {
-                Log.d(TAG, "=========== create bank directory failed ! ===========");
-                return false;
-            }
-        }
-        if (newFileName != null) {
-            newFile = new File(bankDir + "/" + newFileName);
-            Log.d(TAG, "----------- new file path is " + newFile.getPath() + " -------------");
-            try {
-                if (!newFile.createNewFile()) {
-                    Log.d(TAG, "=========== create bank file failed ! ===========");
-                    return false;
-                }
-                outStream = new FileOutputStream(newFile);
-                outStream.write(buffer);
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                Log.d(TAG, "=========== Write file error ! ===========");
-                e.printStackTrace();
-
-            } finally {
-                if (outStream != null) {
-                    try {
-                        outStream.close();
-                    } catch (IOException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-            }
-
-            if (oldFile.delete()) {
-                if (type == HDCP_TYPE)
-                    hdcpFile = null;
-                else
-                    macFile = null;
-                try {
-                    Process p = Runtime.getRuntime().exec("sync");
-                    if (p.waitFor() != 0) {
-                        if (p.exitValue() == 1)
-                            Log.d(TAG, "runSystemCmd sync" + " error!");
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return true;
-            } else {
-                Log.d(TAG, "=========== delete file error ! ===========");
-                return false;
-            }
-        } else {
-            Log.d(TAG, "=========== move key file not exit ===========");
-            return false;
-        }
-    }
-
-    private static void clearBuffer(int type) {
-        if (type == HDCP_TYPE) {
-            for (int i = 0; i < HDCP_LENTH; i++) {
-                data_2[i] = 0;
-                hdcpKeyData[i] = 0;
-            }
-        } else {
-            for (int i = 0; i < MAC_LENTH; i++) {
-                data_1[i] = 0;
-                macKeyData[i] = 0;
-            }
-        }
-    }
-
-    private static void copyBuffer(int type) {
-        StringBuilder b = new StringBuilder();
-        if (type == HDCP_TYPE) {
-            for (int i = 0; i < HDCP_LENTH; i++) {
-                if (i % 10 == 0) {
-                    Log.d(TAG, b.toString());
-                    b.delete(0, b.length());
-                    Log.d(TAG, "-----------------------------------------------");
-                }
-                data_2[i] = hdcpKeyData[i];
-                b.append(data_2[i] & 0xff);
-                b.append(" ");
-            }
-        } else {
-            Log.d(TAG, "----------------------mac data-------------------------");
-            for (int i = 0; i < MAC_LENTH; i++) {
-                data_1[i] = macKeyData[i];
-                b.append(data_1[i] & 0xff);
-                b.append(" ");
-            }
-            Log.d(TAG, b.toString());
-            b.delete(0, b.length());
-            Log.d(TAG, "-----------------------------------------------");
-        }
-    }
-
-    /**
-     * Write both the mac and hdcp key
-     * @param tv
-     * @return
-     */
-    public static boolean process(TvControlManager tv) {
-        if ( ReadKey(HDCP_DIR, HDCP_TYPE) ) {
-            copyBuffer(HDCP_TYPE);
-            if ( writeKey(tv, data_2, HDCP_TYPE) == 0 ) {
-                if ( ReadKey(MAC_DIR, MAC_TYPE) ) {
-                    copyBuffer(MAC_TYPE);
-                    if ( writeKey(tv, data_1, MAC_TYPE) == 0 ) {
-                        if ( moveFile(hdcpKeyData, HDCP_TYPE) ) {
-                            clearBuffer(HDCP_TYPE);
-                            if ( moveFile(macKeyData, MAC_TYPE) ) {
-                                clearBuffer(MAC_TYPE);
-                                return true;
-                            }
-                        }
-                    } else {
-                        Log.d(TAG, "=========== write mac key error ! ===========");
-                    }
-                } else {
-                    Log.d(TAG, "=========== read  mac key error ! ===========");
-                }
-            } else {
-                Log.d(TAG, "=========== write hdcp key error ! ===========");
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Just write mac address
-     * @param tv
-     * @return
-     */
-    public static boolean processMac(TvControlManager tv) {
-        if (ReadKey(MAC_DIR, MAC_TYPE)) {
-            copyBuffer(MAC_TYPE);
-            if (writeKey(tv, data_1, MAC_TYPE) == 0) {
-                if (moveFile(macKeyData, MAC_TYPE)) {
-                    clearBuffer(MAC_TYPE);
-                    return true;
-                }
-            } else {
-                Log.d(TAG, "=========== write mac key error ! ===========");
-            }
-        } else {
-            Log.d(TAG, "=========== read  mac key error ! ===========");
-        }
-        return false;
-    }
-
-    /**
-     *  Just write HDCP key
-     * @param tv
-     * @return
-     */
-    public static boolean processHDCP(TvControlManager tv) {
-        if (ReadKey(HDCP_DIR, HDCP_TYPE)) {
-            copyBuffer(HDCP_TYPE);
-            if (writeKey(tv, data_2, HDCP_TYPE) == 0) {
-                copyBuffer(2);
-                if (moveFile(hdcpKeyData, HDCP_TYPE)) {
-                    clearBuffer(HDCP_TYPE);
-                    return true;
-                }
-            } else {
-                Log.d(TAG, "=========== write hdcp key error ! ===========");
-            }
-        } else {
-            Log.d(TAG, "=========== read hdcp key error ! ===========");
-        }
-        return false;
-    }
-
-}
diff --git a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/KeyDown.java b/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/KeyDown.java
deleted file mode 100644
index 014bc0b..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/KeyDown.java
+++ b/dev/null
@@ -1,676 +0,0 @@
-/**
- * change son item content when pressing key
- *
- * @author ice.fu
- */
-package com.amlogic.factory;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import com.droidlogic.app.tv.TvControlManager;
-import com.droidlogic.app.tv.TvInSignalInfo;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.SystemProperties;
-import android.util.Log;
-
-public class KeyDown {
-    public static TvControlManager tv = TvControlManager.getInstance();
-    /* son ListView's item save to this List */
-    public List<Map<String, String>> mListSubMenuData = null;
-
-    private Context context;
-
-    public KeyDown(List<Map<String, String>> mListSubMenuData, Context context) {
-        this.mListSubMenuData = mListSubMenuData;
-        this.context = context;
-    }
-
-    public void adjustCalibrate(boolean left, int step) {
-        String value_str = "";
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                value_str = map.get("sub_value");
-                if (value_str.equalsIgnoreCase(context.getString(Constant.FACUI_ADC_PORT_RGB)))
-                    map.put("sub_value", context.getString(Constant.FACUI_ADC_PORT_YPBPR));
-                else
-                    map.put("sub_value", context.getString(Constant.FACUI_ADC_PORT_RGB));
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void setpicparam(Map<String, String> map1, TvControlManager.SourceInput source, int is_save) {
-        if (FactoryMainActivity.mCurShowModePos != 3) {
-            int brightness = tv.GetBrightness(source);
-            int contrast = tv.GetContrast(source);
-            int saturation = tv.GetSaturation(source);
-            int sharpness = tv.GetSharpness(source);
-            FactoryMainActivity.mCurShowModePos = 3;
-            tv.SetPQMode(TvControlManager.PQMode.values()[FactoryMainActivity.mCurShowModePos], source, is_save);
-            map1.put("sub_value", context.getString(Constant.mShowModeList[FactoryMainActivity.mCurShowModePos]));
-            FactoryMainActivity.sAdapter.notifyDataSetChanged();
-            tv.SetBrightness(brightness, source, is_save);
-            tv.SaveBrightness(brightness, source);
-            tv.SetContrast(contrast, source, is_save);
-            tv.SaveContrast(contrast, source);
-            tv.SetSaturation(saturation, source, tv.GetCurrentSignalInfo().sigFmt, is_save);
-            tv.SaveSaturation(saturation, source);
-            tv.SetSharpness(sharpness, source, 0, 0);
-            tv.SaveSharpness(sharpness, source, 1);
-        }
-    }
-
-    public void adjustPicMode(boolean left, int step) {
-        String value_str = "";
-        int value_int = 0;
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        Map<String, String> map1 = mListSubMenuData.get(1);
-        TvControlManager.SourceInput source = TvControlManager.SourceInput.values()[FactoryMainActivity.mCurInputPortPos];
-        int is_save = 1;// if is_save is 1,auto save when setting,if is 0,call set function first,then save
-        ShowSubView ssv = new ShowSubView(mListSubMenuData, context);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0: {
-                    int iInputPortCount = Constant.mInputPortList.length;
-                    if (0 == FactoryMainActivity.mCurInputPortPos && left)
-                        FactoryMainActivity.mCurInputPortPos = iInputPortCount - 1;
-                    else
-                        FactoryMainActivity.mCurInputPortPos = Math.abs(FactoryMainActivity.mCurInputPortPos + step) % iInputPortCount;
-                    map.put("sub_value", context.getString(Constant.mInputPortList[FactoryMainActivity.mCurInputPortPos]));
-                    source = TvControlManager.SourceInput.values()[FactoryMainActivity.mCurInputPortPos];
-                    for (int i = mListSubMenuData.size() - 1; i > 0; i--)
-                        mListSubMenuData.remove(i);
-                    ssv.setPicture(source);
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 1: {
-                    int mCurShowModeSize = Constant.mShowModeList.length;
-                    FactoryMainActivity.mCurShowModePos = Math.abs(FactoryMainActivity.mCurShowModePos + step + mCurShowModeSize) % mCurShowModeSize;
-                    map.put("sub_value", context.getString(Constant.mShowModeList[FactoryMainActivity.mCurShowModePos]));
-                    tv.SetPQMode(TvControlManager.PQMode.values()[FactoryMainActivity.mCurShowModePos], source, is_save);
-                    tv.SavePQMode(TvControlManager.PQMode.values()[FactoryMainActivity.mCurShowModePos], source);
-                    for (int i = mListSubMenuData.size() - 1; i > 0; i--)
-                        mListSubMenuData.remove(i);
-                    ssv.setPicture(source);
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 2: {
-                    setpicparam(map1, source, is_save);
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.SetBrightness(value_int, source, is_save);
-                    tv.SaveBrightness(value_int, source);
-                }
-                break;
-            case 3: {
-                    setpicparam(map1, source, is_save);
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.SetContrast(value_int, source, is_save);
-                    tv.SaveContrast(value_int, source);
-                }
-                break;
-            case 4: {
-                    setpicparam(map1, source, is_save);
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.SetSaturation(value_int, source, tv.GetCurrentSignalInfo().sigFmt, is_save);
-                    tv.SaveSaturation(value_int, source);
-                }
-                break;
-            case 5: {
-                    setpicparam(map1, source, is_save);
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    if (tv.SetSharpness(value_int, source, 0, 0) == 0) {
-                        tv.SaveSharpness(value_int, source, 1);
-                    }
-                }
-                break;
-            case 6: {
-                    setpicparam(map1, source, is_save);
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("-50"))
-                        value_int = 50;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step + 50) % 101 - 50;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.SetHue(value_int, source, tv.GetCurrentSignalInfo().sigFmt, is_save);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void adjustWhiteBalance(boolean left, int step) {
-        String value_str = "";
-        int value_int = 0;
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        TvControlManager.SourceInput source = null;
-        ShowSubView ssv = new ShowSubView(mListSubMenuData, context);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0: {
-                    int iInputPortCount = Constant.mInputPortList.length;
-                    if (0 == FactoryMainActivity.mCurInputPortPos && left)
-                        FactoryMainActivity.mCurInputPortPos = iInputPortCount - 1;
-                    else
-                        FactoryMainActivity.mCurInputPortPos = Math.abs(FactoryMainActivity.mCurInputPortPos + step) % iInputPortCount;
-                    map.put("sub_value", context.getString(Constant.mInputPortList[FactoryMainActivity.mCurInputPortPos]));
-
-                    for (int i = mListSubMenuData.size() - 1; i > 0; i--)
-                        mListSubMenuData.remove(i);
-                    ssv.setWhite(FactoryMainActivity.mCurInputPortPos, 0);
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 1: {
-                    int mColorTemperatureListSize = Constant.mColorTemperatureList.length;
-                    if (0 == FactoryMainActivity.mColorTemperaturePos && left)
-                        FactoryMainActivity.mColorTemperaturePos = mColorTemperatureListSize - 1;
-                    else
-                        FactoryMainActivity.mColorTemperaturePos = Math.abs(FactoryMainActivity.mColorTemperaturePos + step) % mColorTemperatureListSize;
-                    map.put("sub_value", context.getString(Constant.mColorTemperatureList[FactoryMainActivity.mColorTemperaturePos]));
-                    for (int i = mListSubMenuData.size() - 1; i > 1; i--)
-                        mListSubMenuData.remove(i);
-                    // get value according new mode
-                    ssv.setWhite2(FactoryMainActivity.mCurInputPortPos, FactoryMainActivity.mColorTemperaturePos);
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 2: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 2047;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 2048;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.FactoryWhiteBalanceSetRedGain(FactoryMainActivity.mCurInputPortPos, FactoryMainActivity.mColorTemperaturePos, value_int);
-                }
-                break;
-            case 3: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 2047;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 2048;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.FactoryWhiteBalanceSetGreenGain(FactoryMainActivity.mCurInputPortPos, FactoryMainActivity.mColorTemperaturePos, value_int);
-                }
-                break;
-            case 4: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 2047;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 2048;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.FactoryWhiteBalanceSetBlueGain(FactoryMainActivity.mCurInputPortPos, FactoryMainActivity.mColorTemperaturePos, value_int);
-                }
-                break;
-            case 5: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && Integer.parseInt(value_str) == -1023)
-                        value_int = 1024;
-                    else if (1 == step && Integer.parseInt(value_str) == 1024)
-                        value_int = -1023;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step + 1024) % 2049 - 1024;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.FactoryWhiteBalanceSetRedOffset(FactoryMainActivity.mCurInputPortPos, FactoryMainActivity.mColorTemperaturePos, value_int);
-                }
-                break;
-            case 6: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && Integer.parseInt(value_str) == -1023)
-                        value_int = 1024;
-                    else if (1 == step && Integer.parseInt(value_str) == 1024)
-                        value_int = -1023;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step + 1024) % 2049 - 1024;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.FactoryWhiteBalanceSetGreenOffset(FactoryMainActivity.mCurInputPortPos, FactoryMainActivity.mColorTemperaturePos, value_int);
-                }
-                break;
-            case 7: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && Integer.parseInt(value_str) == -1023)
-                        value_int = 1024;
-                    else if (1 == step && Integer.parseInt(value_str) == 1024)
-                        value_int = -1023;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step + 1024) % 2049 - 1024;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.FactoryWhiteBalanceSetBlueOffset(FactoryMainActivity.mCurInputPortPos, FactoryMainActivity.mColorTemperaturePos, value_int);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void adjustSSC(boolean left, int step) {
-        String value_str = "";
-        int value_int = 0;
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 5;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 6;
-
-                    map.put("sub_value", value_int + "");
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                    tv.FactorySetLVDSSSC(value_int);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void adjustNolinear(boolean left, int step) {
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        TvControlManager.SourceInput source = TvControlManager.SourceInput.values()[FactoryMainActivity.mCurInputPortPos];
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                int iInputPortCount = Constant.mInputPortList.length;
-                if (0 == FactoryMainActivity.mCurInputPortPos && left)
-                    FactoryMainActivity.mCurInputPortPos = iInputPortCount - 1;
-                else
-                    FactoryMainActivity.mCurInputPortPos = Math.abs(FactoryMainActivity.mCurInputPortPos + step) % iInputPortCount;
-                map.put("sub_value", context.getString(Constant.mInputPortList[FactoryMainActivity.mCurInputPortPos]));
-                source = TvControlManager.SourceInput.values()[FactoryMainActivity.mCurInputPortPos];
-                for (int i = mListSubMenuData.size() - 1; i > 0; i--)
-                    mListSubMenuData.remove(i);
-                ShowSubView ssv = new ShowSubView(mListSubMenuData, context);
-                ssv.setNoLine(source);
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-    }
-
-    /*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];
-
-    public void adjustReshow(boolean left, int step) {
-        String value_str = "";
-        int value_int = 0;
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        ShowSubView ssv = new ShowSubView(mListSubMenuData, context);
-        TvControlManager.tvin_cutwin_t cutwin_t = tv.FactoryGetOverscanParams(source, fmt, trans_fmt);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                int iInputPortCount = Constant.mInputPortList.length;
-                FactoryMainActivity.mCurInputPortPos = (FactoryMainActivity.mCurInputPortPos + step + iInputPortCount) % iInputPortCount;
-                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;
-                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;
-                else if (source == TvControlManager.SourceInput.YPBPR1 ||source == TvControlManager.SourceInput.YPBPR2 )
-                    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;
-                else
-                    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
-                ssv.setTiming(source, fmt, trans_fmt);
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            case 1:
-                value_int = fmt.toInt() + step;
-                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;
-                    else
-                        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;
-                    else
-                        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;
-                    else
-                        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;
-                    else
-                        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;
-                 else
-                     fmt = TvInSignalInfo.SignalFmt.valueOf(value_int);
-                }
-                map.put("sub_value", fmt + "");
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                for (int i = mListSubMenuData.size() - 1; i > 3; i--)
-                    mListSubMenuData.remove(i);
-                // get new value according new mode
-                ssv.setElse(source, fmt, trans_fmt);
-                break;
-            case 2:
-                int reshowTvinCount = Constant.mChongxianTvIn3Dstatus.length;
-                if (0 == FactoryMainActivity.reshowTvinPos && left)
-                    FactoryMainActivity.reshowTvinPos = reshowTvinCount - 1;
-                else
-                    FactoryMainActivity.reshowTvinPos = Math.abs(FactoryMainActivity.reshowTvinPos + step) % reshowTvinCount;
-                map.put("sub_value", context.getString(Constant.mChongxianTvIn3Dstatus[FactoryMainActivity.reshowTvinPos]));
-                for (int i = mListSubMenuData.size() - 1; i > 3; i--)
-                    mListSubMenuData.remove(i);
-                ssv.setElse(source, fmt, trans_fmt);
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            case 3:
-                int reshowTvinTransFmtCount = Constant.mChongxianTvInTransFmt.length;
-                if (0 == FactoryMainActivity.reshowTvinTransFmtPos && left)
-                    FactoryMainActivity.reshowTvinTransFmtPos = reshowTvinTransFmtCount - 1;
-                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];
-                for (int i = mListSubMenuData.size() - 1; i > 3; i--)
-                    mListSubMenuData.remove(i);
-                ssv.setElse(source, fmt, trans_fmt);
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            case 4:
-                value_str = map.get("sub_value");
-                value_int = Integer.parseInt(value_str) + step;
-                map.put("sub_value", value_int + "");
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                cutwin_t.hs = value_int;
-                tv.FactorySetOverscanParams(source, fmt, trans_fmt, cutwin_t);
-                break;
-            case 5:
-                value_str = map.get("sub_value");
-                value_int = Integer.parseInt(value_str) + step;
-                map.put("sub_value", value_int + "");
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                cutwin_t.vs = value_int;
-                tv.FactorySetOverscanParams(source, fmt, trans_fmt, cutwin_t);
-                break;
-            case 6:
-                value_str = map.get("sub_value");
-                value_int = Integer.parseInt(value_str) + step;
-                map.put("sub_value", value_int + "");
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                cutwin_t.he = value_int;
-                tv.FactorySetOverscanParams(source, fmt, trans_fmt, cutwin_t);
-                break;
-            case 7:
-                value_str = map.get("sub_value");
-                value_int = Integer.parseInt(value_str) + step;
-                map.put("sub_value", value_int + "");
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                cutwin_t.ve = value_int;
-                tv.FactorySetOverscanParams(source, fmt, trans_fmt, cutwin_t);
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void adjustFunction(boolean left, int step) {
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                int iInputPortCount = Constant.CESHITUARRAY_STRINGS.length;
-                if (0 == FactoryMainActivity.ceshituPos && left)
-                    FactoryMainActivity.ceshituPos = iInputPortCount - 1;
-                else
-                    FactoryMainActivity.ceshituPos = Math.abs(FactoryMainActivity.ceshituPos + step) % iInputPortCount;
-                map.put("sub_value", context.getString(Constant.CESHITUARRAY_STRINGS[FactoryMainActivity.ceshituPos]));
-                tv.FactorySetTestPattern(FactoryMainActivity.ceshituPos);
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void adjustAging(boolean left, int step) {
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                if (tv.SSMReadAgingMode() == 0)
-                    tv.SSMSaveAgingMode(1);
-                else
-                    tv.SSMSaveAgingMode(0);
-                map.put("sub_value", tv.SSMReadAgingMode() == 0 ? context.getString(Constant.FACUI_LAOHUA_OFF) : context.getString(Constant.FACUI_LAOHUA_ON));
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void adjust_dym_bl(boolean left, int step) {
-        String value_str = "";
-        int value_int = 0;
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 1: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 2: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 3: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            case 4: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("0"))
-                        value_int = 100;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void cvbsSetValue(boolean left, int step) {
-        String value_str = "";
-        int value_int = 0;
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0: {
-                    value_str = map.get("sub_value");
-                    if (-1 == step && value_str.equals("80"))
-                        value_int = 130;
-                    else
-                        value_int = Math.abs(Integer.parseInt(value_str) + step - 80) % 51 + 80;
-                    map.put("sub_value", String.valueOf(value_int));
-                    FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void hdcpSetValue() {
-        String value_str = "";
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                value_str = map.get("sub_value");
-                if (value_str.equalsIgnoreCase(context.getString(Constant.FACUI_HDCP_DEMOKEY_ON))) {
-                    map.put("sub_value", context.getString(Constant.FACUI_HDCP_DEMOKEY_OFF));
-                    //tv.SSMSaveUsingDefaultHDCPKeyFlag(0);
-                } else if (value_str.equalsIgnoreCase(context.getString(Constant.FACUI_HDCP_DEMOKEY_OFF))) {
-                    map.put("sub_value", context.getString(Constant.FACUI_HDCP_DEMOKEY_ON));
-                    //tv.SSMSaveUsingDefaultHDCPKeyFlag(1);
-                }
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void serialSetValue() {
-        String value_str = "";
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                value_str = map.get("sub_value");
-                if (value_str.equalsIgnoreCase(context.getString(Constant.FACUI_SERIAL_CMD_SWITCH_ON))) {
-                    map.put("sub_value", context.getString(Constant.FACUI_SERIAL_CMD_SWITCH_OFF));
-                    tv.SSMSaveSerialCMDSwitchValue(0);
-                } else if (value_str.equalsIgnoreCase(context.getString(Constant.FACUI_SERIAL_CMD_SWITCH_OFF))) {
-                    map.put("sub_value", context.getString(Constant.FACUI_SERIAL_CMD_SWITCH_ON));
-                    tv.SSMSaveSerialCMDSwitchValue(1);
-                }
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void autosavelogSetValue() {
-        String value_str = "";
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        Intent logintent = new Intent();
-        logintent.setAction("com.amlogic.action.savelogtoudisk");
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                value_str = map.get("sub_value");
-                if (value_str.equalsIgnoreCase(context.getString(Constant.FACUI_AUTOSAVELOG_SWITCH_ON))) {
-                    context.stopService(logintent);
-                    map.put("sub_value", context.getString(Constant.FACUI_AUTOSAVELOG_SWITCH_OFF));
-                } else if (value_str.equalsIgnoreCase(context.getString(Constant.FACUI_AUTOSAVELOG_SWITCH_OFF))) {
-                    context.startService(logintent);
-                    map.put("sub_value", context.getString(Constant.FACUI_AUTOSAVELOG_SWITCH_ON));
-                }
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void dynamicbacklightSetValue(boolean left, int step) {
-        int value_int = 0;
-        Map<String, String> map = mListSubMenuData.get(FactoryMainActivity.mSubMenuPos);
-        switch (FactoryMainActivity.mSubMenuPos) {
-            case 0:
-                String value_str = map.get("sub_value");
-                if (-1 == step && value_str.equals("0"))
-                    value_int = 100;
-                else
-                    value_int = Math.abs(Integer.parseInt(value_str) + step) % 101;
-                map.put("sub_value", String.valueOf(value_int));
-                SystemProperties.set("persist.tv.auto_bl_value", value_int + "");
-                FactoryMainActivity.sAdapter.notifyDataSetChanged();
-                break;
-            default:
-                break;
-        }
-
-    }
-
-}
diff --git a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/ShowSubView.java b/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/ShowSubView.java
deleted file mode 100644
index b0d18db..0000000
--- a/apps/TvInput/DroidLogicFactoryMenu/src/com/amlogic/factory/ShowSubView.java
+++ b/dev/null
@@ -1,495 +0,0 @@
-/**
- * util used to show son item content
- *
- * @author ice.fu
- */
-package com.amlogic.factory;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.droidlogic.app.tv.TvControlManager;
-import com.droidlogic.app.tv.TvControlManager.NOLINE_PARAMS_TYPE;
-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 android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
-import android.content.Context;
-import android.os.SystemProperties;
-import android.util.Log;
-
-public class ShowSubView {
-    public static TvControlManager tv = TvControlManager.getInstance();
-    /* son ListView's item save to this ArrayList */
-    public List<Map<String, String>> mListSubMenuData = null;
-    private Context context;
-    ActivityManager am;// used to adjust if the auto save log to udisk service is open
-
-    public ShowSubView(List<Map<String, String>> mListSubMenuData, Context context) {
-        this.mListSubMenuData = mListSubMenuData;
-        this.context = context;
-    }
-
-    /* ADC calibration */
-    public void show_calibate_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_ADC_PORT));
-        map.put("sub_value", context.getString(Constant.FACUI_ADC_PORT_RGB));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_ADC_AUTO));
-        map.put("sub_value", "");
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_CALIBRATE;
-    }
-
-    /* picture mode */
-    public void show_picture_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PICMODE_PORT));
-        map.put("sub_value", context.getString(Constant.FACUI_PICMODE_PORT_TV));
-        mListSubMenuData.add(map);
-        setPicture(SourceInput.TV);
-        FactoryMainActivity.mPage = Constant.PAGE_PICTUREMODE;
-    }
-
-    /* set picture mode's parameter at one source */
-    public void setPicture(SourceInput source) {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PICMODE_MODE));
-        int itemPosition = tv.GetPQMode(source);
-        map.put("sub_value", context.getString(Constant.mShowModeList[itemPosition]));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PICMODE_BRIGHTNESS));
-        int value = tv.GetBrightness(source);
-        map.put("sub_value", value + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PICMODE_CONTRAST));
-        value = tv.GetContrast(source);
-        map.put("sub_value", value + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PICMODE_COLOR));
-        value = tv.GetSaturation(source);
-        map.put("sub_value", value + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PICMODE_DEFINITION));
-        value = tv.GetSharpness(source);
-        map.put("sub_value", value + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PICMODE_TONE));
-        value = tv.GetHue(source);
-        map.put("sub_value", value + "");
-        mListSubMenuData.add(map);
-    }
-
-    /* white balance */
-    public void show_whitebalance_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_PORT));
-        map.put("sub_value", context.getString(Constant.FACUI_WHTBLAN_PORT_TV));
-        mListSubMenuData.add(map);
-        setWhite(SourceInput_Type.SOURCE_TYPE_TV.toInt(), 0);
-        FactoryMainActivity.mPage = Constant.PAGE_WHITEBALANCE;
-    }
-
-    /* set white balance's parameter at one source */
-    public void setWhite(int source, int colortemp_mode) {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_MODE));
-        map.put("sub_value", context.getString(Constant.FACUI_WHTBLAN_MODE_STANDARD));
-        mListSubMenuData.add(map);
-        setWhite2(source, colortemp_mode);
-    }
-
-    /* set white balance's parameter at one source and mode */
-    public void setWhite2(int source, int colortemp_mode) {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_GAIN_R));
-        int i = tv.FactoryWhiteBalanceGetRedGain(source, colortemp_mode);
-        map.put("sub_value", "" + i);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_GAIN_G));
-        i = tv.FactoryWhiteBalanceGetGreenGain(source, colortemp_mode);
-        map.put("sub_value", "" + i);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_GAIN_B));
-        i = tv.FactoryWhiteBalanceGetBlueGain(source, colortemp_mode);
-        map.put("sub_value", "" + i);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_OFFSET_R));
-        i = tv.FactoryWhiteBalanceGetRedOffset(source, colortemp_mode);
-        map.put("sub_value", "" + i);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_OFFSET_G));
-        i = tv.FactoryWhiteBalanceGetGreenOffset(source, colortemp_mode);
-        map.put("sub_value", "" + i);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_WHTBLAN_OFFSET_B));
-        i = tv.FactoryWhiteBalanceGetBlueOffset(source, colortemp_mode);
-        map.put("sub_value", "" + i);
-        mListSubMenuData.add(map);
-    }
-
-    /*SSC*/
-    public void show_ssc_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_LVDS_LVDS));
-        int i = tv.FactoryGetLVDSSSC();
-        map.put("sub_value", i + "");
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_SSC;
-    }
-
-    // /* NOliner */
-    // public void show_nolinear_submenu()
-    // {
-    // Map<String, String> map = new HashMap<String, String>();
-    // map.put("sub_name", context.getString(Constant.FACUI_NOLINEAR_PORT));
-    // map.put("sub_value", context.getString(Constant.FACUI_PICMODE_PORT_TV));
-    // mListSubMenuData.add(map);
-    // setNoLine(SourceInput_Type.SOURCE_TYPE_TV);
-    // FactoryMainActivity.mPage = Constant.PAGE_NOLINEAR;
-    // }
-
-    /* set NOliner's parameter like brightness ect.*/
-    public void setNoLine(SourceInput source) {
-        noline_params_t noline_params;
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_NOLINEAR_BRIGHTNESS));
-        noline_params = tv.FactoryGetNolineParams(NOLINE_PARAMS_TYPE.NOLINE_PARAMS_TYPE_BRIGHTNESS, source);
-        map.put("sub_value", noline_params.osd0 + "     " + noline_params.osd25 + "     " + noline_params.osd50 + "     " + noline_params.osd75
-                + "     " + noline_params.osd100);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_NOLINEAR_CONTRAST));
-        noline_params = tv.FactoryGetNolineParams(NOLINE_PARAMS_TYPE.NOLINE_PARAMS_TYPE_CONTRAST, source);
-        map.put("sub_value", noline_params.osd0 + "     " + noline_params.osd25 + "     " + noline_params.osd50 + "     " + noline_params.osd75
-                + "     " + noline_params.osd100);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_NOLINEAR_SATURATION));
-        noline_params = tv.FactoryGetNolineParams(NOLINE_PARAMS_TYPE.NOLINE_PARAMS_TYPE_SATURATION, source);
-        map.put("sub_value", noline_params.osd0 + "     " + noline_params.osd25 + "     " + noline_params.osd50 + "     " + noline_params.osd75
-                + "     " + noline_params.osd100);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_NOLINEAR_DEFINITION));
-        noline_params = tv.FactoryGetNolineParams(NOLINE_PARAMS_TYPE.NOLINE_PARAMS_TYPE_HUE, source);
-        map.put("sub_value", noline_params.osd0 + "     " + noline_params.osd25 + "     " + noline_params.osd50 + "     " + noline_params.osd75
-                + "     " + noline_params.osd100);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_NOLINEAR_TONE));
-        noline_params = tv.FactoryGetNolineParams(NOLINE_PARAMS_TYPE.NOLINE_PARAMS_TYPE_SHARPNESS, source);
-        map.put("sub_value", noline_params.osd0 + "     " + noline_params.osd25 + "     " + noline_params.osd50 + "     " + noline_params.osd75
-                + "     " + noline_params.osd100);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_NOLINEAR_VOLUMN));
-        noline_params = tv.FactoryGetNolineParams(NOLINE_PARAMS_TYPE.NOLINE_PARAMS_TYPE_VOLUME, source);
-        map.put("sub_value", noline_params.osd0 + "     " + noline_params.osd25 + "     " + noline_params.osd50 + "     " + noline_params.osd75
-                + "     " + noline_params.osd100);
-        mListSubMenuData.add(map);
-    }
-
-    /* reShow rate */
-    public void show_reshow_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        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);
-        FactoryMainActivity.mPage = Constant.PAGE_OVERSCAN;
-    }
-
-    /* set reShow rate's all parameter */
-    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 + "");
-        mListSubMenuData.add(map);
-        //map = new HashMap<String, String>();
-        //map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_TVIN_3D_STATUS));
-        //map.put("sub_value", status_3d + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_TVIN_TRANS_FMT));
-        map.put("sub_value", trans_fmt + "");
-        mListSubMenuData.add(map);
-        setElse(source, fmt, trans_fmt);
-    }
-
-    /* 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) {
-        tvin_cutwin_t cutwin_t;
-        cutwin_t = tv.FactoryGetOverscanParams(source, fmt, trans_fmt);
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_HSTART));
-        map.put("sub_value", cutwin_t.hs + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_VSTART));
-        map.put("sub_value", cutwin_t.vs + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_HPOS));
-        map.put("sub_value", cutwin_t.he + "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_CHONGXIAN_VPOS));
-        map.put("sub_value", cutwin_t.ve + "");
-        mListSubMenuData.add(map);
-    }
-
-    /*testing picture*/
-    public void show_ceshitu_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        int i = tv.FactoryGetTestPattern();
-        if (i > 5)
-            i = 0;
-        map.put("sub_value", context.getString(Constant.CESHITUARRAY_STRINGS[i]));
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_TESTPATTERN;
-    }
-
-    /*aging mode*/
-    public void show_agingmode_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        int i = tv.SSMReadAgingMode();
-        map.put("sub_name", "");
-        map.put("sub_value", i == 0 ? context.getString(Constant.FACUI_LAOHUA_OFF) : context.getString(Constant.FACUI_LAOHUA_ON));
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_AGINGMODE;
-    }
-
-    /*software info*/
-    public void show_softinfo_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        String sub_value = "";
-        TvControlManager.version_info tmpInfo = tv.TvMiscGetVersion();
-        map.put("soft_name", context.getString(Constant.FACUI_SOFTINFO_NUMBER));
-        map.put("soft_value", SystemProperties.get("ro.product.model", "NONE") + " " + SystemProperties.get("ro.build.version.time", "NONE"));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", context.getString(Constant.FACUI_SOFTINFO_BOOTVERSION));
-        sub_value = tmpInfo.ubootVer;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", context.getString(Constant.FACUI_SOFTINFO_KERNELVERSION));
-        sub_value = tmpInfo.kernel_ver.linux_ver_info + " " + tmpInfo.kernel_ver.build_usr_info + " " + tmpInfo.kernel_ver.build_time_info;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tmpInfo.tvapi_ver.git_branch_info;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", context.getString(Constant.FACUI_SOFTINFO_TVVERSION));
-        sub_value = tmpInfo.tvapi_ver.git_commit_info;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tmpInfo.tvapi_ver.last_change_time_info;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tmpInfo.dvb_ver.git_branch_info;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", context.getString(Constant.FACUI_SOFTINFO_DVBVERSION));
-        sub_value = tmpInfo.dvb_ver.git_commit_info;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tmpInfo.dvb_ver.last_change_time_info;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_SOFTINFO;
-    }
-
-    /*HDMI HDCP DemoKey*/
-    public void show_hdcp_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-       // int i = tv.SSMReadUsingDefaultHDCPKeyFlag();
-        int i = 0;
-        if (i == 0)
-            map.put("sub_value", context.getString(Constant.FACUI_HDCP_DEMOKEY_OFF));
-        else
-            map.put("sub_value", context.getString(Constant.FACUI_HDCP_DEMOKEY_ON));
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.HDMI_HDCP_DEMOKEY;
-    }
-
-    public void show_upgrade_fbc() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_value", context.getString(Constant.FACUI_START));
-        mListSubMenuData.add(map);
-        //FactoryMainActivity.mPage = Constant.PAGE_UPGRADE_FBC;
-    }
-
-    /*fbc version info*/
-    public void show_fbc_version() {
-        Map<String, String> map = null;
-        String sub_value = "";
-
-        TvControlManager.FBC_MAINCODE_INFO tmpInfo = tv.FactoryGet_FBC_Get_MainCode_Version();
-
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tmpInfo.Version;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tmpInfo.GitBranch;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-
-        map = new HashMap<String, String>();
-        map.put("soft_name", context.getString(Constant.FACUI_SOFTINFO_FBCVERSION));
-        sub_value = tmpInfo.GitVersion;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tmpInfo.LastBuild;
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-
-        map = new HashMap<String, String>();
-        map.put("soft_name", "");
-        sub_value = tv.FactoryGet_FBC_SN_Info();
-        map.put("soft_value", sub_value);
-        mListSubMenuData.add(map);
-
-        //FactoryMainActivity.mPage = Constant.PAGE_FBC_VERSION;
-    }
-
-    /*Serial cmd switch:com debug tool's switch, when open, the com debug tool can't work*/
-    public void show_serial_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        int i = tv.SSMReadSerialCMDSwitchValue();
-        if (i == 0)
-            map.put("sub_value", context.getString(Constant.FACUI_HDCP_DEMOKEY_OFF));
-        else if (i == 1)
-            map.put("sub_value", context.getString(Constant.FACUI_HDCP_DEMOKEY_ON));
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_SERIAL_CMD_SWITCH;
-    }
-
-    public void show_portprint_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PORTPRINT_SWITCH_OFF));
-        map.put("sub_value", "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_PORTPRINT_SWITCH_ON));
-        map.put("sub_value", "");
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_PORTPRINT_SWITCH;
-    }
-
-    public void show_remotecontrol() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_REMOTECONTROL_HAIER));
-        map.put("sub_value", "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_REMOTECONTROL_HAIERMTC));
-        map.put("sub_value", "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_REMOTECONTROL_HAIERCVT));
-        map.put("sub_value", "");
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", context.getString(Constant.FACUI_REMOTECONTROL_HAIERAML));
-        map.put("sub_value", "");
-        mListSubMenuData.add(map);
-        //FactoryMainActivity.mPage = Constant.PAGE_REMOTECONTROL;
-    }
-
-    /* auto save log's switch:when open, the function of auto save log to U disk is on */
-    public void show_autosavelog_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        int i = 0;
-        am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        List<RunningAppProcessInfo> infos = am.getRunningAppProcesses();
-        for (RunningAppProcessInfo rapi : infos) {
-            if (rapi.processName.equals("com.amlogic.logrecord"))
-                i = 1;
-        }
-        if (i == 0)
-            map.put("sub_value", context.getString(Constant.FACUI_AUTOSAVELOG_SWITCH_OFF));
-        else if (i == 1)
-            map.put("sub_value", context.getString(Constant.FACUI_AUTOSAVELOG_SWITCH_ON));
-        mListSubMenuData.add(map);
-        //FactoryMainActivity.mPage = Constant.PAGE_AUTOSAVELOG_SWITCH;
-    }
-
-    public void show_dynamicbacklight_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        String dynamicbacklightvalue = SystemProperties.get("persist.tv.auto_bl_value", "0");
-        map.put("sub_name", "");
-        map.put("sub_value", dynamicbacklightvalue);
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_DYNAMIC_BACKLIGHT_VALUE;
-    }
-
-    public void show_screen_submenu() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", "");
-        map.put("sub_value", context.getString(Constant.FACUI_SCREEN_UP));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", "");
-        map.put("sub_value", context.getString(Constant.FACUI_SCREEN_DOWN));
-        mListSubMenuData.add(map);
-        FactoryMainActivity.mPage = Constant.PAGE_SCREEN;
-    }
-
-    public void show_outputmode() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("sub_name", "");
-        map.put("sub_value", context.getString(Constant.FACUI_OUTPUT_MODE1));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", "");
-        map.put("sub_value", context.getString(Constant.FACUI_OUTPUT_MODE2));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", "");
-        map.put("sub_value", context.getString(Constant.FACUI_OUTPUT_MODE3));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", "");
-        map.put("sub_value", context.getString(Constant.FACUI_OUTPUT_MODE4));
-        mListSubMenuData.add(map);
-        map = new HashMap<String, String>();
-        map.put("sub_name", "");
-        map.put("sub_value", context.getString(Constant.FACUI_OUTPUT_MODE5));
-        mListSubMenuData.add(map);
-    }
-}